#394 Can now deploy partition and partition queries

Author: rjrudin

src/main/java/com/marklogic/appdeployer/ConfigDir.java

@@ -128,6 +128,16 @@ public File getTriggersDir() {
 		return new File(getBaseDir(), "triggers");
 	}
 
+	// This is expected to be relative to a database-specific directory
+	public File getPartitionsDir() {
+		return new File(getBaseDir(), "partitions");
+	}
+
+	// This is expected to be relative to a database-specific directory
+	public File getPartitionQueriesDir() {
+		return new File(getBaseDir(), "partition-queries");
+	}
+
 	public File getUsersDir() {
 		return new File(getSecurityDir(), "users");
 	}

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

@@ -23,6 +23,8 @@
 import com.marklogic.appdeployer.command.modules.DeleteTestModulesCommand;
 import com.marklogic.appdeployer.command.modules.LoadModulesCommand;
 import com.marklogic.appdeployer.command.plugins.InstallPluginsCommand;
+import com.marklogic.appdeployer.command.rebalancer.DeployPartitionQueriesCommand;
+import com.marklogic.appdeployer.command.rebalancer.DeployPartitionsCommand;
 import com.marklogic.appdeployer.command.restapis.DeployRestApiServersCommand;
 import com.marklogic.appdeployer.command.schemas.LoadSchemasCommand;
 import com.marklogic.appdeployer.command.security.*;
