This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit bf94d0978a0f4b7c6e562f3077cbe33286bfcc44 Author: Jacob Barrett <[email protected]> AuthorDate: Thu Jan 21 20:13:10 2021 -0800 GEODE-8870: Removes GFE_66. --- .../client/internal/ClientSideHandshakeImpl.java | 5 +--- .../org/apache/geode/internal/cache/Oplog.java | 32 ++++++---------------- .../internal/cache/tier/sockets/BaseCommand.java | 11 +++----- .../tier/sockets/ServerSideHandshakeImpl.java | 27 ++++++++---------- .../geode/internal/serialization/KnownVersion.java | 7 ----- 5 files changed, 24 insertions(+), 58 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java index f0de522..5378df8 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java @@ -234,10 +234,7 @@ public class ClientSideHandshakeImpl extends Handshake implements ClientSideHand } // validate that the remote side has a different distributed system id. - if (communicationMode.isWAN() - && KnownVersion.GFE_66 - .compareTo(Versioning.getVersion(conn.getWanSiteVersion())) <= 0 - && currentClientVersion.isNotOlderThan(KnownVersion.GFE_66)) { + if (communicationMode.isWAN()) { int remoteDistributedSystemId = in.read(); int localDistributedSystemId = ((InternalDistributedSystem) system).getDistributionManager().getDistributedSystemId(); diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java index f3146fd..026a549 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java @@ -6395,20 +6395,12 @@ public class Oplog implements CompactableOplog, Flushable { */ public KnownVersion getProductVersionIfOld() { final KnownVersion version = this.gfversion; - if (version == null) { - // check for the case of diskstore upgrade from 6.6 to >= 7.0 - if (getParent().isUpgradeVersionOnly()) { - // assume previous release version - return KnownVersion.GFE_66; - } else { - return null; - } - } else if (version == KnownVersion.CURRENT) { + if (version == KnownVersion.CURRENT) { return null; - } else { - // version changed so return that for VersionedDataStream - return version; } + + // version changed so return that for VersionedDataStream + return version; } /** @@ -6417,20 +6409,12 @@ public class Oplog implements CompactableOplog, Flushable { */ public KnownVersion getDataVersionIfOld() { final KnownVersion version = this.dataVersion; - if (version == null) { - // check for the case of diskstore upgrade from 6.6 to >= 7.0 - if (getParent().isUpgradeVersionOnly()) { - // assume previous release version - return KnownVersion.GFE_66; - } else { - return null; - } - } else if (version == KnownVersion.CURRENT) { + if (version == KnownVersion.CURRENT) { return null; - } else { - // version changed so return that for VersionedDataStream - return version; } + + // version changed so return that for VersionedDataStream + return version; } public enum OPLOG_TYPE { diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java index 02ef1a7..d418616 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/BaseCommand.java @@ -164,7 +164,7 @@ public abstract class BaseCommand implements Command { if (EntryLogger.isEnabled() && serverConnection != null) { EntryLogger.setSource(serverConnection.getMembershipID(), "c2s"); } - boolean shouldMasquerade = shouldMasqueradeForTx(clientMessage, serverConnection); + boolean shouldMasquerade = shouldMasqueradeForTx(clientMessage); try { if (shouldMasquerade) { InternalCache cache = serverConnection.getCache(); @@ -208,15 +208,12 @@ public abstract class BaseCommand implements Command { } /** - * checks to see if this thread needs to masquerade as a transactional thread. clients after - * GFE_66 should be able to start a transaction. + * checks to see if this thread needs to masquerade as a transactional thread. * * @return true if thread should masquerade as a transactional thread. */ - protected boolean shouldMasqueradeForTx(Message clientMessage, - ServerConnection serverConnection) { - return serverConnection.getClientVersion().isNotOlderThan(KnownVersion.GFE_66) - && clientMessage.getTransactionId() > TXManagerImpl.NOTX; + protected boolean shouldMasqueradeForTx(Message clientMessage) { + return clientMessage.getTransactionId() > TXManagerImpl.NOTX; } /** diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java index d691082..2751f4b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java @@ -173,24 +173,19 @@ public class ServerSideHandshakeImpl extends Handshake implements ServerSideHand dos.writeBoolean(((InternalDistributedSystem) system).getConfig().getDeltaPropagation()); } - // Neeraj: Now if the communication mode is GATEWAY_TO_GATEWAY - // and principal not equal to null then send the credentials also - if (communicationMode.isWAN() && principal != null) { - sendCredentialsForWan(dos, dis); - } + if (communicationMode.isWAN()) { + if (principal != null) { + sendCredentialsForWan(dos, dis); + } - // Write the distributed system id if this is a 6.6 or greater client - // on the remote side of the gateway - if (communicationMode.isWAN() && clientVersion.isNotOlderThan(KnownVersion.GFE_66) - && currentServerVersion.isNotOlderThan(KnownVersion.GFE_66)) { - dos.writeByte(((InternalDistributedSystem) system).getDistributionManager() - .getDistributedSystemId()); - } + dos.writeByte( + ((InternalDistributedSystem) system).getDistributionManager().getDistributedSystemId()); - if ((communicationMode.isWAN()) && clientVersion.isNotOlderThan(KnownVersion.GFE_80) - && currentServerVersion.isNotOlderThan(KnownVersion.GFE_80)) { - int pdxSize = PeerTypeRegistration.getPdxRegistrySize(); - dos.writeInt(pdxSize); + if (clientVersion.isNotOlderThan(KnownVersion.GFE_80) + && currentServerVersion.isNotOlderThan(KnownVersion.GFE_80)) { + int pdxSize = PeerTypeRegistration.getPdxRegistrySize(); + dos.writeInt(pdxSize); + } } // Flush diff --git a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java index 8dd16ec..a39613f 100644 --- a/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java +++ b/geode-serialization/src/main/java/org/apache/geode/internal/serialization/KnownVersion.java @@ -62,13 +62,6 @@ public class KnownVersion extends AbstractVersion { public static final KnownVersion TOKEN = new KnownVersion("", "TOKEN", (byte) -1, (byte) 0, (byte) 0, (byte) 0, TOKEN_ORDINAL); - private static final short GFE_66_ORDINAL = 16; - - @Immutable - @Deprecated - public static final KnownVersion GFE_66 = - new KnownVersion("GFE", "6.6", (byte) 6, (byte) 6, (byte) 0, (byte) 0, GFE_66_ORDINAL); - private static final short GFE_662_ORDINAL = 17; @Immutable
