Eliminated the hang when shutting down a single-instance. Root cause remains in …

…the leadership topic withdrawal. Change-Id: Iad740929b683a253a7eec0282b52e8f6f31ebcfe

Eliminated the hang when shutting down a single-instance. Root cause remains in …
…the leadership topic withdrawal. Change-Id: Iad740929b683a253a7eec0282b52e8f6f31ebcfe
Thomas Vachuska · Gerrit Code Review
Commit c0e2013d5f5cad8b2ada7d7367eea4878141dbfb c0e2013d 1 parent 6f440331
Showing 1 changed file with 8 additions and 5 deletions
core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
View file @c0e2013
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
View file @c0e2013
@@ -191,11 +191,14 @@ public class DistributedLeadershipManager implements LeadershipService {
     @Deactivate
     public void deactivate() {
-        leaderBoard.forEach((topic, leadership) -> {
+        if (clusterService.getNodes().size() > 1) {
-            if (localNodeId.equals(leadership.leader())) {
+            // FIXME: Determine why this takes ~50 seconds to shutdown on a single node!
-                withdraw(topic);
+            leaderBoard.forEach((topic, leadership) -> {
-            }
+                if (localNodeId.equals(leadership.leader())) {
-        });
+                    withdraw(topic);
+                }
+            });
+        }
         clusterService.removeListener(clusterEventListener);
         eventDispatcher.removeSink(LeadershipEvent.class);