@@ -42,7 +44,7 @@
 /**
  * The intent of this class is to construct a map of commonly used commands that can used in a variety of contexts - i.e.
  * ml-gradle or the Data Hub Framework - thus preventing those clients from having to duplicate this code.
- *
+ * <p>
  * A map is returned so that the commands can be grouped into lists, which is convenient for e.g. ml-gradle tasks that
  * want to execute all of the commands for a particular resource or set of resources - e.g. mlSecurityCommands for
  * invoking all commands pertaining to security resources.
@@ -83,6 +85,12 @@ public Map<String, List<Command>> buildCommandMap() {
 		dbCommands.add(new DeployOtherDatabasesCommand());
 		map.put("mlDatabaseCommands", dbCommands);
 
+		// Database rebalancer
+		List<Command> rebalancerCommands = new ArrayList<>();
+		rebalancerCommands.add(new DeployPartitionsCommand());
+		rebalancerCommands.add(new DeployPartitionQueriesCommand());
+		map.put("mlRebalancerCommands", rebalancerCommands);
+
 		// Schemas
 		List<Command> schemaCommands = new ArrayList<>();
 		schemaCommands.add(new LoadSchemasCommand());

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

@@ -2,11 +2,11 @@
 
 public abstract class SortOrderConstants {
 
-    public static Integer DEPLOY_PRIVILEGES = 5;
-    public static Integer DEPLOY_ROLES = 10;
+	public static Integer DEPLOY_PRIVILEGES = 5;
+	public static Integer DEPLOY_ROLES = 10;
 	public static Integer DEPLOY_PROTECTED_PATHS = 12; // depends on roles
 	public static Integer DEPLOY_QUERY_ROLESETS = 13; // depends on roles
-    public static Integer DEPLOY_USERS = 15; // depends on roles
+	public static Integer DEPLOY_USERS = 15; // depends on roles
 
 	// After users are deployed so they're not included in combined CMA requests
 	public static Integer DEPLOY_PRIVILEGE_ROLES = 18;
@@ -16,38 +16,40 @@ public abstract class SortOrderConstants {
 	public static Integer GENERATE_TEMPORARY_CERTIFICATE = 25;
 	public static Integer INSERT_HOST_CERTIFICATES = 28;
 
-    public static Integer DEPLOY_EXTERNAL_SECURITY = 35;
-    public static Integer DEPLOY_PROTECTED_COLLECTIONS = 40;
-    public static Integer DEPLOY_MIMETYPES = 45;
+	public static Integer DEPLOY_EXTERNAL_SECURITY = 35;
+	public static Integer DEPLOY_PROTECTED_COLLECTIONS = 40;
+	public static Integer DEPLOY_MIMETYPES = 45;
 
 	public static Integer DEPLOY_GROUPS = 90;
 
 	// Hosts need to be assigned to their group before databases are created.
 	// This is so that when forests are created based on the mlDatabaseGroups
 	// then the forests will be created on the correct hosts.
-    public static Integer ASSIGN_HOSTS_TO_GROUPS = 95;
+	public static Integer ASSIGN_HOSTS_TO_GROUPS = 95;
 
-    @Deprecated
+	@Deprecated
 	public static Integer DEPLOY_TRIGGERS_DATABASE = 100;
-    @Deprecated
+	@Deprecated
 	public static Integer DEPLOY_SCHEMAS_DATABASE = 100;
 
 	public static Integer DEPLOY_OTHER_DATABASES = 120;
-    public static Integer DEPLOY_FORESTS = 150;
+	public static Integer DEPLOY_FORESTS = 150;
+	public static Integer DEPLOY_PARTITIONS = 170;
+	public static Integer DEPLOY_PARTITION_QUERIES = 175;
 
 	public static Integer DEPLOY_REST_API_SERVERS = 200;
-    public static Integer UPDATE_REST_API_SERVERS = 250;
-    public static Integer DEPLOY_OTHER_SERVERS = 300;
+	public static Integer UPDATE_REST_API_SERVERS = 250;
+	public static Integer DEPLOY_OTHER_SERVERS = 300;
 
-    public static Integer MODIFY_LOCAL_CLUSTER = 350;
+	public static Integer MODIFY_LOCAL_CLUSTER = 350;
 
-    // Module code may depend on schemas, but not vice-versa.
-    public static Integer LOAD_SCHEMAS = 350;
+	// Module code may depend on schemas, but not vice-versa.
+	public static Integer LOAD_SCHEMAS = 350;
 
-    // Modules have to be loaded after the REST API server has been updated, for if the deployer is expecting to load
-    // modules via SSL, then the REST API server must already be configured with a certificate template
-    public static Integer LOAD_MODULES = 400;
-    public static Integer DELETE_TEST_MODULES = 410;
+	// Modules have to be loaded after the REST API server has been updated, for if the deployer is expecting to load
+	// modules via SSL, then the REST API server must already be configured with a certificate template
+	public static Integer LOAD_MODULES = 400;
+	public static Integer DELETE_TEST_MODULES = 410;
 
 	// The modules database must exist before we deploy amps
 	public static Integer DEPLOY_AMPS = 450;
@@ -58,63 +60,63 @@ public abstract class SortOrderConstants {
 	public static Integer DEPLOY_TEMPORAL_COLLECTIONS = 751;
 	public static Integer DEPLOY_TEMPORAL_COLLECTIONS_LSQT = 752;
 
-    public static Integer DEPLOY_SCHEDULED_TASKS = 800;
-    public static Integer UPDATE_TASK_SERVER = 810;
+	public static Integer DEPLOY_SCHEDULED_TASKS = 800;
+	public static Integer UPDATE_TASK_SERVER = 810;
 
-    public static Integer DEPLOY_DEFAULT_PIPELINES = 900;
-    public static Integer DEPLOY_PIPELINES = 905;
-    public static Integer DEPLOY_DOMAINS = 910;
-    public static Integer DEPLOY_CPF_CONFIGS = 920;
+	public static Integer DEPLOY_DEFAULT_PIPELINES = 900;
+	public static Integer DEPLOY_PIPELINES = 905;
+	public static Integer DEPLOY_DOMAINS = 910;
+	public static Integer DEPLOY_CPF_CONFIGS = 920;
 
-    public static Integer DEPLOY_ALERT_CONFIGS = 950;
-    public static Integer DEPLOY_ALERT_ACTIONS = 960;
-    public static Integer DEPLOY_ALERT_RULES = 970;
+	public static Integer DEPLOY_ALERT_CONFIGS = 950;
+	public static Integer DEPLOY_ALERT_ACTIONS = 960;
+	public static Integer DEPLOY_ALERT_RULES = 970;
 
-    public static Integer DEPLOY_FLEXREP_CONFIGS = 1000;
-    public static Integer DEPLOY_FLEXREP_TARGETS = 1010;
+	public static Integer DEPLOY_FLEXREP_CONFIGS = 1000;
+	public static Integer DEPLOY_FLEXREP_TARGETS = 1010;
 	public static Integer DEPLOY_FLEXREP_PULLS = 1020;
 
-    public static Integer DEPLOY_SQL_VIEWS = 1100;
+	public static Integer DEPLOY_SQL_VIEWS = 1100;
 
-    public static Integer DEPLOY_FOREST_REPLICAS = 1200;
+	public static Integer DEPLOY_FOREST_REPLICAS = 1200;
 
-    public static Integer LOAD_DATA = 1300;
+	public static Integer LOAD_DATA = 1300;
 
-    public static Integer INSTALL_PLUGINS = 1400;
+	public static Integer INSTALL_PLUGINS = 1400;
 
 	public static Integer DELETE_MIMETYPES = 8500;
 
 	public static Integer UNASSIGN_HOSTS_FROM_GROUPS = 8590;
 	public static Integer DELETE_GROUPS = 8600;
 
-    public static Integer DELETE_USERS = 9000;
-    public static Integer DELETE_CERTIFICATE_TEMPLATES = 9010;
-    public static Integer DELETE_EXTERNAL_SECURITY = 9030;
-    public static Integer DELETE_PROTECTED_COLLECTIONS = 9040;
+	public static Integer DELETE_USERS = 9000;
+	public static Integer DELETE_CERTIFICATE_TEMPLATES = 9010;
+	public static Integer DELETE_EXTERNAL_SECURITY = 9030;
+	public static Integer DELETE_PROTECTED_COLLECTIONS = 9040;
 	public static Integer DELETE_QUERY_ROLESETS = 9050;
 
-    // Roles can reference privileges, so must delete roles first
-    public static Integer DELETE_ROLES = 9060;
-    public static Integer DELETE_PRIVILEGES = 9070;
-    // Protected paths reference roles
+	// Roles can reference privileges, so must delete roles first
+	public static Integer DELETE_ROLES = 9060;
+	public static Integer DELETE_PRIVILEGES = 9070;
+	// Protected paths reference roles
 	public static Integer DELETE_PROTECTED_PATHS = 9080;
 
 
 	/*
-     * This executes before databases are deleted, as deleting databases normally deletes the primary forests, so we
-     * need to make sure the replicas are deleted first.
-     */
-    public static Integer DELETE_FOREST_REPLICAS = 8000;
+	 * This executes before databases are deleted, as deleting databases normally deletes the primary forests, so we
+	 * need to make sure the replicas are deleted first.
+	 */
+	public static Integer DELETE_FOREST_REPLICAS = 8000;
 
