commit 623344162b457c47abc1a4c5518ee28eddffb0db
author HIGUCHI Yuta <y-higuchi@ak.jp.nec.com> Fri Mar 13 13:23:05 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Sun Mar 15 21:43:21 2015 +0000
tree b860138baf7e4e7f0f88912497bcb09bf2647374
parent 7bb8b3fd679c91df0d0b05b626611c9ab8657669

Ignore event if not ready to serve as MASTER

- Issue similar to ONOS-1208 on Device Store

Change-Id: I1f3922f29d66ff68c18e364aff27ded414664889

core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 06a60d5..325242a 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -1488,6 +1488,11 @@
             ProviderId providerId = event.providerId();
             DeviceId deviceId = event.deviceId();
             DeviceDescription deviceDescription = event.deviceDescription();
+            if (!deviceClockService.isTimestampAvailable(deviceId)) {
+                // workaround for ONOS-1208
+                log.warn("Not ready to accept update. Dropping {}", deviceDescription);
+                return;
+            }
 
             try {
                 createOrUpdateDevice(providerId, deviceId, deviceDescription);
@@ -1508,6 +1513,11 @@
             ProviderId providerId = event.providerId();
             DeviceId deviceId = event.deviceId();
             List<PortDescription> portDescriptions = event.portDescriptions();
+            if (!deviceClockService.isTimestampAvailable(deviceId)) {
+                // workaround for ONOS-1208
+                log.warn("Not ready to accept update. Dropping {}", portDescriptions);
+                return;
+            }
 
             try {
                 updatePorts(providerId, deviceId, portDescriptions);