Skip to content

Commit 9e5dceb

Browse files
georgeajitgeorgeajit
authored andcommitted
No Task - Use unique data folder names for forest name on Linux
platforms.
1 parent 76376e6 commit 9e5dceb

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QBFailover.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ public static void setUpBeforeClass() throws Exception {
156156
}
157157
dataDir = location + "/space/dmsdk-failover/win/" + version + "/temp-";
158158
} else if (OS.indexOf("nux") >= 0) {
159-
dataDir = "/project/qa-netapp/space/dmsdk-failover/linux/" + version + "/temp-";
159+
// Avoid creating Forest at same location when multiple Linux platforms are used
160+
String uniqueForestStr = localhost +"-" + version;
161+
dataDir = "/project/qa-netapp/space/dmsdk-failover/linux/" + uniqueForestStr + "/temp-";
160162
} else if (OS.indexOf("mac") >= 0) {
161163
dataDir = "/project/qa-netapp/space/dmsdk-failover/mac/" + version + "/temp-";
162164
} else {

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WBFailover.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.io.IOException;
77
import java.io.InputStream;
88
import java.io.InputStreamReader;
9+
import java.net.InetAddress;
910
import java.text.SimpleDateFormat;
1011
import java.time.Duration;
1112
import java.util.ArrayList;
@@ -103,6 +104,7 @@ public static void setUpBeforeClass() throws Exception {
103104
dmManager = dbClient.newDataMovementManager();
104105

105106
Map<String, String> props = new HashMap<>();
107+
String localhost = InetAddress.getLocalHost().getHostName().toLowerCase();
106108
String version = String.valueOf(evalClient.newServerEval().xquery("xquery version \"1.0-ml\"; xdmp:version()")
107109
.eval().next().getString().charAt(0));
108110
if (OS.indexOf("win") >= 0) {
@@ -131,7 +133,9 @@ public static void setUpBeforeClass() throws Exception {
131133
}
132134
dataDir = location + "/space/dmsdk-failover/win/" + version + "/temp-";
133135
} else if (OS.indexOf("nux") >= 0) {
134-
dataDir = "/project/qa-netapp/space/dmsdk-failover/linux/" + version + "/temp-";
136+
// Avoid creating Forest at same location when multiple Linux platforms are used
137+
String uniqueForestStr = localhost +"-" + version;
138+
dataDir = "/project/qa-netapp/space/dmsdk-failover/linux/" + uniqueForestStr + "/temp-";
135139
} else if (OS.indexOf("mac") >= 0) {
136140
dataDir = "/project/qa-netapp/space/dmsdk-failover/mac/" + version + "/temp-";
137141
} else {

0 commit comments

Comments
 (0)