-    public static Integer DELETE_CONTENT_DATABASES = 8100;
-    public static Integer DELETE_OTHER_DATABASES = 8120;
+	public static Integer DELETE_CONTENT_DATABASES = 8100;
+	public static Integer DELETE_OTHER_DATABASES = 8120;
 
-    @Deprecated
-    public static Integer DELETE_TRIGGERS_DATABASE = 8140;
-    @Deprecated
-    public static Integer DELETE_SCHEMAS_DATABASE = 8160;
+	@Deprecated
+	public static Integer DELETE_TRIGGERS_DATABASE = 8140;
+	@Deprecated
+	public static Integer DELETE_SCHEMAS_DATABASE = 8160;
 
-    public static Integer DELETE_REST_API_SERVERS = 7000;
+	public static Integer DELETE_REST_API_SERVERS = 7000;
 
 	// Amps can reference roles and databases, so must delete amps before both (and before deleting REST API servers
 	// too, which may delete databases)

src/main/java/com/marklogic/appdeployer/command/rebalancer/DeployPartitionQueriesCommand.java

@@ -0,0 +1,49 @@
+package com.marklogic.appdeployer.command.rebalancer;
+
+import com.marklogic.appdeployer.AppConfig;
+import com.marklogic.appdeployer.ConfigDir;
+import com.marklogic.appdeployer.command.AbstractResourceCommand;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.mgmt.resource.ResourceManager;
+import com.marklogic.mgmt.resource.rebalancer.PartitionQueryManager;
+
+import java.io.File;
+
+public class DeployPartitionQueriesCommand extends AbstractResourceCommand {
+
+	private PartitionQueryManager currentPartitionQueryManager;
+
+	public DeployPartitionQueriesCommand() {
+		setExecuteSortOrder(SortOrderConstants.DEPLOY_PARTITION_QUERIES);
+
+		// Partition queries are expected to be deleted when the parent database is deleted
+		setDeleteResourcesOnUndo(false);
+	}
+
+	@Override
+	public void execute(CommandContext context) {
+		AppConfig appConfig = context.getAppConfig();
+		for (ConfigDir configDir : appConfig.getConfigDirs()) {
+			for (File dir : configDir.getDatabaseResourceDirectories()) {
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployPartitionQueries(context, new ConfigDir(dir), databaseName);
+			}
+		}
+	}
+
+	protected void deployPartitionQueries(CommandContext context, ConfigDir configDir, String databaseIdOrName) {
+		currentPartitionQueryManager = new PartitionQueryManager(context.getManageClient(), databaseIdOrName);
+		processExecuteOnResourceDir(context, configDir.getPartitionQueriesDir());
+	}
+
+	@Override
+	protected ResourceManager getResourceManager(CommandContext context) {
+		return currentPartitionQueryManager;
+	}
+
+	@Override
+	protected File[] getResourceDirs(CommandContext context) {
+		return findResourceDirs(context, configDir -> configDir.getPartitionQueriesDir());
+	}
+}

