From 15d2db9a4b59b1e4c6a6d227d82d2595a061c6ba Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Sun, 5 Jun 2016 21:25:07 -0400 Subject: [PATCH] Fix minor bug in ShardManager#removeShardReplica https://git.opendaylight.org/gerrit/#/c/38086/ introdcued a minor bug in ShardManager#removeShardReplica. The intention was to cleanup shardReplicaOperationsInProgress on failure so the added line should be a call to remove and not add. Change-Id: I36e01f3da75655f39c169c230e9b424a1c6236b9 Signed-off-by: Tom Pantelis --- .../controller/cluster/datastore/shardmanager/ShardManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java index 0f6425e15d..4156ab3426 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java @@ -346,7 +346,7 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { @Override public void onComplete(Throwable failure, Object response) { if (failure != null) { - shardReplicaOperationsInProgress.add(shardName); + shardReplicaOperationsInProgress.remove(shardName); String msg = String.format("RemoveServer request to leader %s for shard %s failed", primaryPath, shardName); -- 2.36.6