Skip to content

Commit b858edc

Browse files
committed
Fix for the timeout
1 parent 85de201 commit b858edc

File tree

1 file changed

+24
-5
lines changed

1 file changed

+24
-5
lines changed

geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDistributedTest.java

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@
3434
import static org.apache.geode.test.awaitility.GeodeAwaitility.await;
3535
import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
3636
import static org.assertj.core.api.Assertions.assertThat;
37+
import static org.assertj.core.api.Assertions.fail;
3738

3839
import java.text.NumberFormat;
3940
import java.text.ParseException;
4041
import java.util.Arrays;
4142
import java.util.Collections;
43+
import java.util.LinkedList;
4244
import java.util.List;
4345
import java.util.Locale;
4446
import java.util.Properties;
@@ -73,6 +75,7 @@
7375
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
7476
import org.apache.geode.management.internal.i18n.CliStrings;
7577
import org.apache.geode.test.dunit.AsyncInvocation;
78+
import org.apache.geode.test.dunit.IgnoredException;
7679
import org.apache.geode.test.dunit.VM;
7780
import org.apache.geode.test.dunit.rules.DistributedErrorCollector;
7881
import org.apache.geode.test.dunit.rules.DistributedExecutorServiceRule;
@@ -1166,12 +1169,28 @@ private int create2WanSitesAndClient(VM locatorInA, List<VM> serversInA, String
11661169

11671170
private void createSender(boolean isParallelGatewaySender, List<VM> servers,
11681171
String senderId, int remoteDsId) {
1169-
for (VM server : servers) {
1170-
server.invoke(() -> createSender(senderId, remoteDsId, isParallelGatewaySender,
1171-
100, 10, false,
1172-
false, null, true));
1172+
List<AsyncInvocation<Void>> tasks = new LinkedList<>();
1173+
for (VM vm : servers) {
1174+
tasks.add(vm.invokeAsync(
1175+
() -> vm.invoke(() -> {
1176+
IgnoredException ignoreInterruptedException =
1177+
addIgnoredException(InterruptedException.class.getName());
1178+
try {
1179+
createSender(senderId, remoteDsId, isParallelGatewaySender,
1180+
100, 10, false,
1181+
false, null, false);
1182+
} finally {
1183+
ignoreInterruptedException.remove();
1184+
}
1185+
})));
1186+
}
1187+
for (AsyncInvocation<Void> invocation : tasks) {
1188+
try {
1189+
invocation.await();
1190+
} catch (InterruptedException e) {
1191+
fail("Creating and starting senders was interrupted");
1192+
}
11731193
}
1174-
startSenderInVMsAsync(senderId, servers.toArray(new VM[0]));
11751194
}
11761195

11771196
private void createReceivers(List<VM> serversInB, VM serverInC) {

0 commit comments

Comments
 (0)