#117 Now have a command for waiting for tasks to finish

Author: rjrudin

build.gradle

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.marklogic:ml-javaclient-util:2.9.0'
+  compile 'com.marklogic:ml-javaclient-util:2.10.0'
   compile 'jaxen:jaxen:1.1.6'
   compile 'org.apache.httpcomponents:httpclient:4.3.5'
   compile 'org.springframework:spring-web:4.1.5.RELEASE'
@@ -64,9 +64,3 @@ if (project.hasProperty("myBintrayUser")) {
     }
   }
 }
-
-
-
-task wrapper(type: Wrapper) {
-  gradleVersion = '2.12'
-}

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip

src/main/java/com/marklogic/appdeployer/command/tasks/WaitForTaskServerCommand.java

@@ -0,0 +1,35 @@
+package com.marklogic.appdeployer.command.tasks;
+
+import com.marklogic.appdeployer.command.AbstractCommand;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.mgmt.tasks.TaskManager;
+
+public class WaitForTaskServerCommand extends AbstractCommand {
+
+	private String groupName;
+	private int retryInSeconds;
+
+	@Override
+	public void execute(CommandContext context) {
+		TaskManager mgr = new TaskManager(context.getManageClient());
+		String group = groupName != null ? groupName : context.getAppConfig().getGroupName();
+		int retry = retryInSeconds > 0 ? retryInSeconds : 1;
+		mgr.waitForTasksToComplete(group, retry);
+	}
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+	public int getRetryInSeconds() {
+		return retryInSeconds;
+	}
+
+	public void setRetryInSeconds(int retryInSeconds) {
+		this.retryInSeconds = retryInSeconds;
+	}
+}

src/main/java/com/marklogic/mgmt/requests/RequestManager.java

@@ -0,0 +1,30 @@
+package com.marklogic.mgmt.requests;
+
+import com.marklogic.mgmt.AbstractManager;
+import com.marklogic.mgmt.AbstractResourceManager;
+import com.marklogic.mgmt.ManageClient;
+import com.marklogic.rest.util.Fragment;
+import org.jdom2.Element;
+
+import java.util.List;
+
+public class RequestManager extends AbstractManager {
+
+	private ManageClient client;
+
+	public RequestManager(ManageClient client) {
+		this.client = client;
+	}
+
+	public Fragment getRequests() {
+		return client.getXml("/manage/v2/requests");
+	}
+
+	public int getRequestCountForRelationId(String id) {
+		return getRequestsForRelationId(id).size();
+	}
+
+	public List<Element> getRequestsForRelationId(String id) {
+		return getRequests().getElements(format("//req:list-items/req:list-item[req:relation-id = '%s']", id));
+	}
+}

src/main/java/com/marklogic/mgmt/tasks/TaskManager.java

@@ -5,6 +5,7 @@
 
 import com.marklogic.mgmt.AbstractResourceManager;
 import com.marklogic.mgmt.ManageClient;
+import com.marklogic.mgmt.requests.RequestManager;
 import com.marklogic.rest.util.Fragment;
 
 /**
@@ -107,6 +108,33 @@ public void deleteAllScheduledTasks() {
         }
     }
 
+	public void waitForTasksToComplete(String group, int retryInSeconds) {
+		Fragment servers = getManageClient().getXml("/manage/v2/task-servers");
+		String taskServerId = servers.getElementValue(format("//ts:list-item[ts:groupnameref = '%s']/ts:idref", group));
+		if (taskServerId == null) {
+			logger.warn(format("Could not find task server ID for group %s, so not waiting for tasks to complete", group));
+			return;
+		}
+		RequestManager mgr = new RequestManager(getManageClient());
+		if (logger.isInfoEnabled()) {
+			logger.info("Waiting for tasks to complete on task server");
+		}
+		int count = mgr.getRequestCountForRelationId(taskServerId);
+		while (count > 0) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Waiting for tasks to complete on task server, count: " + count);
+			}
+			try {
+				Thread.sleep(retryInSeconds * 1000);
+			} catch (InterruptedException e) {
+			}
+			count = mgr.getRequestCountForRelationId(taskServerId);
+		}
+		if (logger.isInfoEnabled()) {
+			logger.info("Finished waiting for tasks to complete on task server");
+		}
+	}
+
     public void setGroupName(String groupName) {
         this.groupName = groupName;
     }

src/main/java/com/marklogic/rest/util/Fragment.java

@@ -37,6 +37,8 @@ public Fragment(String xml, Namespace... namespaces) {
             list.add(Namespace.getNamespace("msec", "http://marklogic.com/manage/security"));
             list.add(Namespace.getNamespace("sec", "http://marklogic.com/xdmp/security"));
             list.add(Namespace.getNamespace("arp", "http://marklogic.com/manage/alert-rule/properties"));
+			list.add(Namespace.getNamespace("ts", "http://marklogic.com/manage/task-server"));
+			list.add(Namespace.getNamespace("req", "http://marklogic.com/manage/requests"));
             for (Namespace n : namespaces) {
                 list.add(n);
             }