Brian O'Connor

Reducing log level for peer update in IntentStore map

Change-Id: I0cc93784e2ca7dbb8c743840b6427f49a715b554
...@@ -353,6 +353,9 @@ public class EventuallyConsistentMapImpl<K, V> ...@@ -353,6 +353,9 @@ public class EventuallyConsistentMapImpl<K, V>
353 if (value.isPresent() && existing != null && existing.isAlive()) { 353 if (value.isPresent() && existing != null && existing.isAlive()) {
354 valueMatches = Objects.equals(value.get(), existing.get()); 354 valueMatches = Objects.equals(value.get(), existing.get());
355 } 355 }
356 + if (existing == null) {
357 + log.debug("ECMap Remove: Existing value for key {} is already null", k);
358 + }
356 updated.set(valueMatches && (existing == null || tombstone.isNewerThan(existing))); 359 updated.set(valueMatches && (existing == null || tombstone.isNewerThan(existing)));
357 if (updated.get()) { 360 if (updated.get()) {
358 previousValue.set(existing); 361 previousValue.set(existing);
......
...@@ -194,8 +194,8 @@ public class GossipIntentStore ...@@ -194,8 +194,8 @@ public class GossipIntentStore
194 NodeId master = partitionService.getLeader(key); 194 NodeId master = partitionService.getLeader(key);
195 NodeId origin = (data != null) ? data.origin() : null; 195 NodeId origin = (data != null) ? data.origin() : null;
196 if (master == null || origin == null) { 196 if (master == null || origin == null) {
197 - log.warn("Intent {} has no home; master = {}, origin = {}", 197 + log.debug("Intent {} missing master and/or origin; master = {}, origin = {}",
198 - key, master, origin); 198 + key, master, origin);
199 } 199 }
200 200
201 NodeId me = clusterService.getLocalNode().id(); 201 NodeId me = clusterService.getLocalNode().id();
...@@ -208,7 +208,7 @@ public class GossipIntentStore ...@@ -208,7 +208,7 @@ public class GossipIntentStore
208 } else if (isOrigin) { 208 } else if (isOrigin) {
209 return master != null ? ImmutableList.of(master) : getRandomNode(); 209 return master != null ? ImmutableList.of(master) : getRandomNode();
210 } else { 210 } else {
211 - log.warn("Not master or origin for intent {}", key); 211 + log.warn("No master or origin for intent {}", key);
212 return master != null ? ImmutableList.of(master) : getRandomNode(); 212 return master != null ? ImmutableList.of(master) : getRandomNode();
213 } 213 }
214 } 214 }
......