From 0d5a5fc9cb0ca14b45efb0e4f9d82a6273fd2dde Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 10 May 2017 07:20:00 +0200
Subject: [PATCH] Revert "Include incremental zfs send in storage_migrate."

This reverts commit 4537523b5af8846a6de659e718ab1a81db882e1b.

We want to use send/receive for this - patch will follow.
---
 PVE/Storage.pm | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 14b8289..a4125d5 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -32,7 +32,6 @@ use PVE::Storage::GlusterfsPlugin;
 use PVE::Storage::ZFSPoolPlugin;
 use PVE::Storage::ZFSPlugin;
 use PVE::Storage::DRBDPlugin;
-use PVE::ReplicationTools;
 
 # Storage API version. Icrement it on changes in storage API interface.
 use constant APIVER => 1;
@@ -621,27 +620,14 @@ sub storage_migrate {
 	    my $zfspath = "$scfg->{pool}\/$volname";
 
 	    my $snap = ['zfs', 'snapshot', "$zfspath\@__migration__"];
-	    my $send = ['zfs', 'send', '-Rpv'];
-	    my $rec = ['ssh', "root\@$target_host", 'zfs', 'recv','-F' ,$zfspath];
 
-	    if (my $snapname = PVE::ReplicationTools::get_last_replica_snap($volid)) {
-
-		#check if target snapshot exists.
-		my $checksnap = ['/usr/bin/ssh', "root\@${target_host}", "-o",
-		    'BatchMode=yes', 'zfs', 'list', '-Hrt', 'snap',
-		    "$zfspath\@$snapname "];
-		eval {
-		    run_command($checksnap);
-		    push @$send, '-I', "$zfspath\@$snapname";
-		};
-
-	    }
-	    push @$send, "--", "$zfspath\@__migration__";
+	    my $send = [['zfs', 'send', '-Rpv', "$zfspath\@__migration__"], ['ssh', "root\@$target_host",
+			'zfs', 'recv', $zfspath]];
 
 	    my $destroy_target = ['ssh', "root\@$target_host", 'zfs', 'destroy', "$zfspath\@__migration__"];
  	    run_command($snap);
 	    eval{
-		run_command([$send,$rec]);
+		run_command($send);
 	    };
 	    my $err = $@;
 	    warn "zfs send/receive failed, cleaning up snapshot(s)..\n" if $err;