Added a limit for # of retries

Author: rjrudin

src/main/java/com/marklogic/mgmt/admin/AdminManager.java

@@ -17,6 +17,7 @@
 public class AdminManager extends AbstractManager {
 
     private int waitForRestartCheckInterval = 1000;
+    private int waitForRestartLimit = 30;
     private RestTemplate restTemplate;
     private AdminConfig adminConfig;
 
@@ -139,18 +140,28 @@ public String getLastRestartTimestamp() {
     }
 
     public void waitForRestart() {
+        waitForRestartInternal(1);
+    }
+
+    private void waitForRestartInternal(int attempt) {
+        if (attempt > this.waitForRestartLimit) {
+            logger.error("Reached limit of " + waitForRestartLimit
+                    + ", and MarkLogic has not restarted yet; check MarkLogic status");
+            return;
+        }
         try {
             Thread.sleep(waitForRestartCheckInterval);
             getLastRestartTimestamp();
             if (logger.isInfoEnabled()) {
                 logger.info("Finished waiting for MarkLogic to restart");
             }
         } catch (Exception ex) {
-            logger.info("Waiting for MarkLogic to restart...");
+            attempt++;
+            logger.info("Waiting for MarkLogic to restart, attempt: " + attempt);
             if (logger.isTraceEnabled()) {
                 logger.trace("Caught exception while waiting for MarkLogic to restart: " + ex.getMessage(), ex);
             }
-            waitForRestart();
+            waitForRestartInternal(attempt);
         }
     }
 
@@ -159,8 +170,7 @@ public void waitForRestart() {
      */
     public void setSslFipsEnabled(final boolean enabled) {
         final String xquery = "import module namespace admin = 'http://marklogic.com/xdmp/admin' at '/MarkLogic/admin.xqy'; "
-                + "admin:save-configuration(admin:cluster-set-ssl-fips-enabled(admin:get-configuration(), "
-                + enabled
+                + "admin:save-configuration(admin:cluster-set-ssl-fips-enabled(admin:get-configuration(), " + enabled
                 + "()))";
 
         invokeActionRequiringRestart(new ActionRequiringRestart() {
@@ -191,4 +201,8 @@ public void setWaitForRestartCheckInterval(int waitForRestartCheckInterval) {
         this.waitForRestartCheckInterval = waitForRestartCheckInterval;
     }
 
+    public void setWaitForRestartLimit(int waitForRestartLimit) {
+        this.waitForRestartLimit = waitForRestartLimit;
+    }
+
 }