commit 5b78dc86f1bb444154ebce88154b994dc947c8f8
author Jordan Halterman <jordan@onlab.us> Wed Apr 19 07:55:48 2017 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Wed Apr 19 17:54:01 2017 +0000
tree b6f6be04f0e83aae84c184ca70aa3e5837b5775f
parent 1a1867a64c2c8650e9e0ca9a7701a6120d8c6946

[ONOS-6322] - Use event timestamp in GossipDeviceStore when marking devices offline in response to gossip messages on standby nodes.

Change-Id: Id6fea7f9eb143af5b28d455d3f217fcea97b941f

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 33f131e..267ee48 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
@@ -398,7 +398,7 @@
             if (oldDevice == null) {
                 // REGISTER
                 if (!deltaDesc.value().isDefaultAvailable()) {
-                    return registerDevice(providerId, newDevice);
+                    return registerDevice(providerId, newDevice, deltaDesc.timestamp());
                 }
                 // ADD
                 return createDevice(providerId, newDevice, deltaDesc.timestamp());
@@ -467,7 +467,7 @@
         return event;
     }
 
-    private DeviceEvent registerDevice(ProviderId providerId, Device newDevice) {
+    private DeviceEvent registerDevice(ProviderId providerId, Device newDevice, Timestamp newTimestamp) {
         // update composed device cache
         Device oldDevice = devices.putIfAbsent(newDevice.id(), newDevice);
         verify(oldDevice == null,
@@ -475,7 +475,7 @@
                providerId, oldDevice, newDevice);
 
         if (!providerId.isAncillary()) {
-            markOffline(newDevice.id());
+            markOffline(newDevice.id(), newTimestamp);
         }
 
         return new DeviceEvent(DeviceEvent.Type.DEVICE_ADDED, newDevice, null);
@@ -483,7 +483,10 @@
 
     @Override
     public DeviceEvent markOffline(DeviceId deviceId) {
-        final Timestamp timestamp = deviceClockService.getTimestamp(deviceId);
+        return markOffline(deviceId, deviceClockService.getTimestamp(deviceId));
+    }
+
+    private DeviceEvent markOffline(DeviceId deviceId, Timestamp timestamp) {
         final DeviceEvent event = markOfflineInternal(deviceId, timestamp);
         if (event != null) {
             log.debug("Notifying peers of a device offline topology event for deviceId: {} {}",