honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Speed up UnicastZenPingTests 

These tests using ping timeouts on the order of seconds, but this is
unnecessary since all the sockets are within the same JVM it really
should not take that long.

Relates #21874
This commit is contained in:
Jason Tedor 2016-11-29 23:27:25 -05:00 committed by GitHub
parent b6ba4ae34b
commit 072007c759
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/test/java/org/elasticsearch/discovery/zen/UnicastZenPingTests.java
View File

@ -225,7 +225,7 @@ public class UnicastZenPingTests extends ESTestCase {
closeables.push(zenPingD); closeables.push(zenPingD);
logger.info("ping from UZP_A"); logger.info("ping from UZP_A");
Collection<ZenPing.PingResponse> pingResponses = zenPingA.pingAndWait(TimeValue.timeValueSeconds(1)); Collection<ZenPing.PingResponse> pingResponses = zenPingA.pingAndWait(TimeValue.timeValueMillis(100));
assertThat(pingResponses.size(), equalTo(1)); assertThat(pingResponses.size(), equalTo(1));
ZenPing.PingResponse ping = pingResponses.iterator().next(); ZenPing.PingResponse ping = pingResponses.iterator().next();
assertThat(ping.node().getId(), equalTo("UZP_B")); assertThat(ping.node().getId(), equalTo("UZP_B"));
@ -234,7 +234,7 @@ public class UnicastZenPingTests extends ESTestCase {
// ping again, this time from B, // ping again, this time from B,
logger.info("ping from UZP_B"); logger.info("ping from UZP_B");
pingResponses = zenPingB.pingAndWait(TimeValue.timeValueSeconds(1)); pingResponses = zenPingB.pingAndWait(TimeValue.timeValueMillis(100));
assertThat(pingResponses.size(), equalTo(1)); assertThat(pingResponses.size(), equalTo(1));
ping = pingResponses.iterator().next(); ping = pingResponses.iterator().next();
assertThat(ping.node().getId(), equalTo("UZP_A")); assertThat(ping.node().getId(), equalTo("UZP_A"));
@ -242,12 +242,12 @@ public class UnicastZenPingTests extends ESTestCase {
assertCounters(handleB, handleA, handleB, handleC, handleD); assertCounters(handleB, handleA, handleB, handleC, handleD);
logger.info("ping from UZP_C"); logger.info("ping from UZP_C");
pingResponses = zenPingC.pingAndWait(TimeValue.timeValueSeconds(1)); pingResponses = zenPingC.pingAndWait(TimeValue.timeValueMillis(100));
assertThat(pingResponses.size(), equalTo(0)); assertThat(pingResponses.size(), equalTo(0));
assertCounters(handleC, handleA, handleB, handleC, handleD); assertCounters(handleC, handleA, handleB, handleC, handleD);
logger.info("ping from UZP_D"); logger.info("ping from UZP_D");
pingResponses = zenPingD.pingAndWait(TimeValue.timeValueSeconds(1)); pingResponses = zenPingD.pingAndWait(TimeValue.timeValueMillis(100));
assertThat(pingResponses.size(), equalTo(0)); assertThat(pingResponses.size(), equalTo(0));
assertCounters(handleD, handleA, handleB, handleC, handleD); assertCounters(handleD, handleA, handleB, handleC, handleD);
} }
@ -347,7 +347,7 @@ public class UnicastZenPingTests extends ESTestCase {
// the presence of an unresolvable host should not prevent resolvable hosts from being pinged // the presence of an unresolvable host should not prevent resolvable hosts from being pinged
{ {
final Collection<ZenPing.PingResponse> pingResponses = zenPingA.pingAndWait(TimeValue.timeValueSeconds(3)); final Collection<ZenPing.PingResponse> pingResponses = zenPingA.pingAndWait(TimeValue.timeValueMillis(100));
assertThat(pingResponses.size(), equalTo(1)); assertThat(pingResponses.size(), equalTo(1));
ZenPing.PingResponse ping = pingResponses.iterator().next(); ZenPing.PingResponse ping = pingResponses.iterator().next();
assertThat(ping.node().getId(), equalTo("UZP_C")); assertThat(ping.node().getId(), equalTo("UZP_C"));
@ -366,7 +366,7 @@ public class UnicastZenPingTests extends ESTestCase {
// now we should see pings to UZP_B; this establishes that host resolutions are not cached // now we should see pings to UZP_B; this establishes that host resolutions are not cached
{ {
// ping from C so that we can assert on the counters from a fresh source (as opposed to resetting them) // ping from C so that we can assert on the counters from a fresh source (as opposed to resetting them)
final Collection<ZenPing.PingResponse> secondPingResponses = zenPingC.pingAndWait(TimeValue.timeValueSeconds(3)); final Collection<ZenPing.PingResponse> secondPingResponses = zenPingC.pingAndWait(TimeValue.timeValueMillis(100));
assertThat(secondPingResponses.size(), equalTo(2)); assertThat(secondPingResponses.size(), equalTo(2));
final Set<String> ids = new HashSet<>(secondPingResponses.stream().map(p -> p.node().getId()).collect(Collectors.toList())); final Set<String> ids = new HashSet<>(secondPingResponses.stream().map(p -> p.node().getId()).collect(Collectors.toList()));
assertThat(ids, equalTo(new HashSet<>(Arrays.asList("UZP_A", "UZP_B")))); assertThat(ids, equalTo(new HashSet<>(Arrays.asList("UZP_A", "UZP_B"))));