You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2017/10/18 19:18:06 UTC
[geode] branch develop updated: GEODE-3841 CI Failure :
WanCommandListDUnitTest.testListGatewaySenderGatewayReceiver_group
GEODE-3780 suspected member is never watched again after passing final
check
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 2636bd8 GEODE-3841 CI Failure : WanCommandListDUnitTest.testListGatewaySenderGatewayReceiver_group GEODE-3780 suspected member is never watched again after passing final check
2636bd8 is described below
commit 2636bd842d4b87992ffda45c5d2683060d20c05f
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Wed Oct 18 12:14:09 2017 -0700
GEODE-3841 CI Failure : WanCommandListDUnitTest.testListGatewaySenderGatewayReceiver_group
GEODE-3780 suspected member is never watched again after passing final check
Added FinalCheckPassedMessage to the DSFID registry and added a test
to ensure that it's possible to serialize and deserialize one of these
objects.
---
.../gms/messages/FinalCheckPassedMessage.java | 2 ++
.../java/org/apache/geode/internal/DSFIDFactory.java | 2 ++
.../membership/gms/fd/GMSHealthMonitorJUnitTest.java | 17 +++++++++++++++++
3 files changed, 21 insertions(+)
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java
index 3f3b278..b64917d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage.java
@@ -28,6 +28,8 @@ public class FinalCheckPassedMessage extends HighPriorityDistributionMessage {
private InternalDistributedMember suspect;
+ public FinalCheckPassedMessage() {}
+
public FinalCheckPassedMessage(InternalDistributedMember recipient,
InternalDistributedMember suspect) {
super();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
index 31887ef..d60a913 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java
@@ -96,6 +96,7 @@ import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordina
import org.apache.geode.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
import org.apache.geode.distributed.internal.membership.gms.locator.GetViewRequest;
import org.apache.geode.distributed.internal.membership.gms.locator.GetViewResponse;
+import org.apache.geode.distributed.internal.membership.gms.messages.FinalCheckPassedMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRequestMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.InstallViewMessage;
@@ -475,6 +476,7 @@ public class DSFIDFactory implements DataSerializableFixedID {
}
private static void registerDSFIDTypes() {
+ registerDSFID(FINAL_CHECK_PASSED_MESSAGE, FinalCheckPassedMessage.class);
registerDSFID(NETWORK_PARTITION_MESSAGE, NetworkPartitionMessage.class);
registerDSFID(REMOVE_MEMBER_REQUEST, RemoveMemberMessage.class);
registerDSFID(HEARTBEAT_REQUEST, HeartbeatRequestMessage.class);
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 2d0d0cd..e7109ca 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.distributed.internal.membership.gms.fd;
+import org.apache.geode.DataSerializer;
import org.apache.geode.distributed.internal.*;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.NetView;
@@ -30,6 +31,7 @@ import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatMe
import org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRequestMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
import org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequest;
+import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.net.SocketCreatorFactory;
@@ -529,6 +531,21 @@ public class GMSHealthMonitorJUnitTest {
}
}
+ @Test
+ public void testFinalCheckPassedMessageCanBeSerializedAndDeserialized()
+ throws IOException, ClassNotFoundException {
+ HeapDataOutputStream heapDataOutputStream = new HeapDataOutputStream(500, Version.CURRENT);
+ FinalCheckPassedMessage message =
+ new FinalCheckPassedMessage(mockMembers.get(0), mockMembers.get(1));
+ DataSerializer.writeObject(message, heapDataOutputStream);
+ ByteArrayInputStream byteArrayInputStream =
+ new ByteArrayInputStream(heapDataOutputStream.toByteArray());
+ DataInputStream dataInputStream = new DataInputStream(byteArrayInputStream);
+ message = DataSerializer.readObject(dataInputStream);
+ assertEquals(mockMembers.get(1), message.getSuspect());
+ }
+
+
@Test
public void testInitiatorRewatchesSuspectAfterSuccessfulFinalCheck() {
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].