#389 Replicas are now spread across hosts correctly

ForestBuilder was correct, but ConfigureForestReplicasCommand was only passing it one forest at a time

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/forests/ConfigureForestReplicasCommand.java

@@ -108,11 +108,45 @@ protected void deleteReplicas(String forestName, ForestManager forestMgr) {
 	 * @param context
 	 */
 	protected void configureDatabaseReplicaForests(String databaseName, int replicaCount, List<String> hostNames, CommandContext context) {
+		List<Forest> forestsNeedingReplicas = determineForestsNeedingReplicas(databaseName, context);
+
+		ForestBuilder forestBuilder = new ForestBuilder();
+		List<String> selectedHostNames = getHostNamesForDatabaseForests(databaseName, hostNames, context);
+		ForestPlan forestPlan = new ForestPlan(databaseName, selectedHostNames).withReplicaCount(replicaCount);
+		List<String> dataDirectories = forestBuilder.determineDataDirectories(databaseName, context.getAppConfig());
+		forestBuilder.addReplicasToForests(forestsNeedingReplicas, forestPlan, context.getAppConfig(), dataDirectories);
+
+		// TODO Use CMA here in the future? Need to test to see if a forest name + replicas are allowable
+		ForestManager forestManager = new ForestManager(context.getManageClient());
+		for (Forest forest : forestsNeedingReplicas) {
+			final String forestName = forest.getForestName();
+
+			Forest forestWithOnlyReplicas = new Forest();
+			forestWithOnlyReplicas.setForestReplica(forest.getForestReplica());
+			String json = forestWithOnlyReplicas.getJson();
+
+			logger.info(format("Creating forest replicas for primary forest %s", forestName));
+			context.getManageClient().putJson(forestManager.getPropertiesPath(forestName), json);
+			logger.info(format("Finished creating forest replicas for primary forest %s", forestName));
+		}
+	}
+
+	/**
+	 * Per #389, the list of replicas needs to be calculated for all forests at once so that ForestBuilder produces the
+	 * correct results.
+	 *
+	 * @param databaseName
+	 * @param context
+	 * @return
+	 */
+	protected List<Forest> determineForestsNeedingReplicas(String databaseName, CommandContext context) {
 		ForestManager forestManager = new ForestManager(context.getManageClient());
 		DatabaseManager dbMgr = new DatabaseManager(context.getManageClient());
 		API api = new API(context.getManageClient());
 		ResourceMapper resourceMapper = new DefaultResourceMapper(api);
 
+		List<Forest> forestsNeedingReplicas = new ArrayList<>();
+
 		for (String forestName : dbMgr.getForestNames(databaseName)) {
 			logger.info(format("Checking the status of forest %s to determine if it is a primary forest and whether or not it has replicas already.", forestName));
 			ForestStatus status = forestManager.getForestStatus(forestName);
@@ -125,25 +159,12 @@ protected void configureDatabaseReplicaForests(String databaseName, int replicaC
 				continue;
 			}
 
-			logger.info(format("Creating forest replicas for primary forest %s", forestName));
-
 			String forestJson = forestManager.getPropertiesAsJson(forestName);
 			Forest forest = resourceMapper.readResource(forestJson, Forest.class);
-
-			List<String> selectedHostNames = getHostNamesForDatabaseForests(databaseName, hostNames, context);
-
-			ForestBuilder forestBuilder = new ForestBuilder();
-			ForestPlan forestPlan = new ForestPlan(databaseName, selectedHostNames).withReplicaCount(replicaCount);
-			List<String> dataDirectories = forestBuilder.determineDataDirectories(databaseName, context.getAppConfig());
-			forestBuilder.addReplicasToForests(Arrays.asList(forest), forestPlan, context.getAppConfig(), dataDirectories);
-
-			Forest forestWithOnlyReplicas = new Forest();
-			forestWithOnlyReplicas.setForestReplica(forest.getForestReplica());
-
-			String json = forestWithOnlyReplicas.getJson();
-			context.getManageClient().putJson(forestManager.getPropertiesPath(forestName), json);
-			logger.info(format("Finished creating forest replicas for primary forest %s", forestName));
+			forestsNeedingReplicas.add(forest);
 		}
+
+		return forestsNeedingReplicas;
 	}
 
 	/**

src/test/java/com/marklogic/appdeployer/command/forests/BuildForestReplicaTest.java

@@ -14,6 +14,29 @@ public class BuildForestReplicaTest extends Assert {
 
 	private ForestBuilder builder = new ForestBuilder();
 
+	@Test
+	public void multipleForestsOnEachHost() {
+		AppConfig appConfig = newAppConfig("mlForestsPerHost", "db,2");
+
+		List<Forest> forests = builder.buildForests(
+			new ForestPlan("db", "host1", "host2", "host3").withReplicaCount(1), appConfig);
+
+		assertEquals("host1", forests.get(0).getHost());
+		assertEquals("host2", forests.get(0).getForestReplica().get(0).getHost());
+		assertEquals("host1", forests.get(1).getHost());
+		assertEquals("host3", forests.get(1).getForestReplica().get(0).getHost());
+
+		assertEquals("host2", forests.get(2).getHost());
+		assertEquals("host3", forests.get(2).getForestReplica().get(0).getHost());
+		assertEquals("host2", forests.get(3).getHost());
+		assertEquals("host1", forests.get(3).getForestReplica().get(0).getHost());
+
+		assertEquals("host3", forests.get(4).getHost());
+		assertEquals("host1", forests.get(4).getForestReplica().get(0).getHost());
+		assertEquals("host3", forests.get(5).getHost());
+		assertEquals("host2", forests.get(5).getForestReplica().get(0).getHost());
+	}
+
 	@Test
 	public void customNamingStrategyWithDistributedStrategy() {
 		AppConfig appConfig = newAppConfig("mlForestsPerHost", "my-database,2");

src/test/java/com/marklogic/appdeployer/command/forests/ConfigureForestReplicasDebug.java

@@ -23,10 +23,10 @@ public static void main(String[] args) {
 
 		ManageConfig config = new ManageConfig(host, 8002, "admin", password);
 		ManageClient manageClient = new ManageClient(config);
-		AppConfig appConfig = new AppConfig();
 
+		AppConfig appConfig = new AppConfig();
 		Map<String, Integer> map = new HashMap<>();
-		map.put(dbName, 1);
+		map.put(dbName, 2);
 		appConfig.setDatabaseNamesAndReplicaCounts(map);
 
 		List<String> hostNames = new HostManager(manageClient).getHostNames();
@@ -52,16 +52,13 @@ public static void main(String[] args) {
 		ddc.setDatabaseName(dbName);
 
 		ConfigureForestReplicasCommand cfrc = new ConfigureForestReplicasCommand();
-		Map<String, Integer> replicaCounts = new HashMap<>();
-		replicaCounts.put(dbName, 1);
-		appConfig.setDatabaseNamesAndReplicaCounts(replicaCounts);
 
 		// Deploy the database, and then configure replicas
 		ddc.execute(context);
 		cfrc.execute(context);
 
 		// Deploy again to make sure there are no errors
-		//cfrc.execute(context);
+		cfrc.execute(context);
 
 		// Then delete the replicas, and then undeploy the database
 		cfrc.undo(context);