From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 51EA51FF37F for <inbox@lore.proxmox.com>; Thu, 18 Apr 2024 09:07:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 66E411542C; Thu, 18 Apr 2024 09:07:27 +0200 (CEST) From: Fiona Ebner <f.ebner@proxmox.com> To: pve-devel@lists.proxmox.com Date: Thu, 18 Apr 2024 09:06:48 +0200 Message-Id: <20240418070648.16462-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240418070648.16462-1-f.ebner@proxmox.com> References: <20240418070648.16462-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.070 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 manager] Revert "tests: update expected replication log output" X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> This reverts commit 3a259c22e64ff22049856256a1dad643439c79ef. There was an oversight with recent replication fixes that led to attempting to remove snapshots that do not exist (in more scenarios). While not an issue with real consequences, it's confusing to users. This has since been fixed by pve-guest-common commit "replication: snapshot cleanup: only attempt to remove snapshots that exist". Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> --- Build-depends on new pve-guest-common. test/replication_test5.log | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/replication_test5.log b/test/replication_test5.log index 196d0fd0..928feca3 100644 --- a/test/replication_test5.log +++ b/test/replication_test5.log @@ -5,7 +5,6 @@ 1000 job_900_to_node2: create snapshot '__replicate_job_900_to_node2_1000__' on local-zfs:vm-900-disk-1 1000 job_900_to_node2: using secure transmission, rate limit: none 1000 job_900_to_node2: full sync 'local-zfs:vm-900-disk-1' (__replicate_job_900_to_node2_1000__) -1000 job_900_to_node2: delete previous replication snapshot '__replicate_job_900_to_node2_0__' on local-zfs:vm-900-disk-1 1000 job_900_to_node2: end replication job 1000 job_900_to_node2: changed config next_sync => 1800 1000 job_900_to_node2: changed state last_node => node1, last_try => 1000, last_sync => 1000 @@ -38,7 +37,6 @@ 3040 job_900_to_node2: incremental sync 'local-zfs:vm-900-disk-1' (__replicate_job_900_to_node2_1840__ => __replicate_job_900_to_node2_3040__) 3040 job_900_to_node2: full sync 'local-zfs:vm-900-disk-2' (__replicate_job_900_to_node2_3040__) 3040 job_900_to_node2: delete previous replication snapshot '__replicate_job_900_to_node2_1840__' on local-zfs:vm-900-disk-1 -3040 job_900_to_node2: delete previous replication snapshot '__replicate_job_900_to_node2_1840__' on local-zfs:vm-900-disk-2 3040 job_900_to_node2: end replication job 3040 job_900_to_node2: changed config next_sync => 3600 3040 job_900_to_node2: changed state last_try => 3040, last_sync => 3040, fail_count => 0, error => -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel