This is an automated email from the ASF dual-hosted git repository. echobravo pushed a commit to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push: new f6e3f13 GEODE-8919: undid polymorphic naming for processMessage methods. (#6055) (#6070) f6e3f13 is described below commit f6e3f13aa65036d890fd1faa7e2ca403f87c9fc0 Author: Ernie Burghardt <eburgha...@pivotal.io> AuthorDate: Tue Mar 2 09:33:15 2021 -0800 GEODE-8919: undid polymorphic naming for processMessage methods. (#6055) (#6070) (cherry picked from commit 6edf69546b784f67ed125bc4b1d592496ee1f5ee) --- .../gms/membership/GMSJoinLeaveJUnitTest.java | 131 +++++++++++---------- .../membership/gms/membership/GMSJoinLeave.java | 52 ++++---- 2 files changed, 95 insertions(+), 88 deletions(-) diff --git a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java index d6bef41..e8912f3 100644 --- a/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java +++ b/geode-membership/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java @@ -267,7 +267,7 @@ public class GMSJoinLeaveJUnitTest { // simulate a response being received MemberIdentifier sender = mockMembers[2]; FindCoordinatorResponse resp = new FindCoordinatorResponse(coordinator, sender, null, 0); - gmsJoinLeave.processMessage(resp); + gmsJoinLeave.processFindCoordinatorResponseMessage(resp); // tell GMSJoinLeave that a unit test is running so it won't clear the // responses collection gmsJoinLeave.unitTesting.add("findCoordinatorFromView"); @@ -283,7 +283,8 @@ public class GMSJoinLeaveJUnitTest { public void testProcessJoinMessageRejectOldMemberVersion() throws Exception { initMocks(); - gmsJoinLeave.processMessage(new JoinRequestMessage(mockOldMember, mockOldMember, null, -1, 0)); + gmsJoinLeave.processJoinRequestMessage( + new JoinRequestMessage(mockOldMember, mockOldMember, null, -1, 0)); assertTrue("JoinRequest should not have been added to view request", gmsJoinLeave.getViewRequests().size() == 0); verify(messenger).send(isA(JoinResponseMessage.class)); @@ -296,7 +297,7 @@ public class GMSJoinLeaveJUnitTest { List<MemberIdentifier> members = Arrays.asList(mockMembers); GMSMembershipView v = new GMSMembershipView(mockMembers[0], 2, members); InstallViewMessage message = getInstallViewMessage(v, null, false); - gmsJoinLeave.processMessage(message); + gmsJoinLeave.processInstallViewMessage(message); verify(manager).forceDisconnect(isA(String.class)); } @@ -308,7 +309,8 @@ public class GMSJoinLeaveJUnitTest { .thenThrow(new SecurityException("we want to fail auth here")); gmsJoinLeave - .processMessage(new JoinRequestMessage(mockMembers[0], mockMembers[0], credentials, -1, 0)); + .processJoinRequestMessage( + new JoinRequestMessage(mockMembers[0], mockMembers[0], credentials, -1, 0)); assertTrue("JoinRequest should not have been added to view request", gmsJoinLeave.getViewRequests().size() == 0); verify(messenger).send(isA(JoinResponseMessage.class)); @@ -321,7 +323,8 @@ public class GMSJoinLeaveJUnitTest { .thenThrow(new SecurityException("we want to fail auth here")); gmsJoinLeave - .processMessage(new JoinRequestMessage(mockMembers[0], mockMembers[0], null, -1, 0)); + .processJoinRequestMessage( + new JoinRequestMessage(mockMembers[0], mockMembers[0], null, -1, 0)); assertTrue("JoinRequest should not have been added to view request", gmsJoinLeave.getViewRequests().size() == 0); verify(messenger).send(isA(JoinResponseMessage.class)); @@ -337,12 +340,12 @@ public class GMSJoinLeaveJUnitTest { JoinResponseMessage[] joinResponse = gmsJoinLeave.getJoinResponseMessage(); JoinResponseMessage jrm = new JoinResponseMessage(mockMembers[0], new byte[9], 233); - gmsJoinLeave.processMessage(jrm); + gmsJoinLeave.processJoinResponseMessage(jrm); // this should NOT logs, this is just to inform member succesful joining Assert.assertEquals(null, joinResponse[0]); jrm = new JoinResponseMessage("rejected...", 0); - gmsJoinLeave.processMessage(jrm); + gmsJoinLeave.processJoinResponseMessage(jrm); // this should log.. Assert.assertEquals(jrm, joinResponse[0]); } @@ -362,12 +365,12 @@ public class GMSJoinLeaveJUnitTest { netView.setPublicKey(member, member.toString()); } InstallViewMessage installViewMessage = getInstallViewMessage(netView, credentials, true); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); verify(messenger).send(isA(ViewAckMessage.class)); // install the view installViewMessage = getInstallViewMessage(netView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); Assert.assertEquals(netView, gmsJoinLeave.getView()); } @@ -401,7 +404,7 @@ public class GMSJoinLeaveJUnitTest { LeaveRequestMessage msg = new LeaveRequestMessage(gmsJoinLeave.getMemberID(), mockMembers[1], "leaving for test"); msg.setSender(mockMembers[1]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); assertTrue(gmsJoinLeave.isMemberLeaving(mockMembers[1])); } @@ -457,7 +460,7 @@ public class GMSJoinLeaveJUnitTest { // try to install an older view where viewId < currentView.viewId GMSMembershipView olderNetView = new GMSMembershipView(mockMembers[0], 0, mbrs); InstallViewMessage installViewMessage = getInstallViewMessage(olderNetView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); Assert.assertNotEquals(gmsJoinLeave.getView(), olderNetView); } @@ -477,7 +480,7 @@ public class GMSJoinLeaveJUnitTest { // install the view GMSMembershipView netView = new GMSMembershipView(mockMembers[0], viewId, mbrs); InstallViewMessage installViewMessage = getInstallViewMessage(netView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); Assert.assertNotEquals(netView, gmsJoinLeave.getView()); verify(mockManager).forceDisconnect(isA(String.class)); @@ -491,7 +494,7 @@ public class GMSJoinLeaveJUnitTest { // test that a non-member can't remove another member RemoveMemberMessage msg = new RemoveMemberMessage(mockMembers[0], mockMembers[1], reason); msg.setSender(MemberIdentifierUtil.createMemberID(9000)); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); assertTrue("RemoveMemberMessage should not have been added to view requests", gmsJoinLeave.getViewRequests().size() == 0); } @@ -508,10 +511,10 @@ public class GMSJoinLeaveJUnitTest { LeaveRequestMessage msg = new LeaveRequestMessage(gmsJoinLeave.getMemberID(), mockMembers[0], reason); msg.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); msg = new LeaveRequestMessage(gmsJoinLeave.getMemberID(), mockMembers[0], reason); msg.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); waitForViewAndNoRequestsInProgress(7); @@ -534,10 +537,10 @@ public class GMSJoinLeaveJUnitTest { RemoveMemberMessage msg = new RemoveMemberMessage(gmsJoinLeave.getMemberID(), mockMembers[0], reason); msg.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); msg = new RemoveMemberMessage(gmsJoinLeave.getMemberID(), mockMembers[0], reason); msg.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); waitForViewAndNoRequestsInProgress(7); @@ -563,10 +566,10 @@ public class GMSJoinLeaveJUnitTest { JoinRequestMessage msg = new JoinRequestMessage(gmsJoinLeaveMemberId, mockMembers[2], null, -1, 0); msg.setSender(mockMembers[2]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processJoinRequestMessage(msg); msg = new JoinRequestMessage(gmsJoinLeaveMemberId, mockMembers[2], null, -1, 0); msg.setSender(mockMembers[2]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processJoinRequestMessage(msg); waitForViewAndNoRequestsInProgress(7); @@ -609,7 +612,7 @@ public class GMSJoinLeaveJUnitTest { RemoveMemberMessage msg = new RemoveMemberMessage(gmsJoinLeaveMemberId, MemberIdentifierUtil.createMemberID(10000), "removing for test"); msg.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); verify(messenger).send(isA(RemoveMemberMessage.class)); } @@ -629,13 +632,13 @@ public class GMSJoinLeaveJUnitTest { createMemberList(mockMembers[0], previousMemberId, mockMembers[1])); InstallViewMessage viewMessage = new InstallViewMessage(view, 0, false); viewMessage.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(viewMessage); + gmsJoinLeave.processInstallViewMessage(viewMessage); assertEquals(0, gmsJoinLeaveMemberId.getVmViewId()); // a RemoveMember message should cause it to force-disconnect RemoveMemberMessage msg = new RemoveMemberMessage(gmsJoinLeaveMemberId, gmsJoinLeaveMemberId, "removing for test"); msg.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); verify(manager).forceDisconnect("removing for test"); } @@ -648,7 +651,7 @@ public class GMSJoinLeaveJUnitTest { RemoveMemberMessage msg = new RemoveMemberMessage(mockMembers[0], gmsJoinLeave.getMemberID(), reason); msg.setSender(mockMembers[1]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); verify(manager).forceDisconnect(reason); } @@ -662,7 +665,7 @@ public class GMSJoinLeaveJUnitTest { LeaveRequestMessage msg = new LeaveRequestMessage(gmsJoinLeave.getMemberID(), gmsJoinLeave.getMemberID(), reason); msg.setSender(mockMembers[1]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); verify(manager).forceDisconnect(reason); } @@ -675,7 +678,7 @@ public class GMSJoinLeaveJUnitTest { LeaveRequestMessage msg = new LeaveRequestMessage(gmsJoinLeave.getMemberID(), mockMembers[1], reason); msg.setSender(mockMembers[1]); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); assertTrue("Expected leave request from non-member to be ignored", gmsJoinLeave.getViewRequests().isEmpty()); } @@ -697,7 +700,7 @@ public class GMSJoinLeaveJUnitTest { MemberIdentifier creator = view.getCreator(); LeaveRequestMessage msg = new LeaveRequestMessage(creator, creator, reason); msg.setSender(creator); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); assertTrue("Expected becomeCoordinator to be invoked", gmsJoinLeave.isCoordinator()); } @@ -711,7 +714,7 @@ public class GMSJoinLeaveJUnitTest { MemberIdentifier creator = view.getCreator(); RemoveMemberMessage msg = new RemoveMemberMessage(creator, creator, reason); msg.setSender(creator); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); assertTrue("Expected becomeCoordinator to be invoked", gmsJoinLeave.isCoordinator()); } @@ -730,10 +733,10 @@ public class GMSJoinLeaveJUnitTest { prepareAndInstallView(C, createMemberList(A, B, C, D, E)); LeaveRequestMessage msg = new LeaveRequestMessage(B, C, "leaving for test"); msg.setSender(C); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); RemoveMemberMessage removeMemberMessage = new RemoveMemberMessage(B, A, "removing for test"); removeMemberMessage.setSender(B); - gmsJoinLeave.processMessage(removeMemberMessage); + gmsJoinLeave.processRemoveMemberMessage(removeMemberMessage); assertTrue("Expected becomeCoordinator to be invoked", gmsJoinLeave.isCoordinator()); } @@ -764,7 +767,7 @@ public class GMSJoinLeaveJUnitTest { new ViewAckMessage(gmsJoinLeaveMemberId, installViewMessage.getView().getViewId(), installViewMessage.isPreparing()); viewAckMessage.setSender(recipient); - gmsJoinLeave.processMessage(viewAckMessage); + gmsJoinLeave.processViewAckMessage(viewAckMessage); } return null; }); @@ -773,11 +776,11 @@ public class GMSJoinLeaveJUnitTest { gmsJoinLeave.recordViewRequest(new LeaveRequestMessage(B, C, "removing for test")); - gmsJoinLeave.processMessage(new JoinRequestMessage(B, E, null, 1, 1)); + gmsJoinLeave.processJoinRequestMessage(new JoinRequestMessage(B, E, null, 1, 1)); RemoveMemberMessage msg = new RemoveMemberMessage(B, A, "crashed for test"); msg.setSender(D); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); await().until(() -> gmsJoinLeave.isCoordinator() && gmsJoinLeave.getViewRequests().isEmpty()); @@ -797,7 +800,7 @@ public class GMSJoinLeaveJUnitTest { view.remove(creator); InstallViewMessage msg = getInstallViewMessage(view, creator, false); msg.setSender(creator); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processInstallViewMessage(msg); assertTrue("Expected it to become coordinator", gmsJoinLeave.isCoordinator()); } @@ -812,11 +815,11 @@ public class GMSJoinLeaveJUnitTest { MemberIdentifier creator = view.getCreator(); LeaveRequestMessage leaveRequestMessage = new LeaveRequestMessage(gmsJoinLeaveMemberId, mockMembers[0], "leaving for test"); - gmsJoinLeave.processMessage(leaveRequestMessage); + gmsJoinLeave.processLeaveRequestMessage(leaveRequestMessage); assertTrue(gmsJoinLeave.isCoordinator()); InstallViewMessage msg = getInstallViewMessage(view, creator, false); msg.setSender(creator); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processInstallViewMessage(msg); assertTrue("Expected it to remain coordinator", gmsJoinLeave.isCoordinator()); } @@ -834,7 +837,7 @@ public class GMSJoinLeaveJUnitTest { view.add(gmsJoinLeaveMemberId); InstallViewMessage msg = getInstallViewMessage(view, creator, false); msg.setSender(creator); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processInstallViewMessage(msg); assertTrue("Expected it to stop being coordinator", !gmsJoinLeave.isCoordinator()); } @@ -864,7 +867,7 @@ public class GMSJoinLeaveJUnitTest { GMSMembershipView newView = new GMSMembershipView(mockMembers[0], gmsJoinLeave.getView().getViewId() + 1, mbrs); InstallViewMessage installViewMessage = getInstallViewMessage(newView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); Set<MemberIdentifier> crashes = new HashSet<>(); crashes.add(mockMembers[1]); @@ -876,7 +879,7 @@ public class GMSJoinLeaveJUnitTest { new GMSMembershipView(mockMembers[0], newView.getViewId() + 1, mbrs, Collections.emptySet(), crashes); installViewMessage = getInstallViewMessage(partitionView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); verify(manager).forceDisconnect(isA(String.class)); verify(manager).quorumLost(crashes, newView); @@ -888,7 +891,7 @@ public class GMSJoinLeaveJUnitTest { becomeCoordinatorForTest(gmsJoinLeave); NetworkPartitionMessage message = new NetworkPartitionMessage(); message.setSender(gmsJoinLeaveMemberId); - gmsJoinLeave.processMessage(message); + gmsJoinLeave.processNetworkPartitionMessage(message); verify(manager).forceDisconnect(contains(gmsJoinLeaveMemberId.toString())); } @@ -898,7 +901,7 @@ public class GMSJoinLeaveJUnitTest { becomeCoordinatorForTest(gmsJoinLeave); NetworkPartitionMessage message = new NetworkPartitionMessage(); message.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(message); + gmsJoinLeave.processNetworkPartitionMessage(message); verify(manager, never()).forceDisconnect(isA(String.class)); } @@ -924,7 +927,7 @@ public class GMSJoinLeaveJUnitTest { new GMSMembershipView(mockMembers[0], gmsJoinLeave.getView().getViewId() + 1, mbrs, shutdowns, crashes); InstallViewMessage installViewMessage = getInstallViewMessage(newView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); crashes = new HashSet<>(crashes); crashes.add(mockMembers[1]); @@ -935,7 +938,7 @@ public class GMSJoinLeaveJUnitTest { GMSMembershipView partitionView = new GMSMembershipView(mockMembers[0], newView.getViewId() + 1, mbrs, shutdowns, crashes); installViewMessage = getInstallViewMessage(partitionView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); verify(manager, never()).forceDisconnect(isA(String.class)); verify(manager).quorumLost(crashes, newView); @@ -949,11 +952,11 @@ public class GMSJoinLeaveJUnitTest { GMSMembershipView gmsView = gmsJoinLeave.getView(); GMSMembershipView newView = new GMSMembershipView(gmsView, gmsView.getViewId() + 6); InstallViewMessage msg = getInstallViewMessage(newView, null, true); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processInstallViewMessage(msg); GMSMembershipView alternateView = new GMSMembershipView(gmsView, gmsView.getViewId() + 1); msg = getInstallViewMessage(alternateView, null, true); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processInstallViewMessage(msg); assertTrue(gmsJoinLeave.getPreparedView().equals(newView)); } @@ -974,7 +977,7 @@ public class GMSJoinLeaveJUnitTest { newView.remove(mockMembers[0]); InstallViewMessage installViewMessage = getInstallViewMessage(newView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); // this test's member-timeout * 3 await() @@ -1077,13 +1080,13 @@ public class GMSJoinLeaveJUnitTest { ViewAckMessage msg = new ViewAckMessage(gmsJoinLeaveMemberId, newViewId, true); msg.setSender(gmsJoinLeaveMemberId); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processViewAckMessage(msg); // ack the view on behalf of the other member, returning a conflicting view coming from a // locator that is trying to become coordinator msg = new ViewAckMessage(newViewId, gmsJoinLeaveMemberId, locatorView); msg.setSender(otherMember); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processViewAckMessage(msg); await() .until(() -> gmsJoinLeave.getViewCreator() != null); @@ -1113,7 +1116,7 @@ public class GMSJoinLeaveJUnitTest { GMSMembershipView netView = new GMSMembershipView(mockMembers[0], 3/* new view id */, createMemberList(mockMembers[0], gmsJoinLeaveMemberId, mockMembers[1], mockMembers[3])); InstallViewMessage installViewMessage = getInstallViewMessage(netView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); // Now coordinator leaves gmsJoinLeave.memberShutdown(mockMembers[0], "Shutdown"); @@ -1144,7 +1147,7 @@ public class GMSJoinLeaveJUnitTest { // prepare the view GMSMembershipView netView = new GMSMembershipView(coordinator, viewId, members); InstallViewMessage installViewMessage = getInstallViewMessage(netView, credentials, false); - gmsJoinLeave.processMessage(installViewMessage); + gmsJoinLeave.processInstallViewMessage(installViewMessage); // verify(messenger).send(isA(ViewAckMessage.class)); } @@ -1167,7 +1170,7 @@ public class GMSJoinLeaveJUnitTest { initMocks(false); System.setProperty(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY, "true"); gmsJoinLeave.join(); - gmsJoinLeave.processMessage( + gmsJoinLeave.processJoinRequestMessage( new JoinRequestMessage(mockMembers[0], mockMembers[0], credentials, -1, 0)); int viewRequests = gmsJoinLeave.getViewRequests().size(); @@ -1275,7 +1278,7 @@ public class GMSJoinLeaveJUnitTest { RemoveMemberMessage msg = new RemoveMemberMessage(gmsJoinLeaveMemberId, mockMembers[0], "crashed"); msg.setSender(gmsJoinLeaveMemberId); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); Timeout to = new Timeout(3 * MembershipConfig.MEMBER_REQUEST_COLLECTION_INTERVAL, new Times(1)); verify(messenger, to).send(isA(NetworkPartitionMessage.class)); @@ -1298,7 +1301,7 @@ public class GMSJoinLeaveJUnitTest { RemoveMemberMessage msg = new RemoveMemberMessage(gmsJoinLeaveMemberId, mockMembers[i], "crashed"); msg.setSender(gmsJoinLeaveMemberId); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); } Timeout to = new Timeout(2 * MembershipConfig.MEMBER_REQUEST_COLLECTION_INTERVAL, never()); verify(messenger, to).send(isA(NetworkPartitionMessage.class)); @@ -1325,7 +1328,7 @@ public class GMSJoinLeaveJUnitTest { RemoveMemberMessage msg = new RemoveMemberMessage(gmsJoinLeaveMemberId, mockMembers[i], "crashed"); msg.setSender(gmsJoinLeaveMemberId); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); } await("waiting for view creator to stop") @@ -1350,7 +1353,7 @@ public class GMSJoinLeaveJUnitTest { preparedView.add(mockMembers[1]); InstallViewMessage msg = getInstallViewMessage(preparedView, null, true); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processInstallViewMessage(msg); becomeCoordinatorForTest(gmsJoinLeave); @@ -1364,13 +1367,13 @@ public class GMSJoinLeaveJUnitTest { } ViewAckMessage vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(vack); + gmsJoinLeave.processViewAckMessage(vack); vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(mockMembers[1]); - gmsJoinLeave.processMessage(vack); + gmsJoinLeave.processViewAckMessage(vack); vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(gmsJoinLeaveMemberId); - gmsJoinLeave.processMessage(vack); + gmsJoinLeave.processViewAckMessage(vack); await("view creator finishes").until(() -> vc.waiting); GMSMembershipView newView = gmsJoinLeave.getView(); @@ -1397,7 +1400,7 @@ public class GMSJoinLeaveJUnitTest { preparedView.setPublicKey(newMember, newMember.toString()); InstallViewMessage msg = getInstallViewMessage(preparedView, null, true); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processInstallViewMessage(msg); becomeCoordinatorForTest(gmsJoinLeave); @@ -1411,13 +1414,13 @@ public class GMSJoinLeaveJUnitTest { } ViewAckMessage vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(mockMembers[0]); - gmsJoinLeave.processMessage(vack); + gmsJoinLeave.processViewAckMessage(vack); vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(newMember); - gmsJoinLeave.processMessage(vack); + gmsJoinLeave.processViewAckMessage(vack); vack = new ViewAckMessage(gmsJoinLeaveMemberId, viewId, true); vack.setSender(gmsJoinLeaveMemberId); - gmsJoinLeave.processMessage(vack); + gmsJoinLeave.processViewAckMessage(vack); await("view creator finishes").until(() -> vc.waiting); GMSMembershipView newView = gmsJoinLeave.getView(); @@ -1697,7 +1700,7 @@ public class GMSJoinLeaveJUnitTest { private void processJoinMessage(MemberIdentifier coordinator, MemberIdentifier newMember, int port) { JoinRequestMessage reqMsg = new JoinRequestMessage(coordinator, newMember, null, port, 0); - gmsJoinLeave.processMessage(reqMsg); + gmsJoinLeave.processJoinRequestMessage(reqMsg); } private void processRemoveMessage(MemberIdentifier rMember) { @@ -1705,7 +1708,7 @@ public class GMSJoinLeaveJUnitTest { new RemoveMemberMessage(gmsJoinLeave.getMemberID(), rMember, "testing"); msg.setSender(gmsJoinLeave.getMemberID()); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processRemoveMemberMessage(msg); } private void processLeaveMessage(MemberIdentifier rMember) { @@ -1713,6 +1716,6 @@ public class GMSJoinLeaveJUnitTest { new LeaveRequestMessage(gmsJoinLeave.getMemberID(), rMember, "testing"); msg.setSender(rMember); - gmsJoinLeave.processMessage(msg); + gmsJoinLeave.processLeaveRequestMessage(msg); } } diff --git a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java index 7d03962..77b5c72 100644 --- a/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java +++ b/geode-membership/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java @@ -577,7 +577,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> * * @param incomingRequest the request to be processed */ - void processMessage(JoinRequestMessage<ID> incomingRequest) { + void processJoinRequestMessage(JoinRequestMessage<ID> incomingRequest) { if (isStopping) { return; } @@ -623,7 +623,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> * * @param incomingRequest the request to be processed */ - void processMessage(LeaveRequestMessage<ID> incomingRequest) { + void processLeaveRequestMessage(LeaveRequestMessage<ID> incomingRequest) { if (isStopping) { return; } @@ -639,10 +639,11 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> ID mbr = incomingRequest.getMemberID(); - logger.info(() -> "JoinLeave.processMessage(LeaveRequestMessage) invoked. isCoordinator=" - + isCoordinator - + "; isStopping=" + isStopping + "; cancelInProgress=" - + services.getCancelCriterion().isCancelInProgress()); + logger.info( + () -> "JoinLeave.processLeaveRequestMessage(LeaveRequestMessage) invoked. isCoordinator=" + + isCoordinator + + "; isStopping=" + isStopping + "; cancelInProgress=" + + services.getCancelCriterion().isCancelInProgress()); if (!v.contains(mbr) && mbr.getVmViewId() < v.getViewId()) { logger.info("ignoring leave request from old member"); @@ -692,7 +693,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> * * @param incomingRequest the request to process */ - void processMessage(RemoveMemberMessage<ID> incomingRequest) { + void processRemoveMemberMessage(RemoveMemberMessage<ID> incomingRequest) { if (isStopping) { return; } @@ -1028,7 +1029,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> } } - void processMessage(final InstallViewMessage<ID> m) { + void processInstallViewMessage(final InstallViewMessage<ID> m) { if (isStopping) { return; } @@ -1129,7 +1130,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> } } - void processMessage(ViewAckMessage<ID> m) { + void processViewAckMessage(ViewAckMessage<ID> m) { if (isStopping) { return; } @@ -1371,7 +1372,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> * * @param rsp the response message to process */ - void processMessage(JoinResponseMessage<ID> rsp) { + void processJoinResponseMessage(JoinResponseMessage<ID> rsp) { if (isStopping) { return; } @@ -1412,7 +1413,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> joinResponse[0] = jrm; } - void processMessage(FindCoordinatorRequest<ID> req) { + void processFindCoordinatorRequestMessage(FindCoordinatorRequest<ID> req) { if (isStopping) { return; } @@ -1430,7 +1431,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> services.getMessenger().send(resp); } - void processMessage(FindCoordinatorResponse<ID> resp) { + void processFindCoordinatorResponseMessage(FindCoordinatorResponse<ID> resp) { if (isStopping) { return; } @@ -1450,7 +1451,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> response.getCoordinator()); } - void processMessage(NetworkPartitionMessage<ID> msg) { + void processNetworkPartitionMessage(NetworkPartitionMessage<ID> msg) { if (isStopping) { return; } @@ -1771,7 +1772,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> new RemoveMemberMessage<>(v.getPreferredCoordinators(filter, getMemberID(), 5), m, reason); msg.setSender(this.localAddress); - processMessage(msg); + processRemoveMemberMessage(msg); if (!this.isCoordinator) { msg.setRecipients(v.getPreferredCoordinators(Collections.emptySet(), localAddress, MembershipConfig.SMALL_CLUSTER_SIZE + 1)); @@ -1789,7 +1790,7 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> new LeaveRequestMessage<>(Collections.singletonList(this.localAddress), mbr, reason); msg.setSender(mbr); - processMessage(msg); + processLeaveRequestMessage(msg); } boolean checkIfAvailable(ID fmbr) { @@ -1855,15 +1856,18 @@ public class GMSJoinLeave<ID extends MemberIdentifier> implements JoinLeave<ID> + MembershipConfig.START_LOCATOR + "."); } - services.getMessenger().addHandler(JoinRequestMessage.class, this::processMessage); - services.getMessenger().addHandler(JoinResponseMessage.class, this::processMessage); - services.getMessenger().addHandler(InstallViewMessage.class, this::processMessage); - services.getMessenger().addHandler(ViewAckMessage.class, this::processMessage); - services.getMessenger().addHandler(LeaveRequestMessage.class, this::processMessage); - services.getMessenger().addHandler(RemoveMemberMessage.class, this::processMessage); - services.getMessenger().addHandler(FindCoordinatorRequest.class, this::processMessage); - services.getMessenger().addHandler(FindCoordinatorResponse.class, this::processMessage); - services.getMessenger().addHandler(NetworkPartitionMessage.class, this::processMessage); + services.getMessenger().addHandler(JoinRequestMessage.class, this::processJoinRequestMessage); + services.getMessenger().addHandler(JoinResponseMessage.class, this::processJoinResponseMessage); + services.getMessenger().addHandler(InstallViewMessage.class, this::processInstallViewMessage); + services.getMessenger().addHandler(ViewAckMessage.class, this::processViewAckMessage); + services.getMessenger().addHandler(LeaveRequestMessage.class, this::processLeaveRequestMessage); + services.getMessenger().addHandler(RemoveMemberMessage.class, this::processRemoveMemberMessage); + services.getMessenger().addHandler(FindCoordinatorRequest.class, + this::processFindCoordinatorRequestMessage); + services.getMessenger().addHandler(FindCoordinatorResponse.class, + this::processFindCoordinatorResponseMessage); + services.getMessenger().addHandler(NetworkPartitionMessage.class, + this::processNetworkPartitionMessage); long ackCollectionTimeout = config.getMemberTimeout() * 2 * 12437 / 10000; if (ackCollectionTimeout < 1500) {