X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2FInitializer.java;h=799f455c8c14a7b204217f8be3d24484bc770d2b;hb=564c8c0409cbfd8d6ad2b0dd440c6301f09301f5;hp=c39de60c08f4849f247cce8a99aaaeffda45437b;hpb=6c0d57eeaa87ac1d2a4a808a93963a5c3c78d68a;p=holmes%2Frule-management.git

diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java
index c39de60..799f455 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/Initializer.java
@@ -30,13 +30,17 @@ import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
+import static org.onap.holmes.common.config.MicroServiceConfig.POD_IP;
 import static org.onap.holmes.common.utils.CommonUtils.getEnv;
 import static org.onap.holmes.common.utils.CommonUtils.isIpAddress;
 
 @Service
 public class Initializer {
     private static final Logger logger = LoggerFactory.getLogger(Initializer.class);
+    private volatile static boolean readyForMsbReg = false;
     private MsbRegister msbRegister;
 
     @Inject
@@ -46,13 +50,36 @@ public class Initializer {
 
     @PostConstruct
     private void init() {
-        try {
-            msbRegister.register2Msb(createMicroServiceInfo());
-        } catch (CorrelationException e) {
-            logger.error(e.getMessage(), e);
+        Executors.newSingleThreadExecutor().execute(() -> {
+            waitUntilReady();
+            try {
+                msbRegister.register2Msb(createMicroServiceInfo());
+            } catch (CorrelationException e) {
+                logger.error(e.getMessage(), e);
+            }
+        });
+    }
+
+    private void waitUntilReady() {
+        int count = 1;
+        while (!readyForMsbReg) {
+            if (count > 20) {
+                break;
+            }
+            int interval = 5 * count++;
+            logger.info("Not ready for MSB registration. Try again after {} seconds...", interval);
+            try {
+                TimeUnit.SECONDS.sleep(interval);
+            } catch (InterruptedException e) {
+                logger.info(e.getMessage(), e);
+            }
         }
     }
 
+    public static void setReadyForMsbReg(boolean readyForMsbReg) {
+        Initializer.readyForMsbReg = readyForMsbReg;
+    }
+
     private MicroServiceInfo createMicroServiceInfo() {
         String[] serviceIpAndPort = MicroServiceConfig.getMicroServiceIpAndPort();
         MicroServiceInfo msinfo = new MicroServiceInfo();
@@ -66,7 +93,7 @@ public class Initializer {
         msinfo.setEnable_ssl(CommonUtils.isHttpsEnabled());
         Set<Node> nodes = new HashSet<>();
         Node node = new Node();
-        node.setIp(isIpAddress(serviceIpAndPort[0]) ? serviceIpAndPort[0] : getEnv("HOLMES_RULE_MGMT_SERVICE_HOST"));
+        node.setIp(isIpAddress(serviceIpAndPort[0]) ? serviceIpAndPort[0] : getEnv(POD_IP));
         node.setPort("9101");
         /* Following codes will cause an unregistration from MSB (due to MSB malfunction), comment them for now
         String msbAddrTemplate = (CommonUtils.isHttpsEnabled() ? "https" : "http")