commit 9f0fcb700d04504d849d2ed1a8890d32e1e9b2bf
author Jordan Halterman <jordan@opennetworking.org> Mon Oct 28 10:12:43 2019 -0700
committer pier <pier@opennetworking.org> Fri Nov 29 17:55:54 2019 +0100
tree a8cfb349c21933a3041f78e16ed1a58ad3540d72
parent b673adc9f050dc323ea7b6b5c8a40dbbb9ea15b4

Avoid reading cluster metadata in critical section of DistributedClusterStore

Change-Id: Ifa1ade86a45c7ed09e5e6f6bba05a7b96df3c201

core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
index 374abf2..1c91bf3 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
@@ -337,7 +337,7 @@
         @Override
         public void accept(Endpoint sender, byte[] message) {
             HeartbeatMessage hb = SERIALIZER.decode(message);
-            if (clusterMetadataService.getClusterMetadata().getNodes().contains(hb.source())) {
+            if (allNodes.containsKey(hb.source.id())) {
                 // Avoid reporting heartbeats that have been enqueued by setting a minimum interval.
                 long heartbeatTime = System.currentTimeMillis();
                 Long lastHeartbeatTime = failureDetector.getLastHeartbeatTime(hb.source().id());