commit 3d1727c11e0d3e17ab42c2d5bdb661cb369512b4
author Madan Jampani <madan@onlab.us> Fri May 22 11:46:29 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 22 19:48:36 2015 +0000
tree df50444ed3be0ef37adbba13cb2d21516c38c324
parent 654b58a6ab69613f1f2e85c9414929021cb073a5

Leadership: Rerun purge step when conflicting updates are detected

Change-Id: Iecf34a79688ff6d288f7bf17e0d99be35b6539e2

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
index 2a69e19..8ee115a 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
@@ -577,6 +577,10 @@
                                                 updatedCandidates.value(),
                                                 updatedCandidates.version(),
                                                 updatedCandidates.creationTime())));
+                            } else {
+                                // Conflicting update detected. Rerun purge to make sure
+                                // inactive candidates are evicted.
+                                rerunPurge.set(true);
                             }
                         } catch (Exception e) {
                             log.debug("Failed to evict inactive candidates {} from "