Skip to content

Commit da7b3b0

Browse files
authored
Fixed RecoveryIT timeout issue (apache#4271)
Test was waiting for 60s to confirm that recovery logs were sorted. However, the default interval for checking if recovery logs needed to be sorted is 1m. Increased the timeout in the test so that it would not fail.
1 parent 5cf9953 commit da7b3b0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

test/src/main/java/org/apache/accumulo/test/RecoveryIT.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.apache.accumulo.test;
2020

21+
import static org.apache.accumulo.core.util.compaction.ExternalCompactionUtil.getCompactorAddrs;
2122
import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY;
2223
import static org.junit.jupiter.api.Assertions.assertEquals;
2324
import static org.junit.jupiter.api.Assertions.fail;
@@ -142,7 +143,10 @@ public void test(String serverForSorting) throws Exception {
142143

143144
// Stop any running Compactors and ScanServers
144145
control.stopAllServers(ServerType.COMPACTOR);
146+
Wait.waitFor(() -> getCompactorAddrs(getCluster().getServerContext()).size() == 0, 60_000);
147+
145148
control.stopAllServers(ServerType.SCAN_SERVER);
149+
Wait.waitFor(() -> ((ClientContext) c).getScanServers().size() == 0, 60_000);
146150

147151
// Kill the TabletServer in resource group that is hosting the table
148152
List<Process> procs = control.getTabletServers(RESOURCE_GROUP);
@@ -181,7 +185,7 @@ public void test(String serverForSorting) throws Exception {
181185
}
182186

183187
// Confirm sorting completed
184-
Wait.waitFor(() -> logSortingCompleted(c, tid) == true, 60_000);
188+
Wait.waitFor(() -> logSortingCompleted(c, tid) == true, 120_000);
185189

186190
// Start the tablet servers so that the Manager
187191
// can assign the table and so that recovery can be completed.

0 commit comments

Comments
 (0)