Skip to content

Commit 5e64dcb

Browse files
#578 - Check for minHosts; #680 - Removed temp files
1 parent 830b93b commit 5e64dcb

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/HostAvailabilityListener.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ public HostAvailabilityListener withSuspendTimeForHostUnavailable(Duration
130130
*/
131131
public HostAvailabilityListener withMinHosts(int numHosts) {
132132
if (numHosts <= 0) throw new IllegalArgumentException("numHosts must be > 0");
133+
int numConfigHosts = moveMgr.readForestConfig().getPreferredHosts().length;
134+
if (numHosts > numConfigHosts) throw new IllegalArgumentException
135+
("numHosts must be less than or equal to the number of hosts in the cluster");
133136
this.minHosts = numHosts;
134137
return this;
135138
}

marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ExportToWriterListenerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,6 @@ record -> {
116116
while ( reader.readLine() != null ) lines++;
117117
assertEquals( "There should be 100 lines in the output file", 100, lines );
118118
}
119+
if(outputFile.exists()) outputFile.delete();
119120
}
120121
}

marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherIteratorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ public void test_A_OnDiskIterator() throws Exception {
148148

149149
if ( failures2.length() > 0 ) fail(failures2.toString());
150150
assertEquals(numDocs, successDocs2.get());
151+
if(tempFile.exists()) tempFile.delete();
151152
}
152153

153154
@Test

marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/WriteBatcherTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,16 @@ public void testListenerManagement() {
277277
batcher.setBatchFailureListeners(null);
278278
failureListeners = batcher.getBatchFailureListeners();
279279
assertEquals(0, failureListeners.length);
280+
281+
try {
282+
HostAvailabilityListener ha = new HostAvailabilityListener(moveMgr)
283+
.withMinHosts(2);
284+
fail("should have thrown IllegalArgumentException since minHosts was " +
285+
"set to a number greater than the number of hosts in the cluster");
286+
} catch (IllegalArgumentException e) {
287+
logger.debug("[testListenerManagement] threw expected exception since " +
288+
"HostAvailabilityListener was initialized with greater minHosts: " + e);
289+
}
280290
}
281291

282292
/*

0 commit comments

Comments
 (0)