Print this page
2605 want to resume interrupted zfs send
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Xin Li <delphij@freebsd.org>
Reviewed by: Arne Jansen <sensille@gmx.net>
Approved by: Dan McDonald <danmcd@omniti.com>
4206 history_003_pos relies on exact size of history log and entries
4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
Reviewed by: Sonu Pillai <sonu.pillai@delphix.com>
Reviewed by: Will Guyette <will.guyette@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
        
*** 510,526 ****
  #
  function test_fs_setup
  {
          typeset sendfs=$1
          typeset recvfs=$2
-         typeset streamfs=$3
          typeset sendpool=${sendfs%%/*}
          typeset recvpool=${recvfs%%/*}
  
          datasetexists $sendfs && log_must zfs destroy -r $sendpool
          datasetexists $recvfs && log_must zfs destroy -r $recvpool
-         datasetexists $streamfs && log_must zfs destroy -r $streamfs
  
          if $(datasetexists $sendfs || zfs create -o compress=lz4 $sendfs); then
                  mk_files 1000 256 0 $sendfs &
                  mk_files 1000 131072 0 $sendfs &
                  mk_files 100 1048576 0 $sendfs &
--- 510,524 ----
*** 545,555 ****
                  log_must eval "zfs send -v $sendfs@a >/$sendpool/initial.zsend"
                  log_must eval "zfs send -v -i @a $sendfs@b " \
                      ">/$sendpool/incremental.zsend"
          fi
  
!         log_must zfs create -o compress=lz4 $streamfs
  }
  
  #
  # Check to see if the specified features are set in a send stream.
  # The values for these features are found in uts/common/fs/zfs/sys/zfs_ioctl.h
--- 543,556 ----
                  log_must eval "zfs send -v $sendfs@a >/$sendpool/initial.zsend"
                  log_must eval "zfs send -v -i @a $sendfs@b " \
                      ">/$sendpool/incremental.zsend"
          fi
  
!         if datasetexists $streamfs; then
!                 log_must zfs destroy -r $streamfs
!         fi
!         log_must zfs create -o compress=lz4 $sendpool/stream
  }
  
  #
  # Check to see if the specified features are set in a send stream.
  # The values for these features are found in uts/common/fs/zfs/sys/zfs_ioctl.h
*** 658,669 ****
  # Cleanup function for tests involving resumable send
  function resume_cleanup
  {
          typeset sendfs=$1
          typeset streamfs=$2
-         typeset sendpool=${sendfs%%/*}
  
          datasetexists $sendfs && log_must zfs destroy -r $sendfs
          datasetexists $streamfs && log_must zfs destroy -r $streamfs
          cleanup_pool $POOL2
!         rm -f /$sendpool/initial.zsend /$sendpool/incremental.zsend
  }
--- 659,669 ----
  # Cleanup function for tests involving resumable send
  function resume_cleanup
  {
          typeset sendfs=$1
          typeset streamfs=$2
  
          datasetexists $sendfs && log_must zfs destroy -r $sendfs
          datasetexists $streamfs && log_must zfs destroy -r $streamfs
          cleanup_pool $POOL2
!         rm -f /$POOL/initial.zsend /$POOL/incremental.zsend
  }