From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6EA3B7B11A for ; Tue, 11 May 2021 15:00:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4283B2231F for ; Tue, 11 May 2021 15:00:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D43EC222E5 for ; Tue, 11 May 2021 15:00:00 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A47C34654A for ; Tue, 11 May 2021 15:00:00 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 11 May 2021 14:59:53 +0200 Message-Id: <20210511125955.25105-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210511125955.25105-1-f.ebner@proxmox.com> References: <20210511125955.25105-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zsync 4/6] snapshot_get: make interface agnostic to source/dest X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 13:00:03 -0000 Signed-off-by: Fabian Ebner --- pve-zsync | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pve-zsync b/pve-zsync index ff05f46..c162230 100755 --- a/pve-zsync +++ b/pve-zsync @@ -677,7 +677,15 @@ sub sync { my $sync_path = sub { my ($source, $dest, $job, $param, $date) = @_; - ($dest->{old_snap}, $dest->{last_snap}) = snapshot_get($source, $dest, $param->{maxsnap}, $param->{name}, $param->{dest_user}); + my $dest_dataset = target_dataset($source, $dest); + + ($dest->{old_snap}, $dest->{last_snap}) = snapshot_get( + $dest_dataset, + $param->{maxsnap}, + $param->{name}, + $dest->{ip}, + $param->{dest_user}, + ); prepare_prepended_target($source, $dest, $param->{dest_user}) if defined($dest->{prepend}); @@ -746,14 +754,12 @@ sub sync { } sub snapshot_get{ - my ($source, $dest, $max_snap, $name, $dest_user) = @_; + my ($dataset, $max_snap, $name, $ip, $user) = @_; my $cmd = []; - push @$cmd, 'ssh', "$dest_user\@$dest->{ip}", '--', if $dest->{ip}; + push @$cmd, 'ssh', "$user\@$ip", '--', if $ip; push @$cmd, 'zfs', 'list', '-r', '-t', 'snapshot', '-Ho', 'name', '-S', 'creation'; - - my $path = target_dataset($source, $dest); - push @$cmd, $path; + push @$cmd, $dataset; my $raw; eval {$raw = run_cmd($cmd)}; -- 2.20.1