src/main/java/com/marklogic/appdeployer/command/rebalancer/DeployPartitionsCommand.java

@@ -0,0 +1,49 @@
+package com.marklogic.appdeployer.command.rebalancer;
+
+import com.marklogic.appdeployer.AppConfig;
+import com.marklogic.appdeployer.ConfigDir;
+import com.marklogic.appdeployer.command.AbstractResourceCommand;
+import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.SortOrderConstants;
+import com.marklogic.mgmt.resource.ResourceManager;
+import com.marklogic.mgmt.resource.rebalancer.PartitionManager;
+
+import java.io.File;
+
+public class DeployPartitionsCommand extends AbstractResourceCommand {
+
+	private PartitionManager currentPartitionManager;
+
+	public DeployPartitionsCommand() {
+		setExecuteSortOrder(SortOrderConstants.DEPLOY_PARTITIONS);
+
+		// Partitions are expected to be deleted when the parent database is deleted
+		setDeleteResourcesOnUndo(false);
+	}
+
+	@Override
+	public void execute(CommandContext context) {
+		AppConfig appConfig = context.getAppConfig();
+		for (ConfigDir configDir : appConfig.getConfigDirs()) {
+			for (File dir : configDir.getDatabaseResourceDirectories()) {
+				String databaseName = determineDatabaseNameForDatabaseResourceDirectory(context, configDir, dir);
+				deployPartitions(context, new ConfigDir(dir), databaseName);
+			}
+		}
+	}
+
+	protected void deployPartitions(CommandContext context, ConfigDir configDir, String databaseIdOrName) {
+		currentPartitionManager = new PartitionManager(context.getManageClient(), databaseIdOrName);
+		processExecuteOnResourceDir(context, configDir.getPartitionsDir());
+	}
+
+	@Override
+	protected ResourceManager getResourceManager(CommandContext context) {
+		return currentPartitionManager;
+	}
+
+	@Override
+	protected File[] getResourceDirs(CommandContext context) {
+		return findResourceDirs(context, configDir -> configDir.getPartitionsDir());
+	}
+}

src/main/java/com/marklogic/mgmt/ManageClient.java

@@ -263,13 +263,20 @@ public Fragment getXmlAsSecurityUser(String path, String... namespacePrefixesAnd
 	}
 
     public String getJson(String path) {
-        logRequest(path, "JSON", "GET");
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
-        return getRestTemplate().exchange(buildUri(path), HttpMethod.GET, new HttpEntity<>(headers), String.class)
-                .getBody();
+		return getJson(path, String.class).getBody();
     }
 
+	public JsonNode getJsonNode(String path) {
+		return getJson(path, JsonNode.class).getBody();
+	}
+
+	protected <T> ResponseEntity<T> getJson(String path, Class<T> responseType) {
+		logRequest(path, "JSON", "GET");
+		HttpHeaders headers = new HttpHeaders();
+		headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
+		return getRestTemplate().exchange(buildUri(path), HttpMethod.GET, new HttpEntity<>(headers), responseType);
+	}
+
     public String getJson(URI uri) {
         logRequest(uri.toString(), "JSON", "GET");
         HttpHeaders headers = new HttpHeaders();

src/main/java/com/marklogic/mgmt/api/database/AssignmentPolicy.java

@@ -10,11 +10,33 @@ public class AssignmentPolicy {
 	@XmlElement(name = "assignment-policy-name")
 	private String assignmentPolicyName;
 
+	@XmlElement(name = "lower-bound-included")
+	private Boolean lowerBoundIncluded;
+
+	@XmlElement(name = "default-partition")
+	private Integer defaultPartition;
+
 	public String getAssignmentPolicyName() {
 		return assignmentPolicyName;
 	}
 
 	public void setAssignmentPolicyName(String assignmentPolicyName) {
 		this.assignmentPolicyName = assignmentPolicyName;
 	}
+
+	public Boolean getLowerBoundIncluded() {
+		return lowerBoundIncluded;
+	}
+
+	public void setLowerBoundIncluded(Boolean lowerBoundIncluded) {
+		this.lowerBoundIncluded = lowerBoundIncluded;
+	}
+
+	public Integer getDefaultPartition() {
+		return defaultPartition;
+	}
+
+	public void setDefaultPartition(Integer defaultPartition) {
+		this.defaultPartition = defaultPartition;
+	}
 }