#371 Multiple paths can now be specified for replica data directories

Author: rjrudin

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

@@ -185,7 +185,7 @@ public class AppConfig {
     private Map<String, List<String>> databaseDataDirectories;
     private Map<String, String> databaseFastDataDirectories;
     private Map<String, String> databaseLargeDataDirectories;
-    private Map<String, String> databaseReplicaDataDirectories;
+    private Map<String, List<String>> databaseReplicaDataDirectories;
     private Map<String, String> databaseReplicaFastDataDirectories;
     private Map<String, String> databaseReplicaLargeDataDirectories;
 
@@ -1074,11 +1074,11 @@ public void setForestLargeDataDirectory(String forestLargeDataDirectory) {
 		this.forestLargeDataDirectory = forestLargeDataDirectory;
 	}
 
-	public Map<String, String> getDatabaseReplicaDataDirectories() {
+	public Map<String, List<String>> getDatabaseReplicaDataDirectories() {
 		return databaseReplicaDataDirectories;
 	}
 
-	public void setDatabaseReplicaDataDirectories(Map<String, String> databaseReplicaDataDirectories) {
+	public void setDatabaseReplicaDataDirectories(Map<String, List<String>> databaseReplicaDataDirectories) {
 		this.databaseReplicaDataDirectories = databaseReplicaDataDirectories;
 	}
 

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

@@ -478,7 +478,7 @@ public void initialize() {
 
 		propertyConsumerMap.put("mlDatabaseReplicaDataDirectories", (config, prop) -> {
 			logger.info("Databases and replica forest data directories: " + prop);
-			config.setDatabaseReplicaDataDirectories(buildMapFromCommaDelimitedString(prop));
+			config.setDatabaseReplicaDataDirectories(buildMapOfListsFromDelimitedString(prop));
 		});
 
 		propertyConsumerMap.put("mlDatabaseReplicaFastDataDirectories", (config, prop) -> {

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

@@ -233,11 +233,11 @@ protected List<String> determineReplicaDataDirectories(ForestPlan forestPlan, Ap
 			replicaDataDirectories.add(appConfig.getReplicaForestDataDirectory());
 		}
 
-		Map<String, String> replicaDataDirectoryMap = appConfig.getDatabaseReplicaDataDirectories();
+		Map<String, List<String>> replicaDataDirectoryMap = appConfig.getDatabaseReplicaDataDirectories();
 		final String databaseName = forestPlan.getDatabaseName();
 		if (replicaDataDirectoryMap != null && replicaDataDirectoryMap.containsKey(databaseName)) {
 			replicaDataDirectories = new ArrayList<>();
-			replicaDataDirectories.add(replicaDataDirectoryMap.get(databaseName));
+			replicaDataDirectories.addAll(replicaDataDirectoryMap.get(databaseName));
 		}
 
 		return replicaDataDirectories;

src/test/java/com/marklogic/appdeployer/DefaultAppConfigFactoryTest.java

@@ -343,7 +343,7 @@ public void mostProperties() {
 		p.setProperty("mlDatabaseFastDataDirectories", "Documents,/fast/documents,Security,/fast/security");
 		p.setProperty("mlDatabaseLargeDataDirectories", "Documents,/large/documents,Security,/large/security");
 
-		p.setProperty("mlDatabaseReplicaDataDirectories", "Documents,/data/replicas,Security,/data/security/replicas");
+		p.setProperty("mlDatabaseReplicaDataDirectories", "Documents,/data/replicas|/data/replicas2,Security,/data/security/replicas");
 		p.setProperty("mlDatabaseReplicaFastDataDirectories", "Documents,/fast/replicas,Security,/fast/security/replicas");
 		p.setProperty("mlDatabaseReplicaLargeDataDirectories", "Documents,/large/replicas,Security,/large/security/replicas");
 
@@ -505,9 +505,11 @@ public void mostProperties() {
 		assertEquals("/large/documents", map.get("Documents"));
 		assertEquals("/large/security", map.get("Security"));
 
-		map = config.getDatabaseReplicaDataDirectories();
-		assertEquals("/data/replicas", map.get("Documents"));
-		assertEquals("/data/security/replicas", map.get("Security"));
+		mapOfLists = config.getDatabaseReplicaDataDirectories();
+		assertEquals("/data/replicas", mapOfLists.get("Documents").get(0));
+		assertEquals("/data/replicas2", mapOfLists.get("Documents").get(1));
+		assertEquals("/data/security/replicas", mapOfLists.get("Security").get(0));
+
 		map = config.getDatabaseReplicaFastDataDirectories();
 		assertEquals("/fast/replicas", map.get("Documents"));
 		assertEquals("/fast/security/replicas", map.get("Security"));

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

@@ -180,6 +180,48 @@ public void databaseSpecificReplicaDirectories() {
 		assertEquals("/my/replica/large", replica.getLargeDataDirectory());
 	}
 
+	@Test
+	public void multipleReplicaDataDirectories() {
+		AppConfig config = newAppConfig("mlDatabaseReplicaDataDirectories", "my-database,/path1|/path2");
+
+		List<Forest> forests = builder.buildForests(
+			new ForestPlan("my-database", "host1", "host2", "host3").withReplicaCount(2), config);
+
+		Forest f1 = forests.get(0);
+		assertEquals("my-database-1", f1.getForestName());
+		assertEquals("my-database-1-replica-1", f1.getForestReplica().get(0).getReplicaName());
+		assertEquals("host2", f1.getForestReplica().get(0).getHost());
+		assertEquals("/path1", f1.getForestReplica().get(0).getDataDirectory());
+		assertEquals("my-database-1-replica-2", f1.getForestReplica().get(1).getReplicaName());
+		assertEquals("host3", f1.getForestReplica().get(1).getHost());
+		assertEquals("/path2", f1.getForestReplica().get(1).getDataDirectory());
+
+		Forest f2 = forests.get(1);
+		assertEquals("my-database-2", f2.getForestName());
+		assertEquals("my-database-2-replica-1", f2.getForestReplica().get(0).getReplicaName());
+		assertEquals("host3", f2.getForestReplica().get(0).getHost());
+		assertEquals("/path1", f2.getForestReplica().get(0).getDataDirectory());
+		assertEquals("my-database-2-replica-2", f2.getForestReplica().get(1).getReplicaName());
+		assertEquals("host1", f2.getForestReplica().get(1).getHost());
+		assertEquals("/path2", f2.getForestReplica().get(1).getDataDirectory());
+
+		Forest f3 = forests.get(2);
+		assertEquals("my-database-3", f3.getForestName());
+		assertEquals("my-database-3-replica-1", f3.getForestReplica().get(0).getReplicaName());
+		assertEquals("host1", f3.getForestReplica().get(0).getHost());
+		assertEquals("/path1", f3.getForestReplica().get(0).getDataDirectory());
+		assertEquals("my-database-3-replica-2", f3.getForestReplica().get(1).getReplicaName());
+		assertEquals("host2", f3.getForestReplica().get(1).getHost());
+		assertEquals("/path2", f3.getForestReplica().get(1).getDataDirectory());
+
+//		for (Forest forest : forests) {
+//			System.out.println(forest.getForestName());
+//			for (ForestReplica replica : forest.getForestReplica()) {
+//				System.out.println(replica.getHost() + ":" + replica.getDataDirectory());
+//			}
+//		}
+	}
+
 	private void addCustomNamingStrategy(AppConfig appConfig) {
 		appConfig.getForestNamingStrategies().put("my-database", new ForestNamingStrategy() {
 			@Override