commit 7be4e67f7b24c20dc91ad29396ad9e5648e817b5
author Yi Tseng <yi@opennetworking.org> Tue Dec 05 15:03:26 2017 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Apr 10 18:38:14 2018 +0000
tree 7550a8dc1beb1210e04abf2bbce4c819940d4316
parent a1988f3fdfa1c4d662c7188625ca132d574cd8ac

[ONOS-7288] Fix race condition of device manager

Change-Id: I38aaae701e96f1114177e619c6f30e1b79f0134a

core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index e103b7f..1892ae8 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -559,14 +559,14 @@
                 deviceDescription = deviceAnnotationOp.combine(deviceId, deviceDescription, Optional.of(annoConfig));
             }
 
+            DeviceEvent event = store.createOrUpdateDevice(provider().id(), deviceId,
+                                                           deviceDescription);
             Futures.getUnchecked(mastershipService.requestRoleFor(deviceId)
                                          .thenAccept(role -> {
                                              log.info("Local role is {} for {}", role, deviceId);
                                              applyRole(deviceId, role);
                                          }));
 
-            DeviceEvent event = store.createOrUpdateDevice(provider().id(), deviceId,
-                                                           deviceDescription);
             if (portConfig != null) {
                 //updating the ports if configration exists
                 List<PortDescription> complete = store.getPortDescriptions(provider().id(), deviceId)