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 2019/10/25 21:27:07 UTC
[geode] branch feature/GEODE-7358 updated: fixing failing tests
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-7358
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-7358 by this push:
new 02e8af4 fixing failing tests
02e8af4 is described below
commit 02e8af4f0b26ca944c41884298a0b0a725be2e23
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Oct 25 14:21:45 2019 -0700
fixing failing tests
---
.../cache/CacheDistributionAdvisorConcurrentTest.java | 4 +---
.../geode/codeAnalysis/sanctionedDataSerializables.txt | 16 ++++++++--------
.../internal/membership/gms/MemberIdentifierImpl.java | 4 ++++
.../distributed/internal/membership/gms/Services.java | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheDistributionAdvisorConcurrentTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheDistributionAdvisorConcurrentTest.java
index 9afbc52..354f20e 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheDistributionAdvisorConcurrentTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/CacheDistributionAdvisorConcurrentTest.java
@@ -32,7 +32,6 @@ import org.apache.geode.cache.Operation;
import org.apache.geode.distributed.internal.DistributionAdvisor;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.distributed.internal.membership.MemberAttributes;
import org.apache.geode.internal.cache.CacheDistributionAdvisor.CacheProfile;
import org.apache.geode.test.concurrency.ConcurrentTestRunner;
import org.apache.geode.test.concurrency.ParallelExecutor;
@@ -98,8 +97,7 @@ public class CacheDistributionAdvisorConcurrentTest {
private CacheProfile createCacheProfile() throws UnknownHostException {
InternalDistributedMember member =
- new InternalDistributedMember(InetAddress.getLocalHost(), 0, false,
- false, MemberAttributes.DEFAULT);
+ new InternalDistributedMember(InetAddress.getLocalHost(), 0);
return new CacheProfile(member, 1);
}
}
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 9eac958..7f0fa06 100644
--- a/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/integrationTest/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -272,24 +272,24 @@ toData,17
org/apache/geode/distributed/internal/membership/InternalDistributedMember,6
fromData,39
-fromDataPre_GFE_7_1_0_0,279
-fromDataPre_GFE_9_0_0_0,279
+fromDataPre_GFE_7_1_0_0,310
+fromDataPre_GFE_9_0_0_0,310
toData,35
-toDataPre_GFE_7_1_0_0,278
-toDataPre_GFE_9_0_0_0,274
+toDataPre_GFE_7_1_0_0,279
+toDataPre_GFE_9_0_0_0,275
org/apache/geode/distributed/internal/membership/adapter/LocalViewMessage,2
fromData,8
toData,8
-org/apache/geode/distributed/internal/membership/gms/GMSMember,2
-fromData,200
-toData,215
-
org/apache/geode/distributed/internal/membership/gms/GMSMembershipView,2
fromData,111
toData,65
+org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl,2
+fromData,23
+toData,12
+
org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2
fromData,95
toData,118
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java
index 0571402..0bbf0b7 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/MemberIdentifierImpl.java
@@ -34,6 +34,10 @@ import org.apache.geode.internal.serialization.Version;
public class MemberIdentifierImpl implements MemberIdentifier, Comparable<MemberIdentifierImpl> {
private MemberData memberData;
+ public MemberIdentifierImpl() {
+ // required by DataSerializableFixedID deserialization
+ }
+
public MemberIdentifierImpl(MemberData memberInfo) {
memberData = memberInfo;
}
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
index 9db57bd..fdd34c8 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/Services.java
@@ -157,7 +157,7 @@ public class Services {
serializer.registerDSFID(LEAVE_REQUEST_MESSAGE, LeaveRequestMessage.class);
serializer.registerDSFID(VIEW_ACK_MESSAGE, ViewAckMessage.class);
serializer.registerDSFID(INSTALL_VIEW_MESSAGE, InstallViewMessage.class);
- serializer.registerDSFID(MEMBER_IDENTIFIER, MemberIdentifier.class);
+ serializer.registerDSFID(MEMBER_IDENTIFIER, MemberIdentifierImpl.class);
serializer.registerDSFID(NETVIEW, GMSMembershipView.class);
serializer.registerDSFID(GET_VIEW_REQ, GetViewRequest.class);
serializer.registerDSFID(GET_VIEW_RESP, GetViewResponse.class);