Added test for deleting multiple "other" servers at once, and added exception handling for intermittent error

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/AbstractResourceCommand.java

@@ -14,6 +14,7 @@ public abstract class AbstractResourceCommand extends AbstractUndoableCommand {
 
     private boolean deleteResourcesOnUndo = true;
     private boolean restartAfterDelete = false;
+    private boolean catchExceptionOnDeleteFailure = false;
 
     protected abstract File[] getResourceDirs(CommandContext context);
 
@@ -71,17 +72,38 @@ public void undo(CommandContext context) {
         }
     }
 
+    /**
+     * If catchExceptionOnDeleteFailure is set to true, this will catch and log any exception that occurs when trying to
+     * delete the resource. This has been necessary when deleting two app servers in a row - for some reason, the 2nd
+     * delete will intermittently fail with a connection reset error, but the app server is in fact deleted
+     * successfully.
+     * 
+     * @param mgr
+     * @param context
+     * @param f
+     */
     protected void deleteResource(final ResourceManager mgr, CommandContext context, File f) {
         final String payload = tokenReplacer.replaceTokens(copyFileToString(f), context.getAppConfig(), false);
-        if (restartAfterDelete) {
-            context.getAdminManager().invokeActionRequiringRestart(new ActionRequiringRestart() {
-                @Override
-                public boolean execute() {
-                    return mgr.delete(payload).isDeleted();
+        try {
+            if (restartAfterDelete) {
+                context.getAdminManager().invokeActionRequiringRestart(new ActionRequiringRestart() {
+                    @Override
+                    public boolean execute() {
+                        return mgr.delete(payload).isDeleted();
+                    }
+                });
+            } else {
+                mgr.delete(payload);
+            }
+        } catch (RuntimeException e) {
+            if (catchExceptionOnDeleteFailure) {
+                logger.warn("Caught exception while trying to delete resource; cause: " + e.getMessage());
+                if (restartAfterDelete) {
+                    context.getAdminManager().waitForRestart();
                 }
-            });
-        } else {
-            mgr.delete(payload);
+            } else {
+                throw e;
+            }
         }
     }
 
@@ -100,4 +122,8 @@ public boolean isDeleteResourcesOnUndo() {
     public boolean isRestartAfterDelete() {
         return restartAfterDelete;
     }
+
+    public void setCatchExceptionOnDeleteFailure(boolean catchExceptionOnDeleteFailure) {
+        this.catchExceptionOnDeleteFailure = catchExceptionOnDeleteFailure;
+    }
 }

src/main/java/com/marklogic/appdeployer/command/appservers/DeployOtherServersCommand.java

@@ -19,6 +19,7 @@ public DeployOtherServersCommand() {
         setExecuteSortOrder(SortOrderConstants.DEPLOY_OTHER_SERVERS);
         setUndoSortOrder(SortOrderConstants.DELETE_OTHER_SERVERS);
         setRestartAfterDelete(true);
+        setCatchExceptionOnDeleteFailure(true);
         setResourceFilenameFilter(new ResourceFilenameFilter() {
             @Override
             public boolean accept(File dir, String name) {

src/test/java/com/marklogic/appdeployer/command/servers/ManageOtherServerTest.java

@@ -1,32 +1,53 @@
 package com.marklogic.appdeployer.command.servers;
 
-import org.junit.After;
+import java.io.File;
+
 import org.junit.Test;
 
 import com.marklogic.appdeployer.AbstractAppDeployerTest;
+import com.marklogic.appdeployer.ConfigDir;
 import com.marklogic.appdeployer.command.appservers.DeployOtherServersCommand;
 import com.marklogic.appdeployer.command.databases.DeployContentDatabasesCommand;
 import com.marklogic.appdeployer.command.databases.DeploySchemasDatabaseCommand;
 import com.marklogic.appdeployer.command.databases.DeployTriggersDatabaseCommand;
+import com.marklogic.mgmt.appservers.ServerManager;
 
 /**
- * Only purpose of this test so far is to ensure that we wait properly after deleting the server.
+ * Main purpose of these tests is to ensure that we wait properly after deleting a server.
  */
 public class ManageOtherServerTest extends AbstractAppDeployerTest {
 
-    @After
-    public void teardown() {
-        undeploySampleApp();
-    }
-
     @Test
     public void updateMainAndRestRestApiServers() {
         // Create some other databases that have to be deleted to ensure we wait for a restart after deleting the ODBC
         // server
         initializeAppDeployer(new DeployContentDatabasesCommand(1), new DeployTriggersDatabaseCommand(),
                 new DeploySchemasDatabaseCommand(), new DeployOtherServersCommand());
         appConfig.getCustomTokens().put("%%ODBC_PORT%%", "8048");
+        try {
+            appDeployer.deploy(appConfig);
+        } finally {
+            appDeployer.undeploy(appConfig);
+        }
+    }
+
+    @Test
+    public void odbcAndXdbcServers() {
+        appConfig.setConfigDir(new ConfigDir(new File("src/test/resources/sample-app/other-servers")));
+
+        ServerManager mgr = new ServerManager(manageClient);
+
+        initializeAppDeployer(new DeployOtherServersCommand());
+        appConfig.getCustomTokens().put("%%ODBC_PORT%%", "8048");
+        appConfig.getCustomTokens().put("%%XDBC_PORT%%", "8049");
         appDeployer.deploy(appConfig);
 
+        assertTrue(mgr.exists("sample-app-xdbc"));
+        assertTrue(mgr.exists("sample-app-odbc"));
+        
+        appDeployer.undeploy(appConfig);
+
+        assertFalse(mgr.exists("sample-app-xdbc"));
+        assertFalse(mgr.exists("sample-app-odbc"));
     }
 }

src/test/resources/sample-app/other-servers/servers/odbc-server.json

@@ -0,0 +1,9 @@
+{
+  "server-name": "%%NAME%%-odbc",
+  "server-type": "odbc",
+  "root": "/",
+  "group-name": "%%GROUP%%",
+  "port": %%ODBC_PORT%%,
+  "modules-database": "Modules",
+  "content-database": "Documents"
+}

src/test/resources/sample-app/other-servers/servers/xdbc-server.json

@@ -0,0 +1,9 @@
+{
+  "server-name": "%%NAME%%-xdbc",
+  "server-type": "xdbc",
+  "root": "/",
+  "group-name": "%%GROUP%%",
+  "port": %%XDBC_PORT%%,
+  "modules-database": "Modules",
+  "content-database": "Documents"
+}