[23/51] [abbrv] geode git commit: GEODE-3427 CI failure in GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
GEODE-3427 CI failure in GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
Removed use of background threads and modified the test to focus on
the method findCoordinator. This is what the name of the test implies
that is validating.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/91430e12
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/91430e12
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/91430e12
Branch: refs/heads/feature/GEODE-3416
Commit: 91430e122bdd9a6add219914a5175fddadf4ecf1
Parents: d291a45
Author: Bruce Schuchardt
Authored: Wed Aug 16 15:05:06 2017 -0700
Committer: Bruce Schuchardt
Committed: Wed Aug 16 15:06:45 2017 -0700
--
.../membership/gms/membership/GMSJoinLeave.java | 2 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 25 +---
2 files changed, 7 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/91430e12/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index c63c30f..cba95f9 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -1069,7 +1069,7 @@ public class GMSJoinLeave implements JoinLeave,
MessageHandler {
* This contacts the locators to find out who the current coordinator is.
All locators are
* contacted. If they don't agree then we choose the oldest coordinator and
return it.
*/
- private boolean findCoordinator() {
+ boolean findCoordinator() {
SearchState state = searchState;
assert this.localAddress != null;
http://git-wip-us.apache.org/repos/asf/geode/blob/91430e12/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 1acb989..f4bdbbf 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -36,7 +36,6 @@ import
org.apache.geode.distributed.internal.DistributionConfig;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.distributed.internal.membership.gms.Services.Stopper;
@@ -68,8 +67,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.internal.verification.Times;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import org.mockito.verification.Timeout;
import java.io.IOException;
@@ -1222,7 +1219,6 @@ public class GMSJoinLeaveJUnitTest {
}
@Test
- @Category(FlakyTest.class) // GEODE-3427 - intermittent CI failures
public void testCoordinatorFindRequestSuccess() throws Exception {
initMocks(false);
HashSet registrants = new HashSet<>();
@@ -1230,25 +1226,16 @@ public class GMSJoinLeaveJUnitTest {
FindCoordinatorResponse fcr = new FindCoordinatorResponse(mockMembers[0],
mockMembers[0], false,
null, registrants, false, true, null);
NetView view = createView();
-JoinResponseMessage jrm = new JoinResponseMessage(mockMembers[0], view, 0);
TcpClientWrapper tcpClientWrapper = mock(TcpClientWrapper.class);
gmsJoinLeave.setTcpClientWrapper(tcpClientWrapper);
-FindCoordinatorRequest fcreq =
-new FindCoordinatorRequest(gmsJoinLeaveMemberId, new HashSet<>(), -1,
null, 0, "");
-int connectTimeout = (int) services.getConfig().getMemberTimeout() * 2;
-when(tcpClientWrapper.sendCoordinatorFindRequest(new
InetSocketAddress("localhost", 12345),
-fcreq, connec
[23/51] [abbrv] geode git commit: GEODE-3427 CI failure in GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
GEODE-3427 CI failure in GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
Removed use of background threads and modified the test to focus on
the method findCoordinator. This is what the name of the test implies
that is validating.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/91430e12
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/91430e12
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/91430e12
Branch: refs/heads/feature/GEODE-1279
Commit: 91430e122bdd9a6add219914a5175fddadf4ecf1
Parents: d291a45
Author: Bruce Schuchardt
Authored: Wed Aug 16 15:05:06 2017 -0700
Committer: Bruce Schuchardt
Committed: Wed Aug 16 15:06:45 2017 -0700
--
.../membership/gms/membership/GMSJoinLeave.java | 2 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 25 +---
2 files changed, 7 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/91430e12/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index c63c30f..cba95f9 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -1069,7 +1069,7 @@ public class GMSJoinLeave implements JoinLeave,
MessageHandler {
* This contacts the locators to find out who the current coordinator is.
All locators are
* contacted. If they don't agree then we choose the oldest coordinator and
return it.
*/
- private boolean findCoordinator() {
+ boolean findCoordinator() {
SearchState state = searchState;
assert this.localAddress != null;
http://git-wip-us.apache.org/repos/asf/geode/blob/91430e12/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 1acb989..f4bdbbf 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -36,7 +36,6 @@ import
org.apache.geode.distributed.internal.DistributionConfig;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.distributed.internal.membership.gms.Services.Stopper;
@@ -68,8 +67,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.internal.verification.Times;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import org.mockito.verification.Timeout;
import java.io.IOException;
@@ -1222,7 +1219,6 @@ public class GMSJoinLeaveJUnitTest {
}
@Test
- @Category(FlakyTest.class) // GEODE-3427 - intermittent CI failures
public void testCoordinatorFindRequestSuccess() throws Exception {
initMocks(false);
HashSet registrants = new HashSet<>();
@@ -1230,25 +1226,16 @@ public class GMSJoinLeaveJUnitTest {
FindCoordinatorResponse fcr = new FindCoordinatorResponse(mockMembers[0],
mockMembers[0], false,
null, registrants, false, true, null);
NetView view = createView();
-JoinResponseMessage jrm = new JoinResponseMessage(mockMembers[0], view, 0);
TcpClientWrapper tcpClientWrapper = mock(TcpClientWrapper.class);
gmsJoinLeave.setTcpClientWrapper(tcpClientWrapper);
-FindCoordinatorRequest fcreq =
-new FindCoordinatorRequest(gmsJoinLeaveMemberId, new HashSet<>(), -1,
null, 0, "");
-int connectTimeout = (int) services.getConfig().getMemberTimeout() * 2;
-when(tcpClientWrapper.sendCoordinatorFindRequest(new
InetSocketAddress("localhost", 12345),
-fcreq, connec
geode git commit: GEODE-3427 CI failure in GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
Repository: geode
Updated Branches:
refs/heads/develop d291a457f -> 91430e122
GEODE-3427 CI failure in GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
Removed use of background threads and modified the test to focus on
the method findCoordinator. This is what the name of the test implies
that is validating.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/91430e12
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/91430e12
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/91430e12
Branch: refs/heads/develop
Commit: 91430e122bdd9a6add219914a5175fddadf4ecf1
Parents: d291a45
Author: Bruce Schuchardt
Authored: Wed Aug 16 15:05:06 2017 -0700
Committer: Bruce Schuchardt
Committed: Wed Aug 16 15:06:45 2017 -0700
--
.../membership/gms/membership/GMSJoinLeave.java | 2 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 25 +---
2 files changed, 7 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/91430e12/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
--
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index c63c30f..cba95f9 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -1069,7 +1069,7 @@ public class GMSJoinLeave implements JoinLeave,
MessageHandler {
* This contacts the locators to find out who the current coordinator is.
All locators are
* contacted. If they don't agree then we choose the oldest coordinator and
return it.
*/
- private boolean findCoordinator() {
+ boolean findCoordinator() {
SearchState state = searchState;
assert this.localAddress != null;
http://git-wip-us.apache.org/repos/asf/geode/blob/91430e12/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 1acb989..f4bdbbf 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -36,7 +36,6 @@ import
org.apache.geode.distributed.internal.DistributionConfig;
import
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.distributed.internal.membership.gms.GMSUtil;
import org.apache.geode.distributed.internal.membership.gms.ServiceConfig;
import org.apache.geode.distributed.internal.membership.gms.Services;
import org.apache.geode.distributed.internal.membership.gms.Services.Stopper;
@@ -68,8 +67,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.mockito.internal.verification.Times;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import org.mockito.verification.Timeout;
import java.io.IOException;
@@ -1222,7 +1219,6 @@ public class GMSJoinLeaveJUnitTest {
}
@Test
- @Category(FlakyTest.class) // GEODE-3427 - intermittent CI failures
public void testCoordinatorFindRequestSuccess() throws Exception {
initMocks(false);
HashSet registrants = new HashSet<>();
@@ -1230,25 +1226,16 @@ public class GMSJoinLeaveJUnitTest {
FindCoordinatorResponse fcr = new FindCoordinatorResponse(mockMembers[0],
mockMembers[0], false,
null, registrants, false, true, null);
NetView view = createView();
-JoinResponseMessage jrm = new JoinResponseMessage(mockMembers[0], view, 0);
TcpClientWrapper tcpClientWrapper = mock(TcpClientWrapper.class);
gmsJoinLeave.setTcpClientWrapper(tcpClientWrapper);
-FindCoordinatorRequest fcreq =
-new FindCoordinatorRequest(gmsJoinLeaveMemberId, new HashSet<>(), -1,
null, 0, "");
-int connectTimeout = (int) services.getConfig().getMemberTimeout() * 2;
-when(tcpClientWrapper.sendCoordinatorFindReq
geode git commit: GEODE-3427: CI failure in GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
Repository: geode
Updated Branches:
refs/heads/develop d27f8b956 -> 915568415
GEODE-3427: CI failure in
GMSJoinLeaveJUnitTest.testCoordinatorFindRequestSuccess
I put this test in the FlakyTest category
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/91556841
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/91556841
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/91556841
Branch: refs/heads/develop
Commit: 915568415f0cc642d2bdc364e927ac1c88a2b53f
Parents: d27f8b9
Author: Bruce Schuchardt
Authored: Fri Aug 11 16:27:01 2017 -0700
Committer: Bruce Schuchardt
Committed: Fri Aug 11 16:29:36 2017 -0700
--
.../internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/geode/blob/91556841/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
--
diff --git
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 7c2033a..1acb989 100644
---
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -60,6 +60,7 @@ import
org.apache.geode.distributed.internal.membership.gms.messages.RemoveMembe
import
org.apache.geode.distributed.internal.membership.gms.messages.ViewAckMessage;
import org.apache.geode.internal.Version;
import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.test.junit.categories.FlakyTest;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.MembershipTest;
import org.junit.After;
@@ -1221,6 +1222,7 @@ public class GMSJoinLeaveJUnitTest {
}
@Test
+ @Category(FlakyTest.class) // GEODE-3427 - intermittent CI failures
public void testCoordinatorFindRequestSuccess() throws Exception {
initMocks(false);
HashSet registrants = new HashSet<>();
