----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/59242/ -----------------------------------------------------------
(Updated May 15, 2017, 11:13 p.m.) Review request for geode, Galen O'Sullivan, Hitesh Khamesra, and Udo Kohlmeyer. Changes ------- The updated diff adds Version.GEODE_120 to be used by GMSMember to distinguish between the current version and v1.1.1. I've also renamed Version.GFE_91 to Version.GEODE_111 and have fixed the version numbers in this and GEODE_110 to reflect their actual version numbers (they were 9.x.y.z). To do that I had to revert a change to Version.compareTo(Version) to have it be based on ordinal numbers like it was in the past. Bugs: GEODE-2915 https://issues.apache.org/jira/browse/GEODE-2915 Repository: geode Description ------- The fix for GEODE_2875 has exacerbated this problem, which we used to only see in cases where disable-tcp=true or when multicast was enabled. The problem is that JGroupsMessenger is not sending the "vmkind" of the sender in message headers. This part of the header comes from GMSMember.writeEssentialData(). I've changed it here to include the vmKind if the recipient isn't using geode 1.0, which doesn't expect the version byte. Diffs (updated) ----- geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java 41c85d6421c8283163b70f2a560c8e4cbb02f2cc geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java b7079f8bc20a0e58949b69b9f0174a26af1a9b86 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java bfc8b61ff9e9c49568a0c6e19381714ea8fbba05 geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager.java 8cdd6a58df82a4e11cd1c2f864650a3da20aaec6 geode-core/src/main/java/org/apache/geode/internal/Version.java 288d1049eb5fe2134e485e4d89a2538b2d5115f4 geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java 71586a0f1866e63c6314a6884f144c9342aace4b geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java 1b33094c9b337db3d1b65ec6132819b867d841cf geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java f740dde3083e78f2df19ecdd5445ac6e6e013057 geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberJUnitTest.java f471ad99b56615a1935ccf52127960f4af763d7d geode-old-versions/build.gradle eb82a5ffb950826b9fa0072ea5ba0f3a505aa010 Diff: https://reviews.apache.org/r/59242/diff/2/ Changes: https://reviews.apache.org/r/59242/diff/1-2/ Testing ------- new unit test. Precheckin is underway. I expect AnalyzeSerializables to fail & will need to update its sanctionedDataSerializables.txt record for GMSMember. Thanks, Bruce Schuchardt