commit dc8a55609dddd3d8c617e3e36a0a7cf7568a64bb
author jaegonkim <jaegon77.kim@samsung.com> Thu Apr 05 23:14:57 2018 +0900
committer Thomas Vachuska <tom@opennetworking.org> Tue Apr 10 22:32:02 2018 +0000
tree ac23fb0a48f3d1774ba19c6c0372638338990577
parent d6587b92e11eabbb72f84209c9a6e1b1bc75af48

[ONOS-7585] ObjectiveTracker.intentsByLink is not updated after ONOS node reboot

Change-Id: Ic3fd00fdae2e934739f6536bfad8310596dbc2ef

core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java

diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
index f94fd6f..f423ebc 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
@@ -111,7 +111,9 @@
     protected HostService hostService;
 
     @Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY,
-               policy = ReferencePolicy.DYNAMIC)
+                bind = "bindComponentConfigService",
+                unbind = "unbindComponentConfigService",
+                policy = ReferencePolicy.DYNAMIC)
     protected IntentService intentService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -131,6 +133,29 @@
 
     protected final AtomicBoolean updateScheduled = new AtomicBoolean(false);
 
+    /**
+     * Hook for wiring up optional reference to a service.
+     *
+     * @param service service being announced
+     */
+    protected void bindComponentConfigService(IntentService service) {
+        if (intentService == null) {
+            intentService = service;
+            scheduleIntentUpdate(1);
+        }
+    }
+
+    /**
+     * Hook for unwiring optional reference to a service.
+     *
+     * @param service service being withdrawn
+     */
+    protected void unbindComponentConfigService(IntentService service) {
+        if (intentService == service) {
+            intentService = null;
+        }
+    }
+
     @Activate
     public void activate() {
         topologyService.addListener(listener);
@@ -138,6 +163,7 @@
         deviceService.addListener(deviceListener);
         hostService.addListener(hostListener);
         partitionService.addListener(partitionListener);
+        scheduleIntentUpdate(1);
         log.info("Started");
     }
 
@@ -394,22 +420,24 @@
     }
 
     private void doIntentUpdate() {
-        updateScheduled.set(false);
-        if (intentService == null) {
-            log.warn("Intent service is not bound yet");
-            return;
-        }
-        try {
-            //FIXME very inefficient
-            for (IntentData intentData : intentService.getIntentData()) {
-                try {
-                    trackIntent(intentData);
-                } catch (NullPointerException npe) {
-                    log.warn("intent error {}", intentData.key(), npe);
-                }
+        synchronized (this) {
+            updateScheduled.set(false);
+            if (intentService == null) {
+                log.warn("Intent service is not bound yet");
+                return;
             }
-        } catch (Exception e) {
-            log.warn("Exception caught during update task", e);
+            try {
+                //FIXME very inefficient
+                for (IntentData intentData : intentService.getIntentData()) {
+                    try {
+                        trackIntent(intentData);
+                    } catch (NullPointerException npe) {
+                        log.warn("intent error {}", intentData.key(), npe);
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("Exception caught during update task", e);
+            }
         }
     }