Merge "Instance identifier support"

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java
index 2db3c9d4f1d538893da1b9de420c696ef555e242..034b39a8066b0fbf631c4159558efdd15a362a2a 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java
+++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java
@@ -21,6 +21,7 @@ import java.lang.management.ManagementFactory;
 public class NetconfOperationServiceFactoryImpl implements NetconfOperationServiceFactory {
 
     public static final int ATTEMPT_TIMEOUT_MS = 1000;
+    private static final int SILENT_ATTEMPTS = 30;
 
     private final YangStoreService yangStoreService;
     private final ConfigRegistryJMXClient jmxClient;
@@ -34,25 +35,35 @@ public class NetconfOperationServiceFactoryImpl implements NetconfOperationServi
     public NetconfOperationServiceFactoryImpl(YangStoreService yangStoreService, MBeanServer mBeanServer) {
         this.yangStoreService = yangStoreService;
 
+        ConfigRegistryJMXClient configRegistryJMXClient;
+        int i = 0;
         // Config registry might not be present yet, but will be eventually
         while(true) {
 
-            final ConfigRegistryJMXClient configRegistryJMXClient;
             try {
                 configRegistryJMXClient = new ConfigRegistryJMXClient(mBeanServer);
+                break;
             } catch (IllegalStateException e) {
-                logger.debug("Jmx client could not be created, reattempting");
+                ++i;
+                if (i > SILENT_ATTEMPTS) {
+                    logger.info("JMX client not created after {} attempts, still trying", i, e);
+                } else {
+                    logger.debug("JMX client could not be created, reattempting, try {}", i, e);
+                }
                 try {
                     Thread.sleep(ATTEMPT_TIMEOUT_MS);
                 } catch (InterruptedException e1) {
                     Thread.currentThread().interrupt();
-                    throw new RuntimeException(e1);
+                    throw new RuntimeException("Interrupted while reattempting connection", e1);
                 }
-                continue;
             }
+        }
 
-            jmxClient = configRegistryJMXClient;
-            break;
+        jmxClient = configRegistryJMXClient;
+        if (i > SILENT_ATTEMPTS) {
+            logger.info("Created JMX client after {} attempts", i);
+        } else {
+            logger.debug("Created JMX client after {} attempts", i);
         }
     }