From 933a5fd851fd7785b2485d21c5535f11a902fded Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Thu, 25 Feb 2021 13:20:02 -0700 Subject: [PATCH] Update git submodules * Update plugins/replication from branch 'master' to 14766e75f91886ab48951035d59a78c8c3f07471 - Merge branch 'stable-3.3' * stable-3.3: Call retryDone() when giving up after lock failures Fix issue with task cleanup after retry Change-Id: Ib2216e3b06ea62cb06c22ad955a8c252f3bacccc - Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Call retryDone() when giving up after lock failures Fix issue with task cleanup after retry Change-Id: I03b5bbfcfca75a3ee54e782e4b64f19b1100e2eb - Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Call retryDone() when giving up after lock failures Fix issue with task cleanup after retry Change-Id: I6dbeaa0d21545a1903bdb11c5de5d9e8f72079c5 - Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Call retryDone() when giving up after lock failures Fix issue with task cleanup after retry Change-Id: Id9ce63cd6112b3c8b16f9daafe3a8a982521baa9 - Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Call retryDone() when giving up after lock failures Fix issue with task cleanup after retry Change-Id: Id987043c8a26bd3f69fb4bd5b84591ae20cb83ba - Call retryDone() when giving up after lock failures Previously when giving up after retrying due to too many lock failures, a 'replication start --wait' command would wait indefinitely if it was waiting on the push that gave up. Fix this by calling retryDone() after giving up which will trigger the ReplicationStatus to reflect a failure allowing the waiting to complete. Change-Id: I0debade83612eb7ce51bab0191ab99464a6e7cd3 - Fix issue with task cleanup after retry Destination.notifyFinished method calls finish on ReplicationTasksStorage.Task objects which are not scheduled for retry. The issue is that for rescheduled tasks PushOne.isRetrying will always returns true even if task is already replicated. That creates a situation where tasks scheduled for retry are never cleaned up. Bug: Issue 12754 Change-Id: I4b10c2752da6aa7444f57c3ce4ab70eb00c3f14e --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index a379adcd2f..14766e75f9 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit a379adcd2f4f1a41731818e74b2a214de3fcf5d8 +Subproject commit 14766e75f91886ab48951035d59a78c8c3f07471