| commit | 7a8de847ad9ba658d51c39bddf7a10b8d5372847 | [log] [tgz] |
|---|---|---|
| author | Thomas Vachuska <tom@onlab.us> | Mon Mar 07 20:56:35 2016 -0800 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Wed Mar 23 19:10:15 2016 +0000 |
| tree | b4f0ad45955a725e136ad74f8b1dbb2f2f717711 | |
| parent | 5e869353bb7c415ddec03abba01de2ac68d9efdd [diff] |
Added ability to track whether or not node has all components running fully. Change-Id: Ib2b90c7a842976a3b3a9711367fa1eed43103b17
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java index fc7c0eb..4f70629 100644 --- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java +++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/EventuallyConsistentMapImpl.java
@@ -556,7 +556,7 @@ .stream() .map(ControllerNode::id) .filter(id -> !localNodeId.equals(id)) - .filter(id -> clusterService.getState(id) == ControllerNode.State.ACTIVE) + .filter(id -> clusterService.getState(id).isActive()) .collect(Collectors.toList()); Collections.shuffle(activePeers); return activePeers.isEmpty() ? Optional.empty() : Optional.of(activePeers.get(0));
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MutexExecutionManager.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MutexExecutionManager.java index 431a240..bc45d68 100644 --- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MutexExecutionManager.java +++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/MutexExecutionManager.java
@@ -200,7 +200,7 @@ long activeNodes = clusterService.getNodes() .stream() .map(node -> clusterService.getState(node.id())) - .filter(State.ACTIVE::equals) + .filter(State::isActive) .count(); if (clusterService.getNodes().size() > 1 && activeNodes == 1) { log.info("This node is partitioned away from the cluster. Stopping all inflight executions");