From 8e8ec93d516b76d4fb559ab91c0a5762708d1789 Mon Sep 17 00:00:00 2001 From: Barry Oglesby Date: Wed, 21 Mar 2018 12:39:45 -0700 Subject: [PATCH 01/15] GEODE-4451: Changed sender startup to retry when a remote security exception occurs * GEODE-4451: Changed sender startup to retry when a remote security exception occurs * GEODE-4451: Prevented sender from being created when members aren't all current version * GEODE-4451: Apply spotless * GEODE-4451: Refactored test to use ConfigurationProperties --- ...ntParallelGatewaySenderEventProcessor.java | 2 +- .../parallel/ParallelGatewaySenderQueue.java | 3 +- ...rentSerialGatewaySenderEventProcessor.java | 2 +- .../geode/internal/i18n/LocalizedStrings.java | 2 +- .../commands/CreateGatewaySenderCommand.java | 13 ++ .../internal/cli/i18n/CliStrings.java | 2 + .../CreateGatewaySenderCommandTest.java | 23 +++ .../GatewaySenderEventRemoteDispatcher.java | 105 ++++++------ .../cache/wan/WANRollingUpgradeDUnitTest.java | 150 +++++++++++++++--- .../geode/internal/cache/wan/WANTestBase.java | 46 ++---- .../misc/NewWanAuthenticationDUnitTest.java | 86 +++++++--- .../cache/wan/misc/WANSSLDUnitTest.java | 69 +++++--- ...anagerWithInvalidCredentials.security.json | 18 +++ 13 files changed, 367 insertions(+), 154 deletions(-) create mode 100644 geode-wan/src/test/resources/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.testWanSecurityManagerWithInvalidCredentials.security.json diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java index c4b154675568..54b70347f1ee 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderEventProcessor.java @@ -189,7 +189,7 @@ private void waitForRunningStatus() { if (ex != null) { throw new GatewaySenderException( LocalizedStrings.Sender_COULD_NOT_START_GATEWAYSENDER_0_BECAUSE_OF_EXCEPTION_1 - .toLocalizedString(new Object[] {this.getId(), ex.getMessage()}), + .toLocalizedString(new Object[] {this.sender.getId(), ex.getMessage()}), ex.getCause()); } } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java index 75ce63cbf103..3aa8534675e1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java @@ -1577,8 +1577,7 @@ private class BatchRemovalThread extends Thread { * Constructor : Creates and initializes the thread */ public BatchRemovalThread(InternalCache c, ParallelGatewaySenderQueue queue) { - super("BatchRemovalThread"); - // TODO:REF: Name for this thread ? + super("BatchRemovalThread for GatewaySender_" + queue.sender.getId() + "_" + queue.index); this.setDaemon(true); this.cache = c; this.parallelQueue = queue; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java index 6413e1cbd156..e7beb07c1965 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/ConcurrentSerialGatewaySenderEventProcessor.java @@ -221,7 +221,7 @@ private void waitForRunningStatus() { if (ex != null) { throw new GatewaySenderException( LocalizedStrings.Sender_COULD_NOT_START_GATEWAYSENDER_0_BECAUSE_OF_EXCEPTION_1 - .toLocalizedString(new Object[] {this.getId(), ex.getMessage()}), + .toLocalizedString(new Object[] {this.sender.getId(), ex.getMessage()}), ex.getCause()); } } diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java index 905086af5110..a81d5a59e89e 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java +++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java @@ -2122,7 +2122,7 @@ public class LocalizedStrings { public static final StringId CacheClientProxy_EXCEPTION_OCCURRED_WHILE_TRYING_TO_CREATE_A_MESSAGE_QUEUE = new StringId(2297, "Exception occurred while trying to create a message queue."); public static final StringId GatewayEventRemoteDispatcher_0_COULD_NOT_CONNECT_1 = - new StringId(2298, "{0} : Could not connect. {1}"); + new StringId(2298, "{0} : Could not connect due to: {1}"); public static final StringId CacheCollector_UNABLE_TO_MIX_REGION_AND_ENTRY_SNAPSHOTS_IN_CACHECOLLECTOR = new StringId(2300, "Unable to mix region and entry snapshots in CacheCollector."); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java index 8a86c09679a4..b132852d1030 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java @@ -23,6 +23,8 @@ import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Version; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -116,6 +118,12 @@ public Result createGatewaySender(@CliOption(key = {CliStrings.GROUP, CliStrings Set membersToCreateGatewaySenderOn = getMembers(onGroups, onMember); + // Don't allow sender to be created if all members are not the current version. + if (!verifyAllCurrentVersion(membersToCreateGatewaySenderOn)) { + return ResultBuilder.createUserErrorResult( + CliStrings.CREATE_GATEWAYSENDER__MSG__CAN_NOT_CREATE_DIFFERENT_VERSIONS); + } + List gatewaySenderCreateResults = executeAndGetFunctionResult(GatewaySenderCreateFunction.INSTANCE, gatewaySenderFunctionArgs, membersToCreateGatewaySenderOn); @@ -139,6 +147,11 @@ public Result createGatewaySender(@CliOption(key = {CliStrings.GROUP, CliStrings return result; } + private boolean verifyAllCurrentVersion(Set members) { + return members.stream().allMatch( + member -> ((InternalDistributedMember) member).getVersionObject().equals(Version.CURRENT)); + } + public static class Interceptor extends AbstractCliAroundInterceptor { @Override public Result preExecution(GfshParseResult parseResult) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java index a1e9e3e9abcc..e7237d4db975 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java @@ -2248,6 +2248,8 @@ public class CliStrings { "Could not instantiate class \"{0}\" specified for \"{1}\"."; public static final String CREATE_GATEWAYSENDER__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = "Could not access class \"{0}\" specified for \"{1}\"."; + public static final String CREATE_GATEWAYSENDER__MSG__CAN_NOT_CREATE_DIFFERENT_VERSIONS = + "Gateway Sender cannot be created until all members are the current version"; /* stop gateway-receiver */ public static final String START_GATEWAYSENDER = "start gateway-sender"; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java index 122cf10428a0..b24792f7ea7a 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -33,9 +34,13 @@ import org.junit.Test; import org.junit.experimental.categories.Category; +import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalClusterConfigurationService; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Version; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.configuration.domain.XmlEntity; import org.apache.geode.test.junit.categories.UnitTest; import org.apache.geode.test.junit.rules.GfshParserRule; @@ -148,4 +153,22 @@ public void whenNoXml() { .hasNoFailToPersistError(); verify(ccService, never()).deleteXmlEntity(any(), any()); } + + @Test + public void whenMembersAreDifferentVersions() { + // Create a set of mixed version members + Set members = new HashSet<>(); + InternalDistributedMember currentVersionMember = mock(InternalDistributedMember.class); + doReturn(Version.CURRENT).when(currentVersionMember).getVersionObject(); + InternalDistributedMember oldVersionMember = mock(InternalDistributedMember.class); + doReturn(Version.GEODE_140).when(oldVersionMember).getVersionObject(); + members.add(currentVersionMember); + members.add(oldVersionMember); + doReturn(members).when(command).getMembers(any(), any()); + + // Verify executing the command fails + gfsh.executeAndAssertThat(command, + "create gateway-sender --id=1 --remote-distributed-system-id=1").statusIsError() + .containsOutput(CliStrings.CREATE_GATEWAYSENDER__MSG__CAN_NOT_CREATE_DIFFERENT_VERSIONS); + } } diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java index 782d7c0d2721..83576698f7b0 100644 --- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java +++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java @@ -78,10 +78,7 @@ public GatewaySenderEventRemoteDispatcher(AbstractGatewaySenderEventProcessor ev try { initializeConnection(); } catch (GatewaySenderException e) { - if (e.getCause() instanceof GemFireSecurityException) { - throw e; - } - + // It is ok to ignore this exception. It is logged in the initializeConnection call. } } @@ -168,7 +165,7 @@ public boolean dispatchBatch(List events, boolean removeFromQueueOnException, bo // if our pool is shutdown then just be silent } else if (t instanceof IOException || t instanceof ServerConnectivityException || t instanceof ConnectionDestroyedException || t instanceof MessageTooLargeException - || t instanceof IllegalStateException) { + || t instanceof IllegalStateException || t instanceof GemFireSecurityException) { this.processor.handleException(); // If the cause is an IOException or a ServerException, sleep and retry. // Sleep for a bit and recheck. @@ -431,58 +428,29 @@ private void initializeConnection() throws GatewaySenderException, GemFireSecuri } } } catch (ServerConnectivityException e) { - this.failedConnectCount++; - Throwable ex = null; + // Get the exception to throw + GatewaySenderException gse = getInitializeConnectionExceptionToThrow(e); - if (e.getCause() instanceof GemFireSecurityException) { - ex = e.getCause(); - if (logConnectionFailure()) { - // only log this message once; another msg is logged once we connect - logger.warn(LocalizedMessage.create( - LocalizedStrings.GatewayEventRemoteDispatcher_0_COULD_NOT_CONNECT_1, - new Object[] {this.processor.getSender().getId(), ex.getMessage()})); - } - throw new GatewaySenderException(ex); - } - List servers = this.sender.getProxy().getCurrentServers(); - String ioMsg = null; - if (servers.size() == 0) { - ioMsg = LocalizedStrings.GatewayEventRemoteDispatcher_THERE_ARE_NO_ACTIVE_SERVERS - .toLocalizedString(); - } else { - final StringBuilder buffer = new StringBuilder(); - for (ServerLocation server : servers) { - String endpointName = String.valueOf(server); - if (buffer.length() > 0) { - buffer.append(", "); - } - buffer.append(endpointName); - } - ioMsg = - LocalizedStrings.GatewayEventRemoteDispatcher_NO_AVAILABLE_CONNECTION_WAS_FOUND_BUT_THE_FOLLOWING_ACTIVE_SERVERS_EXIST_0 - .toLocalizedString(buffer.toString()); - } - ex = new IOException(ioMsg); - // Set the serverLocation to null so that a new connection can be - // obtained in next attempt + // Set the serverLocation to null so that a new connection can be obtained in next attempt this.sender.setServerLocation(null); - if (this.failedConnectCount == 1) { + + // Log the exception if necessary + if (logConnectionFailure()) { // only log this message once; another msg is logged once we connect logger.warn(LocalizedMessage.create( - LocalizedStrings.GatewayEventRemoteDispatcher__0___COULD_NOT_CONNECT, - this.processor.getSender().getId())); - + LocalizedStrings.GatewayEventRemoteDispatcher_0_COULD_NOT_CONNECT_1, + new Object[] {this.processor.getSender().getId(), gse.getCause().getMessage()})); } - // Wrap the IOException in a GatewayException so it can be processed the - // same as the other exceptions that might occur in sendBatch. - throw new GatewaySenderException( - LocalizedStrings.GatewayEventRemoteDispatcher__0___COULD_NOT_CONNECT - .toLocalizedString(this.processor.getSender().getId()), - ex); + + // Increment failed connection count + this.failedConnectCount++; + + // Throw the exception + throw gse; } if (this.failedConnectCount > 0) { - Object[] logArgs = new Object[] {this.processor.getSender().getId(), con, - Integer.valueOf(this.failedConnectCount)}; + Object[] logArgs = + new Object[] {this.processor.getSender().getId(), con, this.failedConnectCount}; logger.info(LocalizedMessage.create( LocalizedStrings.GatewayEventRemoteDispatcher_0_USING_1_AFTER_2_FAILED_CONNECT_ATTEMPTS, logArgs)); @@ -496,14 +464,47 @@ private void initializeConnection() throws GatewaySenderException, GemFireSecuri this.processor.checkIfPdxNeedsResend(this.connection.getQueueStatus().getPdxSize()); } catch (ConnectionDestroyedException e) { throw new GatewaySenderException( - LocalizedStrings.GatewayEventRemoteDispatcher__0___COULD_NOT_CONNECT - .toLocalizedString(this.processor.getSender().getId()), + LocalizedStrings.GatewayEventRemoteDispatcher_0_COULD_NOT_CONNECT_1.toLocalizedString( + new Object[] {this.processor.getSender().getId(), e.getMessage()}), e); } finally { this.connectionLifeCycleLock.writeLock().unlock(); } } + private GatewaySenderException getInitializeConnectionExceptionToThrow( + ServerConnectivityException e) { + GatewaySenderException gse = null; + if (e.getCause() instanceof GemFireSecurityException) { + gse = new GatewaySenderException(e.getCause()); + } else { + List servers = this.sender.getProxy().getCurrentServers(); + String ioMsg; + if (servers.size() == 0) { + ioMsg = LocalizedStrings.GatewayEventRemoteDispatcher_THERE_ARE_NO_ACTIVE_SERVERS + .toLocalizedString(); + } else { + final StringBuilder buffer = new StringBuilder(); + for (ServerLocation server : servers) { + String endpointName = String.valueOf(server); + if (buffer.length() > 0) { + buffer.append(", "); + } + buffer.append(endpointName); + } + ioMsg = + LocalizedStrings.GatewayEventRemoteDispatcher_NO_AVAILABLE_CONNECTION_WAS_FOUND_BUT_THE_FOLLOWING_ACTIVE_SERVERS_EXIST_0 + .toLocalizedString(buffer.toString()); + } + IOException ex = new IOException(ioMsg); + gse = new GatewaySenderException( + LocalizedStrings.GatewayEventRemoteDispatcher_0_COULD_NOT_CONNECT_1.toLocalizedString( + new Object[] {this.processor.getSender().getId(), ex.getMessage()}), + ex); + } + return gse; + } + protected boolean logConnectionFailure() { // always log the first failure if (logger.isDebugEnabled() || this.failedConnectCount == 0) { diff --git a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java index e0b7dfd959e9..cf7c7b17a236 100644 --- a/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/cache/wan/WANRollingUpgradeDUnitTest.java @@ -14,19 +14,27 @@ */ package org.apache.geode.cache.wan; +import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION; +import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER; +import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATORS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Properties; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.logging.log4j.Logger; import org.awaitility.Awaitility; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -43,8 +51,6 @@ import org.apache.geode.cache.server.CacheServer; import org.apache.geode.cache.util.CacheListenerAdapter; import org.apache.geode.distributed.Locator; -import org.apache.geode.distributed.internal.DistributionConfig; -import org.apache.geode.distributed.internal.DistributionConfigImpl; import org.apache.geode.distributed.internal.InternalLocator; import org.apache.geode.internal.AvailablePort; import org.apache.geode.internal.AvailablePortHelper; @@ -52,7 +58,8 @@ import org.apache.geode.internal.cache.wan.parallel.BatchRemovalThreadHelper; import org.apache.geode.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue; import org.apache.geode.internal.cache.wan.parallel.ParallelGatewaySenderQueue; -import org.apache.geode.internal.logging.LogService; +import org.apache.geode.management.internal.cli.i18n.CliStrings; +import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.dunit.DistributedTestUtils; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.IgnoredException; @@ -64,6 +71,7 @@ import org.apache.geode.test.junit.categories.BackwardCompatibilityTest; import org.apache.geode.test.junit.categories.DistributedTest; import org.apache.geode.test.junit.categories.WanTest; +import org.apache.geode.test.junit.rules.GfshCommandRule; import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory; @SuppressWarnings("ConstantConditions") @@ -85,6 +93,9 @@ public static Collection data() { // the old version of Geode we're testing against private String oldVersion; + @Rule + public transient GfshCommandRule gfsh = new GfshCommandRule(); + public WANRollingUpgradeDUnitTest(String version) { oldVersion = version; } @@ -500,7 +511,7 @@ public void testEventProcessingMixedSiteOneCurrentSiteTwo() throws Exception { VM site1Server2 = host.getVM(oldVersion, 2); VM site1Client = host.getVM(oldVersion, 3); - // Get old site members + // Get current site members VM site2Locator = host.getVM(VersionManager.CURRENT_VERSION, 4); VM site2Server1 = host.getVM(VersionManager.CURRENT_VERSION, 5); VM site2Server2 = host.getVM(VersionManager.CURRENT_VERSION, 6); @@ -512,7 +523,7 @@ public void testEventProcessingMixedSiteOneCurrentSiteTwo() throws Exception { final String site1Locators = hostName + "[" + site1LocatorPort + "]"; final int site1DistributedSystemId = 0; - // Get old site locator properties + // Get current site locator properties final int site2LocatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); DistributedTestUtils.deleteLocatorStateFile(site2LocatorPort); final String site2Locators = hostName + "[" + site2LocatorPort + "]"; @@ -530,7 +541,7 @@ public void testEventProcessingMixedSiteOneCurrentSiteTwo() throws Exception { !InternalLocator.getLocator().getConfig().getEnableClusterConfiguration() || InternalLocator.getLocator().isSharedConfigurationRunning()))); - // Start old site locator + // Start current site locator site2Locator.invoke(() -> startLocator(site2LocatorPort, site2DistributedSystemId, site2Locators, site1Locators)); @@ -548,12 +559,12 @@ public void testEventProcessingMixedSiteOneCurrentSiteTwo() throws Exception { rollStartAndConfigureServerToCurrent(site1Server2, site1Locators, site2DistributedSystemId, regionName, site1SenderId, ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL); - // Start and configure old site servers + // Start and configure old current servers String site2SenderId = getName() + "_gatewaysender_" + site1DistributedSystemId; startAndConfigureServers(site2Server1, site2Server2, site2Locators, site1DistributedSystemId, regionName, site2SenderId, ParallelGatewaySenderQueue.DEFAULT_MESSAGE_SYNC_INTERVAL); - // Do puts from mixed site client and verify events on old site + // Do puts from mixed site client and verify events on current site int numPuts = 100; doClientPutsAndVerifyEvents(site1Client, site1Server1, site1Server2, site2Server1, site2Server2, hostName, site1LocatorPort, regionName, numPuts, site1SenderId, false); @@ -561,15 +572,31 @@ public void testEventProcessingMixedSiteOneCurrentSiteTwo() throws Exception { private void startLocator(int port, int distributedSystemId, String locators, String remoteLocators) throws IOException { - Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, - String.valueOf(distributedSystemId)); - props.setProperty(DistributionConfig.LOCATORS_NAME, locators); - props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, remoteLocators); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, DUnitLauncher.logLevel); - props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false"); + Properties props = getLocatorProperties(distributedSystemId, locators, remoteLocators); + Locator.startLocatorAndDS(port, null, props); + } + + private int startLocatorWithJmxManager(int port, int distributedSystemId, String locators, + String remoteLocators) throws IOException { + Properties props = getLocatorProperties(distributedSystemId, locators, remoteLocators); + int jmxPort = AvailablePortHelper.getRandomAvailableTCPPort(); + props.put(JMX_MANAGER_PORT, String.valueOf(jmxPort)); + props.put(JMX_MANAGER, "true"); + props.put(JMX_MANAGER_START, "true"); Locator.startLocatorAndDS(port, null, props); + return jmxPort; + } + + private Properties getLocatorProperties(int distributedSystemId, String locators, + String remoteLocators) { + Properties props = new Properties(); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, String.valueOf(distributedSystemId)); + props.setProperty(LOCATORS, locators); + props.setProperty(REMOTE_LOCATORS, remoteLocators); + props.setProperty(LOG_LEVEL, DUnitLauncher.logLevel); + props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false"); + return props; } private void stopLocator() throws Exception { @@ -707,11 +734,92 @@ public void testVerifyGatewayReceiverDoesNotSendRemoveCacheServerProfileToMember } } + @Test + public void testCreateGatewaySenderMixedSiteOneCurrentSiteTwo() throws Exception { + final Host host = Host.getHost(0); + + // Get mixed site members + VM site1Locator = host.getVM(oldVersion, 0); + VM site1Server1 = host.getVM(oldVersion, 1); + VM site1Server2 = host.getVM(oldVersion, 2); + + // Get current site members + VM site2Locator = host.getVM(VersionManager.CURRENT_VERSION, 4); + VM site2Server1 = host.getVM(VersionManager.CURRENT_VERSION, 5); + VM site2Server2 = host.getVM(VersionManager.CURRENT_VERSION, 6); + + // Get mixed site locator properties + String hostName = NetworkUtils.getServerHostName(host); + final int site1LocatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); + DistributedTestUtils.deleteLocatorStateFile(site1LocatorPort); + final String site1Locators = hostName + "[" + site1LocatorPort + "]"; + final int site1DistributedSystemId = 0; + + // Get current site locator properties + final int site2LocatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET); + DistributedTestUtils.deleteLocatorStateFile(site2LocatorPort); + final String site2Locators = hostName + "[" + site2LocatorPort + "]"; + final int site2DistributedSystemId = 1; + + // Start mixed site locator + site1Locator.invoke(() -> startLocator(site1LocatorPort, site1DistributedSystemId, + site1Locators, site2Locators)); + + // Locators before 1.4 handled configuration asynchronously. + // We must wait for configuration configuration to be ready, or confirm that it is disabled. + site1Locator.invoke( + () -> Awaitility.await().atMost(65, TimeUnit.SECONDS).pollInterval(1, TimeUnit.SECONDS) + .until(() -> assertTrue( + !InternalLocator.getLocator().getConfig().getEnableClusterConfiguration() + || InternalLocator.getLocator().isSharedConfigurationRunning()))); + + // Start current site locator + site2Locator.invoke(() -> startLocator(site2LocatorPort, site2DistributedSystemId, + site2Locators, site1Locators)); + + // Start current site servers with receivers + site2Server1.invoke(() -> createCache(site2Locators)); + site2Server1.invoke(() -> createGatewayReceiver()); + site2Server2.invoke(() -> createCache(site2Locators)); + site2Server2.invoke(() -> createGatewayReceiver()); + + // Start mixed site servers + site1Server1.invoke(() -> createCache(site1Locators)); + site1Server2.invoke(() -> createCache(site1Locators)); + + // Roll mixed site locator to current with jmx manager + site1Locator.invoke(() -> stopLocator()); + VM site1RolledLocator = host.getVM(VersionManager.CURRENT_VERSION, site1Locator.getId()); + int jmxManagerPort = + site1RolledLocator.invoke(() -> startLocatorWithJmxManager(site1LocatorPort, + site1DistributedSystemId, site1Locators, site2Locators)); + + // Roll one mixed site server to current + site1Server2.invoke(() -> closeCache()); + VM site1Server2RolledServer = host.getVM(VersionManager.CURRENT_VERSION, site1Server2.getId()); + site1Server2RolledServer.invoke(() -> createCache(site1Locators)); + + // Use gfsh to attempt to create a gateway sender in the mixed site servers + this.gfsh.connectAndVerify(jmxManagerPort, GfshCommandRule.PortType.jmxManager); + this.gfsh + .executeAndAssertThat(getCreateGatewaySenderCommand("toSite2", site2DistributedSystemId)) + .statusIsError() + .containsOutput(CliStrings.CREATE_GATEWAYSENDER__MSG__CAN_NOT_CREATE_DIFFERENT_VERSIONS); + } + + private String getCreateGatewaySenderCommand(String id, int remoteDsId) { + CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_GATEWAYSENDER); + csb.addOption(CliStrings.CREATE_GATEWAYSENDER__ID, id); + csb.addOption(CliStrings.CREATE_GATEWAYSENDER__REMOTEDISTRIBUTEDSYSTEMID, + String.valueOf(remoteDsId)); + return csb.toString(); + } + private void createCache(String locators) { Properties props = new Properties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, locators); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, DUnitLauncher.logLevel); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, locators); + props.setProperty(LOG_LEVEL, DUnitLauncher.logLevel); getCache(props); } diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java index 993133cfc2d8..226595b0bef0 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java @@ -36,6 +36,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATORS; import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR; import static org.apache.geode.test.dunit.Host.getHost; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -3295,54 +3296,35 @@ public static void waitForConcurrentSerialSenderQueueToDrain(String senderId) { * @param senderId */ public static void verifySenderPausedState(String senderId) { - Set senders = cache.getGatewaySenders(); - GatewaySender sender = null; - for (GatewaySender s : senders) { - if (s.getId().equals(senderId)) { - sender = s; - break; - } - } + GatewaySender sender = cache.getGatewaySender(senderId); assertTrue(sender.isPaused()); } public static void verifySenderResumedState(String senderId) { - Set senders = cache.getGatewaySenders(); - GatewaySender sender = null; - for (GatewaySender s : senders) { - if (s.getId().equals(senderId)) { - sender = s; - break; - } - } + GatewaySender sender = cache.getGatewaySender(senderId); assertFalse(sender.isPaused()); assertTrue(sender.isRunning()); } public static void verifySenderStoppedState(String senderId) { - Set senders = cache.getGatewaySenders(); - GatewaySender sender = null; - for (GatewaySender s : senders) { - if (s.getId().equals(senderId)) { - sender = s; - break; - } - } + GatewaySender sender = cache.getGatewaySender(senderId); assertFalse(sender.isRunning()); } public static void verifySenderRunningState(String senderId) { - Set senders = cache.getGatewaySenders(); - GatewaySender sender = null; - for (GatewaySender s : senders) { - if (s.getId().equals(senderId)) { - sender = s; - break; - } - } + GatewaySender sender = cache.getGatewaySender(senderId); assertTrue(sender.isRunning()); } + public static void verifySenderConnectedState(String senderId, boolean shouldBeConnected) { + AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId); + if (shouldBeConnected) { + assertThat(sender.getEventProcessor().getDispatcher().isConnectedToRemote()).isTrue(); + } else { + assertThat(sender.getEventProcessor().getDispatcher().isConnectedToRemote()).isFalse(); + } + } + public static void verifyPool(String senderId, boolean poolShouldExist, int expectedPoolLocatorsSize) { AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId); diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java index 6d77fbb037c6..4f183632830f 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java @@ -223,15 +223,14 @@ public void testWanAuthInvalidCredentials() { () -> WANTestBase.createReplicatedRegion(getTestMethodName() + "_RR", null, isOffHeap())); logger.info("Created RR in vm3"); - try { - vm2.invoke(() -> WANTestBase.startSender("ln")); - fail( - "Authentication Failed: While starting the sender, an exception should have been thrown"); - } catch (Exception e) { - if (!(e.getCause().getCause() instanceof AuthenticationFailedException)) { - fail("Authentication is not working as expected", e); - } - } + // Start sender + vm2.invoke(() -> WANTestBase.startSender("ln")); + + // Verify the sender is started + vm2.invoke(() -> verifySenderRunningState("ln")); + + // Verify the sender is not connected + vm2.invoke(() -> verifySenderConnectedState("ln", false)); } /** @@ -258,28 +257,61 @@ public void testWanSecurityManagerWithInvalidCredentials() { vm3.invoke(() -> NewWanAuthenticationDUnitTest.createSecuredCache(props2, null, nyPort)); logger.info("Created secured cache in vm3"); - vm2.invoke(() -> WANTestBase.createSender("ln", 2, false, 100, 10, false, false, null, true)); + String senderId = "ln"; + vm2.invoke( + () -> WANTestBase.createSender(senderId, 2, false, 100, 10, false, false, null, true)); logger.info("Created sender in vm2"); vm3.invoke(() -> createReceiverInSecuredCache()); logger.info("Created receiver in vm3"); - vm2.invoke( - () -> WANTestBase.createReplicatedRegion(getTestMethodName() + "_RR", "ln", isOffHeap())); + String regionName = getTestMethodName() + "_RR"; + vm2.invoke(() -> WANTestBase.createReplicatedRegion(regionName, senderId, isOffHeap())); logger.info("Created RR in vm2"); - vm3.invoke( - () -> WANTestBase.createReplicatedRegion(getTestMethodName() + "_RR", null, isOffHeap())); + vm3.invoke(() -> WANTestBase.createReplicatedRegion(regionName, null, isOffHeap())); logger.info("Created RR in vm3"); - try { - vm2.invoke(() -> WANTestBase.startSender("ln")); - fail( - "Authentication Failed: While starting the sender, an exception should have been thrown"); - } catch (Exception e) { - if (!(e.getCause().getCause() instanceof AuthenticationFailedException)) { - fail("Authentication is not working as expected", e); - } - } + // Start sender + vm2.invoke(() -> WANTestBase.startSender(senderId)); + + // Verify the sender is started + vm2.invoke(() -> verifySenderRunningState(senderId)); + + // Verify the sender is not connected + vm2.invoke(() -> verifySenderConnectedState(senderId, false)); + + // Do some puts in the sender + int numPuts = 10; + vm2.invoke(() -> WANTestBase.doPuts(regionName, numPuts)); + + // Verify the sender is still started + vm2.invoke(() -> verifySenderRunningState(senderId)); + + // Verify the sender is still not connected + vm2.invoke(() -> verifySenderConnectedState(senderId, false)); + + // Verify the sender queue size + vm2.invoke(() -> testQueueSize(senderId, numPuts)); + + // Stop the receiver + vm3.invoke(() -> closeCache()); + + // Restart the receiver with a SecurityManager that accepts the existing sender's username and + // password. The + // NewWanAuthenticationDUnitTest.testWanSecurityManagerWithInvalidCredentials.security.json. + // file contains the admin user definition that the SecurityManager will accept. + String securityJsonRersource = "org/apache/geode/internal/cache/wan/misc/" + + getClass().getSimpleName() + "." + getTestMethodName() + ".security.json"; + Properties propsRestart = buildSecurityProperties("guest", "guest", securityJsonRersource); + vm3.invoke(() -> createSecuredCache(propsRestart, null, nyPort)); + vm3.invoke(() -> createReplicatedRegion(regionName, null, isOffHeap())); + vm3.invoke(() -> createReceiverInSecuredCache()); + + // Wait for the queue to drain + vm2.invoke(() -> checkQueueSize(senderId, 0)); + + // Verify region size on receiver + vm3.invoke(() -> validateRegionSize(regionName, numPuts)); } private static Properties buildProperties(String clientauthenticator, String clientAuthInit, @@ -304,9 +336,15 @@ private static Properties buildProperties(String clientauthenticator, String cli } private static Properties buildSecurityProperties(String username, String password) { + return buildSecurityProperties(username, password, + "org/apache/geode/security/templates/security.json"); + } + + private static Properties buildSecurityProperties(String username, String password, + String securityJsonResource) { Properties props = new Properties(); props.put(SECURITY_MANAGER, TestSecurityManager.class.getName()); - props.put("security-json", "org/apache/geode/security/templates/security.json"); + props.put("security-json", securityJsonResource); props.put(SECURITY_CLIENT_AUTH_INIT, UserPasswdAI.class.getName()); props.put("security-username", username); props.put("security-password", password); diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java index 8f3d53f30b91..a1976b16291f 100644 --- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java +++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/misc/WANSSLDUnitTest.java @@ -21,13 +21,11 @@ import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.wan.WANTestBase; +import org.apache.geode.internal.net.SocketCreatorFactory; import org.apache.geode.test.dunit.IgnoredException; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; -import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; -import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.categories.WanTest; @Category({DistributedTest.class, WanTest.class}) @@ -66,31 +64,58 @@ public void testSenderNoSSLReceiverSSL() { IgnoredException.addIgnoredException("Unexpected IOException"); IgnoredException.addIgnoredException("SSL Error"); IgnoredException.addIgnoredException("Unrecognized SSL message"); - try { - Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1)); - Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort)); - vm2.invoke(() -> WANTestBase.createReceiverWithSSL(nyPort)); + Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1)); + Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort)); - vm4.invoke(() -> WANTestBase.createCache(lnPort)); + vm2.invoke(() -> WANTestBase.createReceiverWithSSL(nyPort)); - vm4.invoke(() -> WANTestBase.createSender("ln", 2, false, 100, 10, false, false, null, true)); + vm4.invoke(() -> WANTestBase.createCache(lnPort)); - vm2.invoke( - () -> WANTestBase.createReplicatedRegion(getTestMethodName() + "_RR", null, isOffHeap())); + String senderId = "ln"; + vm4.invoke( + () -> WANTestBase.createSender(senderId, 2, false, 100, 10, false, false, null, true)); - vm4.invoke(() -> WANTestBase.startSender("ln")); + String regionName = getTestMethodName() + "_RR"; + vm2.invoke(() -> WANTestBase.createReplicatedRegion(regionName, null, isOffHeap())); - vm4.invoke( - () -> WANTestBase.createReplicatedRegion(getTestMethodName() + "_RR", "ln", isOffHeap())); + vm4.invoke(() -> WANTestBase.startSender(senderId)); - vm4.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000)); + // Verify the sender is started + vm4.invoke(() -> verifySenderRunningState(senderId)); - vm2.invoke(() -> WANTestBase.validateRegionSize(getTestMethodName() + "_RR", 1000)); - fail("Expected exception as only Receiver is SSL enabled. Not Sender"); - } catch (Exception e) { - assertTrue(e.getCause().getMessage().contains("Server expecting SSL connection")); - } + // Verify the sender is not connected + vm4.invoke(() -> verifySenderConnectedState(senderId, false)); + + vm4.invoke(() -> WANTestBase.createReplicatedRegion(regionName, "ln", isOffHeap())); + + // Do some puts in the sender + int numPuts = 10; + vm4.invoke(() -> WANTestBase.doPuts(regionName, numPuts)); + + // Verify the sender is still started + vm4.invoke(() -> verifySenderRunningState(senderId)); + + // Verify the sender is still not connected + vm4.invoke(() -> verifySenderConnectedState(senderId, false)); + + // Verify the sender queue size + vm4.invoke(() -> testQueueSize(senderId, numPuts)); + + // Stop the receiver + vm2.invoke(() -> closeCache()); + vm2.invoke(() -> closeSocketCreatorFactory()); + + // Restart the receiver with SSL disabled + createCacheInVMs(nyPort, vm2); + vm2.invoke(() -> createReplicatedRegion(regionName, null, isOffHeap())); + vm2.invoke(() -> createReceiver()); + + // Wait for the queue to drain + vm4.invoke(() -> checkQueueSize(senderId, 0)); + + // Verify region size on receiver + vm2.invoke(() -> validateRegionSize(regionName, numPuts)); } @Test @@ -144,4 +169,8 @@ public String description() { } return false; } + + private void closeSocketCreatorFactory() { + SocketCreatorFactory.close(); + } } diff --git a/geode-wan/src/test/resources/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.testWanSecurityManagerWithInvalidCredentials.security.json b/geode-wan/src/test/resources/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.testWanSecurityManagerWithInvalidCredentials.security.json new file mode 100644 index 000000000000..8fa76d8226b7 --- /dev/null +++ b/geode-wan/src/test/resources/org/apache/geode/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.testWanSecurityManagerWithInvalidCredentials.security.json @@ -0,0 +1,18 @@ +{ + "roles": [ + { + "name": "admin", + "operationsAllowed": [ + "CLUSTER:MANAGE", + "DATA:MANAGE" + ] + } + ], + "users": [ + { + "name": "admin", + "password": "wrongPswd", + "roles": ["admin"] + } + ] +} From 9104dac54a1d18f9b385569c3b309dd7ba16456f Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Wed, 21 Mar 2018 16:54:38 -0700 Subject: [PATCH 02/15] GEODE-4859: Preparing GfshCommand to be public interface (#1647) * GfshCommand class to return Cache instead of InternalCache * Exposed authorize methods to delegate to underlying security service. Signed-off-by: Jens Deppe --- .../internal/cli/AlterConnectionCommand.java | 2 +- .../internal/cli/AlterMappingCommand.java | 2 +- .../internal/cli/CreateConnectionCommand.java | 2 +- .../internal/cli/CreateMappingCommand.java | 2 +- .../cli/DestroyConnectionCommand.java | 2 +- .../internal/cli/DestroyMappingCommand.java | 2 +- .../management/internal/cli/CliUtil.java | 4 +- .../commands/AlterAsyncEventQueueCommand.java | 2 +- .../cli/commands/AlterRegionCommand.java | 7 ++-- .../commands/AlterRuntimeConfigCommand.java | 2 +- .../cli/commands/BackupDiskStoreCommand.java | 6 +-- .../cli/commands/ChangeLogLevelCommand.java | 4 +- .../cli/commands/CompactDiskStoreCommand.java | 5 +-- .../cli/commands/ConfigurePDXCommand.java | 2 +- .../CreateAsyncEventQueueCommand.java | 6 +-- .../commands/CreateDefinedIndexesCommand.java | 2 +- .../cli/commands/CreateDiskStoreCommand.java | 2 +- .../CreateGatewayReceiverCommand.java | 4 +- .../commands/CreateGatewaySenderCommand.java | 4 +- .../cli/commands/CreateIndexCommand.java | 2 +- .../commands/CreateJndiBindingCommand.java | 2 +- .../cli/commands/CreateRegionCommand.java | 22 +++++------ .../internal/cli/commands/DeployCommand.java | 2 +- .../cli/commands/DescribeClientCommand.java | 4 +- .../cli/commands/DescribeRegionCommand.java | 2 - .../DestroyAsyncEventQueueCommand.java | 2 +- .../cli/commands/DestroyDiskStoreCommand.java | 2 +- .../cli/commands/DestroyFunctionCommand.java | 7 ++-- .../commands/DestroyGatewaySenderCommand.java | 4 +- .../cli/commands/DestroyIndexCommand.java | 2 +- .../commands/DestroyJndiBindingCommand.java | 2 +- .../cli/commands/DestroyRegionCommand.java | 2 +- .../cli/commands/ExecuteFunctionCommand.java | 2 +- .../cli/commands/ExportDataCommand.java | 2 +- .../cli/commands/ExportLogsCommand.java | 2 +- .../cli/commands/ExportStackTraceCommand.java | 3 +- .../internal/cli/commands/GCCommand.java | 3 +- .../internal/cli/commands/GetCommand.java | 10 +++-- .../internal/cli/commands/GfshCommand.java | 37 ++++++++++++++----- .../cli/commands/ImportDataCommand.java | 2 +- .../cli/commands/ListClientCommand.java | 4 +- .../cli/commands/ListDiskStoresCommand.java | 4 +- .../cli/commands/ListGatewayCommand.java | 6 +-- .../cli/commands/ListJndiBindingCommand.java | 2 +- .../LoadBalanceGatewaySenderCommand.java | 8 ++-- .../cli/commands/LocateEntryCommand.java | 2 +- .../commands/PauseGatewaySenderCommand.java | 8 ++-- .../internal/cli/commands/PutCommand.java | 7 ++-- .../internal/cli/commands/QueryCommand.java | 9 +++-- .../cli/commands/RebalanceCommand.java | 4 +- .../internal/cli/commands/RemoveCommand.java | 10 +++-- .../commands/ResumeGatewaySenderCommand.java | 8 ++-- .../cli/commands/ShowDeadlockCommand.java | 3 -- .../internal/cli/commands/ShowLogCommand.java | 15 +++----- .../cli/commands/ShowMetricsCommand.java | 13 ++----- .../commands/ShowMissingDiskStoreCommand.java | 4 +- .../cli/commands/ShutdownCommand.java | 2 +- .../commands/StartGatewayReceiverCommand.java | 6 +-- .../commands/StartGatewaySenderCommand.java | 8 ++-- .../StatusClusterConfigServiceCommand.java | 2 +- .../StatusGatewayReceiverCommand.java | 6 +-- .../commands/StatusGatewaySenderCommand.java | 8 ++-- .../commands/StopGatewayReceiverCommand.java | 6 +-- .../commands/StopGatewaySenderCommand.java | 5 +-- .../cli/commands/UndeployCommand.java | 2 +- .../AlterAsyncEventQueueCommandTest.java | 4 +- .../cli/commands/ConfigurePDXCommandTest.java | 2 +- .../CreateAsyncEventQueueCommandTest.java | 4 +- .../CreateDefinedIndexesCommandTest.java | 6 +-- .../CreateGatewayReceiverCommandTest.java | 8 ++-- .../CreateGatewaySenderCommandTest.java | 8 ++-- .../CreateJndiBindingCommandTest.java | 16 ++++---- .../cli/commands/CreateRegionCommandTest.java | 2 +- .../DestroyGatewaySenderCommandTest.java | 8 ++-- .../DestroyJndiBindingCommandTest.java | 6 +-- .../commands/DestroyRegionCommandTest.java | 2 +- .../commands/DiskStoreCommandsJUnitTest.java | 5 ++- .../cli/commands/GfshCommandJUnitTest.java | 4 +- .../commands/ListIndexCommandJUnitTest.java | 3 +- .../cli/commands/ShowLogCommandDUnitTest.java | 8 ++-- .../internal/cli/LuceneIndexCommands.java | 19 +++++----- .../cli/LuceneIndexCommandsJUnitTest.java | 9 +---- 82 files changed, 210 insertions(+), 234 deletions(-) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java index b86e2d8673cf..f4713cf89cb0 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java @@ -136,7 +136,7 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, null)); + () -> getConfigurationService().addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java index 80713868a83c..8735c928c0c9 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java @@ -145,7 +145,7 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, null)); + () -> getConfigurationService().addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java index 93e8cf9f05be..032606aedaab 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java @@ -143,7 +143,7 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, null)); + () -> getConfigurationService().addXmlEntity(xmlEntity, null)); } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java index 86037bddb66e..6ea3c982c7bb 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java @@ -146,7 +146,7 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, null)); + () -> getConfigurationService().addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java index 021d82e15e43..b96214e8cfbd 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java @@ -107,7 +107,7 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, null)); + () -> getConfigurationService().addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java index 9882dd1a8ca4..f3b1e99fc897 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java @@ -104,7 +104,7 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, null)); + () -> getConfigurationService().addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java index a40637813af3..7403ce20f189 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java @@ -179,8 +179,8 @@ public static String getMemberNameOrId(DistributedMember distributedMember) { */ @SuppressWarnings("unchecked") public static Set getAllNormalMembers(InternalCache cache) { - return new HashSet(cache.getInternalDistributedSystem() - .getDistributionManager().getNormalDistributionManagerIds()); + return new HashSet( + cache.getDistributionManager().getNormalDistributionManagerIds()); } /** diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java index c1f5a5a0e2dc..5a4af4bc165f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java @@ -85,7 +85,7 @@ public Result execute(@CliOption(key = ID, mandatory = true, help = ID_HELP) Str // need not check if any running servers has this async-event-queue. A server with this queue id // may be shutdown, but we still need to update Cluster Configuration. - InternalClusterConfigurationService service = getSharedConfiguration(); + InternalClusterConfigurationService service = getConfigurationService(); if (service == null) { return ResultBuilder.createUserErrorResult("Cluster Configuration Service is not available. " diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java index 2ec5e503c18a..1cc4e30cd07f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java @@ -91,9 +91,10 @@ public Result alterRegion( @CliOption(key = CliStrings.ALTER_REGION__EVICTIONMAX, specifiedDefaultValue = "0", help = CliStrings.ALTER_REGION__EVICTIONMAX__HELP) Integer evictionMax) { Result result; - getSecurityService().authorize(Resource.DATA, Operation.MANAGE, regionPath); - InternalCache cache = getCache(); + authorize(Resource.DATA, Operation.MANAGE, regionPath); + + InternalCache cache = (InternalCache) getCache(); if (groups != null) { RegionCommandsUtils.validateGroups(cache, groups); @@ -136,7 +137,7 @@ public Result alterRegion( XmlEntity xmlEntity = findXmlEntity(regionAlterResults); if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, groups)); + () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java index aa001833588d..372cbdb39552 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java @@ -216,7 +216,7 @@ public Result alterRuntimeConfig( final XmlEntity xmlEntity = XmlEntity.builder().withType(CacheXml.CACHE) .withAttributes(rumTimeCacheAttributes).build(); persistClusterConfiguration(result, - () -> getSharedConfiguration().modifyXmlAndProperties(properties, xmlEntity, group)); + () -> getConfigurationService().modifyXmlAndProperties(properties, xmlEntity, group)); return result; } else { StringBuilder errorMessageBuilder = new StringBuilder(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java index 22cd4d7feef0..b5bd50fe147a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java @@ -51,11 +51,11 @@ public Result backupDiskStore( @CliOption(key = CliStrings.BACKUP_DISK_STORE__BASELINEDIR, help = CliStrings.BACKUP_DISK_STORE__BASELINEDIR__HELP) String baselineDir) { - getSecurityService().authorize(ResourcePermission.Resource.CLUSTER, - ResourcePermission.Operation.WRITE, ResourcePermission.Target.DISK); + authorize(ResourcePermission.Resource.CLUSTER, ResourcePermission.Operation.WRITE, + ResourcePermission.Target.DISK); Result result; try { - InternalCache cache = getCache(); + InternalCache cache = (InternalCache) getCache(); DistributionManager dm = cache.getDistributionManager(); BackupStatus backupStatus; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java index aeeb2da53edb..7efec84e04c6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java @@ -25,11 +25,11 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.logging.log4j.LogLevel; import org.apache.geode.management.cli.CliMetaData; @@ -67,7 +67,7 @@ public Result changeLogLevel( .createUserErrorResult(CliStrings.CHANGE_LOGLEVEL__MSG__SPECIFY_GRP_OR_MEMBER); } - InternalCache cache = getCache(); + Cache cache = getCache(); Set dsMembers = new HashSet<>(); Set ds = getAllMembers(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java index a7b381e11075..f9425179e5e5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java @@ -65,7 +65,7 @@ public Result compactDiskStore( CliStrings.format(CliStrings.COMPACT_DISK_STORE__DISKSTORE_0_DOES_NOT_EXIST, new Object[] {diskStoreName})); } else { - InternalDistributedSystem ds = getCache().getInternalDistributedSystem(); + InternalDistributedSystem ds = ((InternalCache) getCache()).getInternalDistributedSystem(); Map overallCompactInfo = new HashMap<>(); @@ -167,8 +167,7 @@ public Result compactDiskStore( } private boolean diskStoreExists(String diskStoreName) { - InternalCache cache = getCache(); - ManagementService managementService = ManagementService.getExistingManagementService(cache); + ManagementService managementService = getManagementService(); DistributedSystemMXBean dsMXBean = managementService.getDistributedSystemMXBean(); Map diskstore = dsMXBean.listMemberDiskstore(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java index 1868c15f714d..2c534a909753 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java @@ -151,7 +151,7 @@ public Result configurePDX( XmlEntity xmlEntity = createXmlEntity(cache); result = ResultBuilder.buildResult(ird); persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, null)); + () -> getConfigurationService().addXmlEntity(xmlEntity, null)); return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java index bf560aaa7f01..a7dc2f004700 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java @@ -89,8 +89,8 @@ public Result createAsyncEventQueue( help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE__HELP) String[] listenerParamsAndValues) { if (persistent) { - getSecurityService().authorize(ResourcePermission.Resource.CLUSTER, - ResourcePermission.Operation.WRITE, ResourcePermission.Target.DISK); + authorize(ResourcePermission.Resource.CLUSTER, ResourcePermission.Operation.WRITE, + ResourcePermission.Target.DISK); } Properties listenerProperties = new Properties(); @@ -124,7 +124,7 @@ public Result createAsyncEventQueue( XmlEntity xmlEntity = findXmlEntity(results); if (xmlEntity != null) { persistClusterConfiguration(commandResult, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, groups)); + () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); } return commandResult; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java index db3bbfee63b8..5aa829bda5d2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java @@ -153,7 +153,7 @@ public Result createDefinedIndexes( for (XmlEntity xmlEntity : xmlEntities) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, group)); + () -> getConfigurationService().addXmlEntity(xmlEntity, group)); } return result; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java index 46d81ef06609..cdd87798ddb0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java @@ -119,7 +119,7 @@ public Result createDiskStore( if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, groups)); + () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); } return result; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java index d03f953e0252..239dac3b49e5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java @@ -96,13 +96,13 @@ public Result createGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliStrin } // has xml but unable to persist to cluster config, need to print warning message and return - if (onMember != null || getSharedConfiguration() == null) { + if (onMember != null || getConfigurationService() == null) { result.setCommandPersisted(false); return result; } // update cluster config - getSharedConfiguration().addXmlEntity(xmlEntity, onGroups); + getConfigurationService().addXmlEntity(xmlEntity, onGroups); return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java index b132852d1030..175f78282473 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java @@ -137,13 +137,13 @@ public Result createGatewaySender(@CliOption(key = {CliStrings.GROUP, CliStrings } // has xml but unable to persist to cluster config, need to print warning message and return - if (onMember != null || getSharedConfiguration() == null) { + if (onMember != null || getConfigurationService() == null) { result.setCommandPersisted(false); return result; } // update cluster config - getSharedConfiguration().addXmlEntity(xmlEntity, onGroups); + getConfigurationService().addXmlEntity(xmlEntity, onGroups); return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java index 0ea1ac313b1c..112aed6b2169 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java @@ -80,7 +80,7 @@ public Result createIndex(@CliOption(key = CliStrings.CREATE_INDEX__NAME, mandat if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, group)); + () -> getConfigurationService().addXmlEntity(xmlEntity, group)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java index 00220a19a561..b525a70b3f1c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java @@ -147,7 +147,7 @@ public Result createJDNIBinding( Result result; boolean persisted = false; - InternalClusterConfigurationService service = getSharedConfiguration(); + InternalClusterConfigurationService service = getConfigurationService(); if (service != null) { CacheConfig cacheConfig = service.getCacheConfig("cluster"); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java index ea4f5e5f0c31..b88b389c0b17 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java @@ -193,7 +193,7 @@ public Result createRegion( CliStrings.CREATE_REGION__MSG__ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUTESFROM_IS_REQUIRED); } - InternalCache cache = getCache(); + InternalCache cache = (InternalCache) getCache(); /* * Adding name collision check for regions created with regionShortcut only. @@ -351,11 +351,11 @@ public Result createRegion( functionArgs.setValueConstraint(valueConstraint); } - DistributedSystemMXBean dsMBean = getDSMBean(cache); + DistributedSystemMXBean dsMBean = getDSMBean(); // validating colocation if (functionArgs.hasPartitionAttributes()) { if (prColocatedWith != null) { - ManagementService mgmtService = ManagementService.getExistingManagementService(cache); + ManagementService mgmtService = getManagementService(); DistributedRegionMXBean distributedRegionMXBean = mgmtService.getDistributedRegionMXBean(prColocatedWith); if (distributedRegionMXBean == null) { @@ -417,8 +417,8 @@ public Result createRegion( if ((functionArgs.getRegionShortcut() != null && functionArgs.getRegionShortcut().isPersistent()) || isAttributePersistent(functionArgs.getRegionAttributes())) { - getSecurityService().authorize(ResourcePermission.Resource.CLUSTER, - ResourcePermission.Operation.WRITE, ResourcePermission.Target.DISK); + authorize(ResourcePermission.Resource.CLUSTER, ResourcePermission.Operation.WRITE, + ResourcePermission.Target.DISK); } // validating the groups @@ -441,7 +441,7 @@ public Result createRegion( if (xmlEntity != null) { verifyDistributedRegionMbean(cache, regionPath); persistClusterConfiguration(result, - () -> getSharedConfiguration().addXmlEntity(xmlEntity, groups)); + () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); } return result; } @@ -522,7 +522,7 @@ RegionAttributesWrapper getRegionAttributes(InternalCache cache, String regionPa } private boolean isClusterWideSameConfig(InternalCache cache, String regionPath) { - ManagementService managementService = ManagementService.getExistingManagementService(cache); + ManagementService managementService = getManagementService(); DistributedSystemMXBean dsMXBean = managementService.getDistributedSystemMXBean(); @@ -559,7 +559,7 @@ boolean regionExists(InternalCache cache, String regionPath) { return false; } - ManagementService managementService = ManagementService.getExistingManagementService(cache); + ManagementService managementService = getManagementService(); DistributedSystemMXBean dsMBean = managementService.getDistributedSystemMXBean(); String[] allRegionPaths = dsMBean.listAllRegionPaths(); @@ -567,7 +567,7 @@ boolean regionExists(InternalCache cache, String regionPath) { } private boolean diskStoreExists(InternalCache cache, String diskStoreName) { - ManagementService managementService = ManagementService.getExistingManagementService(cache); + ManagementService managementService = getManagementService(); DistributedSystemMXBean dsMXBean = managementService.getDistributedSystemMXBean(); Map diskstore = dsMXBean.listMemberDiskstore(); @@ -588,8 +588,8 @@ private boolean isAttributePersistent(RegionAttributes attributes) { && attributes.getDataPolicy().toString().contains("PERSISTENT"); } - DistributedSystemMXBean getDSMBean(InternalCache cache) { - ManagementService managementService = ManagementService.getExistingManagementService(cache); + DistributedSystemMXBean getDSMBean() { + ManagementService managementService = getManagementService(); return managementService.getDistributedSystemMXBean(); } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java index f71fa64611dc..bd27aa8be873 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java @@ -136,7 +136,7 @@ public Result deploy( } Result result = ResultBuilder.buildResult(tabularData); - InternalClusterConfigurationService sc = getSharedConfiguration(); + InternalClusterConfigurationService sc = getConfigurationService(); if (sc == null) { result.setCommandPersisted(false); } else { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java index 4ea2d48b67ab..71752a7dc357 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java @@ -28,7 +28,6 @@ import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.CacheServerMXBean; import org.apache.geode.management.ClientHealthStatus; import org.apache.geode.management.ManagementService; @@ -68,9 +67,8 @@ public Result describeClient(@CliOption(key = CliStrings.DESCRIBE_CLIENT__ID, ma CompositeResultData compositeResultData = ResultBuilder.createCompositeResultData(); CompositeResultData.SectionResultData sectionResult = compositeResultData.addSection("InfoSection"); - InternalCache cache = getCache(); - ManagementService service = ManagementService.getExistingManagementService(cache); + ManagementService service = getManagementService(); ObjectName[] cacheServers = service.getDistributedSystemMXBean().listCacheServerObjectNames(); if (cacheServers.length == 0) { return ResultBuilder.createGemFireErrorResult( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java index ce216d8ed58d..8111843ea284 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java @@ -28,7 +28,6 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.cache.execute.ResultCollector; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; @@ -101,7 +100,6 @@ private String descriptionGrouper(RegionDescriptionPerMember perTypeDesc) { } List getFunctionResultFromMembers(String regionName) { - InternalCache cache = getCache(); ResultCollector rc = executeFunction(getRegionDescription, regionName, getAllNormalMembers()); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java index f7699d2a1e62..dcd6a0fdfbf3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java @@ -72,7 +72,7 @@ public Result destroyAsyncEventQueue( XmlEntity xmlEntity = findXmlEntity(functionResults); if (xmlEntity != null) { persistClusterConfiguration(commandResult, - () -> getSharedConfiguration().deleteXmlEntity(xmlEntity, onGroups)); + () -> getConfigurationService().deleteXmlEntity(xmlEntity, onGroups)); } return commandResult; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java index 51888efb8031..f2a2b0709749 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java @@ -64,7 +64,7 @@ public Result destroyDiskStore( if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().deleteXmlEntity(xmlEntity, groups)); + () -> getConfigurationService().deleteXmlEntity(xmlEntity, groups)); } return result; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java index 6d79a8157390..3b612b0afc67 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java @@ -23,12 +23,12 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionException; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -57,7 +57,7 @@ public Result destroyFunction( @CliOption(key = CliStrings.MEMBER, optionContext = ConverterHint.MEMBERIDNAME, help = CliStrings.DESTROY_FUNCTION__ONMEMBER__HELP) String memberId) { try { - InternalCache cache = getCache(); + Cache cache = getCache(); Set dsMembers = new HashSet<>(); if (groups != null && memberId != null) { return ResultBuilder @@ -89,8 +89,7 @@ public Result destroyFunction( } } - private Result executeFunction(InternalCache cache, Set DsMembers, - String functionId) { + private Result executeFunction(Cache cache, Set DsMembers, String functionId) { // unregister on a set of of members Function unregisterFunction = new UnregisterFunction(); FunctionService.registerFunction(unregisterFunction); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java index 976efd594bb9..4f984cdb7be5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java @@ -75,13 +75,13 @@ public Result destroyGatewaySender( } // has xml but unable to persist to cluster config, need to print warning message and return - if (onMember != null || getSharedConfiguration() == null) { + if (onMember != null || getConfigurationService() == null) { result.setCommandPersisted(false); return result; } // update cluster config - getSharedConfiguration().deleteXmlEntity(xmlEntity, onGroups); + getConfigurationService().deleteXmlEntity(xmlEntity, onGroups); return result; } } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java index 676288a35189..3fbee0f74192 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java @@ -82,7 +82,7 @@ public Result destroyIndex( if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().deleteXmlEntity(xmlEntity, group)); + () -> getConfigurationService().deleteXmlEntity(xmlEntity, group)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java index f4800b467bd5..b65b0ef475c4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java @@ -55,7 +55,7 @@ public Result destroyJDNIBinding( Result result; boolean persisted = false; - InternalClusterConfigurationService service = getSharedConfiguration(); + InternalClusterConfigurationService service = getConfigurationService(); if (service != null) { service.updateCacheConfig("cluster", cc -> { List bindings = cc.getJndiBindings(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java index f1f729ef6396..868ffaab92c7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java @@ -70,7 +70,7 @@ public Result destroyRegion( // if at least one member returns with successful deletion, we will need to update cc if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getSharedConfiguration().deleteXmlEntity(xmlEntity, null)); + () -> getConfigurationService().deleteXmlEntity(xmlEntity, null)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java index 2f2302808994..ec720305acf6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java @@ -101,7 +101,7 @@ public Result executeFunction( } args[4] = onRegion; - Subject currentUser = getSecurityService().getSubject(); + Subject currentUser = getSubject(); if (currentUser != null) { args[5] = currentUser.getSession().getAttribute(CREDENTIALS_SESSION_ATTRIBUTE); } else { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java index 701f47b00019..651120694936 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java @@ -55,7 +55,7 @@ public Result exportData( specifiedDefaultValue = "true", help = CliStrings.EXPORT_DATA__PARALLEL_HELP) boolean parallel) { - getSecurityService().authorize(Resource.DATA, Operation.READ, regionName); + authorize(Resource.DATA, Operation.READ, regionName); final DistributedMember targetMember = getMember(memberNameOrId); Optional validationResult = validatePath(filePath, dirPath, parallel); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java index 5aeb85d19116..5634d3630757 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java @@ -101,7 +101,7 @@ public Result exportLogs( long totalEstimatedExportSize = 0; Result result; - InternalCache cache = getCache(); + InternalCache cache = (InternalCache) getCache(); try { Set targetMembers = getMembersIncludingLocators(groups, memberIds); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java index 6b95d9ab4250..88c63dada216 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java @@ -34,6 +34,7 @@ import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -98,7 +99,7 @@ public Result exportStackTrace(@CliOption(key = {CliStrings.MEMBER, CliStrings.M } } - InternalDistributedSystem ads = getCache().getInternalDistributedSystem(); + InternalDistributedSystem ads = ((InternalCache) getCache()).getInternalDistributedSystem(); String filePath = writeStacksToFile(dumps, fileName); resultData.addLine(CliStrings.format(CliStrings.EXPORT_STACKTRACE__SUCCESS, filePath)); resultData.addLine(CliStrings.EXPORT_STACKTRACE__HOST + ads.getDistributedMember().getHost()); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java index 3763929e0a9e..af392e0eca2e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java @@ -23,6 +23,7 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Function; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.cache.InternalCache; @@ -49,7 +50,7 @@ public Result gc( help = CliStrings.GC__GROUP__HELP) String[] groups, @CliOption(key = CliStrings.MEMBER, optionContext = ConverterHint.ALL_MEMBER_IDNAME, help = CliStrings.GC__MEMBER__HELP) String memberId) { - InternalCache cache = getCache(); + Cache cache = getCache(); Result result; CompositeResultData gcResultTable = ResultBuilder.createCompositeResultData(); TabularResultData resultTable = gcResultTable.addSection().addTable("Table1"); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java index b1f7d436a31f..16b3c2fcd6f3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java @@ -25,6 +25,7 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.cache.InternalCache; @@ -55,8 +56,8 @@ public Result get( specifiedDefaultValue = "true", help = CliStrings.GET__LOAD__HELP) Boolean loadOnCacheMiss) { - InternalCache cache = getCache(); - cache.getSecurityService().authorize(Resource.DATA, Operation.READ, regionPath, key); + Cache cache = getCache(); + authorize(Resource.DATA, Operation.READ, regionPath, key); DataCommandResult dataResult; @SuppressWarnings("rawtypes") @@ -72,7 +73,7 @@ public Result get( request.setRegionName(regionPath); request.setValueClass(valueClass); request.setLoadOnCacheMiss(loadOnCacheMiss); - Subject subject = cache.getSecurityService().getSubject(); + Subject subject = getSubject(); if (subject != null) { request.setPrincipal(subject.getPrincipal()); } @@ -83,7 +84,8 @@ public Result get( false); } } else { - dataResult = getfn.get(null, key, keyClass, valueClass, regionPath, loadOnCacheMiss, cache); + dataResult = getfn.get(null, key, keyClass, valueClass, regionPath, loadOnCacheMiss, + (InternalCache) cache); } dataResult.setKeyClass(keyClass); if (valueClass != null) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java index 2beeb7a893be..91fa157c9385 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java @@ -19,6 +19,7 @@ import java.util.Objects; import java.util.Set; +import org.apache.shiro.subject.Subject; import org.springframework.shell.core.CommandMarker; import org.apache.geode.cache.Cache; @@ -26,11 +27,11 @@ import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.distributed.ClusterConfigurationService; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.distributed.internal.InternalLocator; import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.internal.security.SecurityService; import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.CliUtil; @@ -39,6 +40,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.configuration.domain.XmlEntity; +import org.apache.geode.security.ResourcePermission; /** * Encapsulates common functionality for implementing command classes for the Geode shell (gfsh). @@ -55,7 +57,7 @@ public void setCache(Cache cache) { this.cache = (InternalCache) cache; } - public InternalCache getCache() { + public Cache getCache() { return cache; } @@ -65,7 +67,7 @@ public boolean isConnectedAndReady() { return getGfsh() != null && getGfsh().isConnectedAndReady(); } - public InternalClusterConfigurationService getSharedConfiguration() { + public InternalClusterConfigurationService getConfigurationService() { InternalLocator locator = InternalLocator.getLocator(); return locator == null ? null : locator.getSharedConfiguration(); } @@ -74,7 +76,7 @@ public void persistClusterConfiguration(Result result, Runnable runnable) { if (result == null) { throw new IllegalArgumentException("Result should not be null"); } - InternalClusterConfigurationService sc = getSharedConfiguration(); + InternalClusterConfigurationService sc = getConfigurationService(); if (sc == null) { result.setCommandPersisted(false); } else { @@ -96,8 +98,23 @@ public boolean isLogging() { return getGfsh() != null; } - public SecurityService getSecurityService() { - return getCache().getSecurityService(); + public void authorize(ResourcePermission.Resource resource, + ResourcePermission.Operation operation, ResourcePermission.Target target) { + cache.getSecurityService().authorize(resource, operation, target); + } + + public void authorize(ResourcePermission.Resource resource, + ResourcePermission.Operation operation, String target) { + cache.getSecurityService().authorize(resource, operation, target); + } + + public void authorize(ResourcePermission.Resource resource, + ResourcePermission.Operation operation, String target, String key) { + cache.getSecurityService().authorize(resource, operation, target, key); + } + + public Subject getSubject() { + return cache.getSecurityService().getSubject(); } public Gfsh getGfsh() { @@ -121,7 +138,7 @@ public DistributedMember getMember(final String memberName) { * this will return the member found or null if no member with that name */ public DistributedMember findMember(final String memberName) { - return CliUtil.getDistributedMemberByNameOrId(memberName, getCache()); + return CliUtil.getDistributedMemberByNameOrId(memberName, (InternalCache) getCache()); } /** @@ -146,7 +163,7 @@ public Execution getMembersFunctionExecutor(final Set members * if no members matches these names, an empty set would return, this does not include locators */ public Set findMembers(String[] groups, String[] members) { - return CliUtil.findMembers(groups, members, getCache()); + return CliUtil.findMembers(groups, members, (InternalCache) getCache()); } /** @@ -164,7 +181,7 @@ public Set getMembers(String[] groups, String[] members) { * if no members matches these names, an empty set would return */ public Set findMembersIncludingLocators(String[] groups, String[] members) { - return CliUtil.findMembersIncludingLocators(groups, members, getCache()); + return CliUtil.findMembersIncludingLocators(groups, members, (InternalCache) getCache()); } /** @@ -207,6 +224,6 @@ public List executeAndGetFunctionResult(Function function, Ob } public Set findMembersWithAsyncEventQueue(String queueId) { - return CliUtil.getMembersWithAsyncEventQueue(getCache(), queueId); + return CliUtil.getMembersWithAsyncEventQueue((InternalCache) getCache(), queueId); } } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java index 985f0dec46da..31e5c4dc79b3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java @@ -55,7 +55,7 @@ public Result importData( specifiedDefaultValue = "true", help = CliStrings.IMPORT_DATA__PARALLEL_HELP) boolean parallel) { - getSecurityService().authorize(Resource.DATA, Operation.WRITE, regionName); + authorize(Resource.DATA, Operation.WRITE, regionName); final DistributedMember targetMember = getMember(memberNameOrId); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java index d169faa7f701..b413aecc90a8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java @@ -24,7 +24,6 @@ import org.springframework.shell.core.annotation.CliCommand; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.CacheServerMXBean; import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; @@ -51,8 +50,7 @@ public Result listClient() throws Exception { String headerText = "ClientList"; resultTable = resultTable.setHeader(headerText); - InternalCache cache = getCache(); - ManagementService service = ManagementService.getExistingManagementService(cache); + ManagementService service = getManagementService(); ObjectName[] cacheServers = service.getDistributedSystemMXBean().listCacheServerObjectNames(); if (cacheServers.length == 0) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java index cdb6a94dee7a..ca0bbba1bbd7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java @@ -25,6 +25,7 @@ import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.execute.AbstractExecution; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; @@ -43,7 +44,8 @@ public class ListDiskStoresCommand extends GfshCommand { @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, operation = ResourcePermission.Operation.READ) public Result listDiskStores() { - Set dataMembers = DiskStoreCommandsUtils.getNormalMembers(getCache()); + Set dataMembers = + DiskStoreCommandsUtils.getNormalMembers((InternalCache) getCache()); if (dataMembers.isEmpty()) { return ResultBuilder.createInfoResult(CliStrings.NO_CACHING_MEMBERS_FOUND_MESSAGE); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java index 793a48ad4ee6..293746e43c02 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java @@ -25,11 +25,9 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.DistributedSystemMXBean; import org.apache.geode.management.GatewayReceiverMXBean; import org.apache.geode.management.GatewaySenderMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -57,9 +55,7 @@ public Result listGateway( throws Exception { Result result; - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + SystemManagementService service = (SystemManagementService) getManagementService(); Set dsMembers = findMembers(onGroup, onMember); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java index f7b775bb8150..ba4afd6b10c9 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java @@ -54,7 +54,7 @@ public Result listJndiBinding() { TabularResultData configTable = null; TabularResultData memberTable = null; - InternalClusterConfigurationService ccService = getSharedConfiguration(); + InternalClusterConfigurationService ccService = getConfigurationService(); if (ccService != null) { configTable = resultSection.addTable(); configTable.setHeader("Configured JNDI bindings: "); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java index cf14a7ba62bb..ed7b00038192 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java @@ -22,10 +22,9 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewaySenderMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -52,9 +51,8 @@ public Result loadBalanceGatewaySender(@CliOption(key = CliStrings.LOAD_BALANCE_ senderId = senderId.trim(); } - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + Cache cache = getCache(); + SystemManagementService service = (SystemManagementService) getManagementService(); TabularResultData resultData = ResultBuilder.createTabularResultData(); Set dsMembers = getAllNormalMembers(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java index 5ff5817e0cab..c1fe34300195 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java @@ -52,7 +52,7 @@ public Result locateEntry( help = CliStrings.LOCATE_ENTRY__RECURSIVE__HELP, specifiedDefaultValue = "true", unspecifiedDefaultValue = "false") boolean recursive) { - getSecurityService().authorize(Resource.DATA, Operation.READ, regionPath, key); + authorize(Resource.DATA, Operation.READ, regionPath, key); DataCommandResult dataResult; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java index ad17ba38188e..e3a28d0f01f9 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java @@ -22,10 +22,9 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewaySenderMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -59,9 +58,8 @@ public Result pauseGatewaySender(@CliOption(key = CliStrings.PAUSE_GATEWAYSENDER senderId = senderId.trim(); } - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + Cache cache = getCache(); + SystemManagementService service = (SystemManagementService) getManagementService(); GatewaySenderMXBean bean; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java index d792078d5b4d..1340618e5c53 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java @@ -24,6 +24,7 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.cache.InternalCache; @@ -58,8 +59,8 @@ public Result put( specifiedDefaultValue = "true", unspecifiedDefaultValue = "false") boolean putIfNotExists) { - InternalCache cache = getCache(); - cache.getSecurityService().authorize(Resource.DATA, Operation.WRITE, regionPath); + Cache cache = getCache(); + authorize(Resource.DATA, Operation.WRITE, regionPath); DataCommandResult dataResult; @SuppressWarnings("rawtypes") @@ -84,7 +85,7 @@ public Result put( } } else { dataResult = putfn.put(key, value, putIfNotExists || putIfAbsent, keyClass, valueClass, - regionPath, cache); + regionPath, (InternalCache) cache); } dataResult.setKeyClass(keyClass); if (valueClass != null) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java index 69d698591283..c57174d7327c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java @@ -27,6 +27,7 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.FunctionService; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.cache.query.QueryInvalidException; @@ -67,7 +68,7 @@ public Result query( } private DataCommandResult select(String query) { - InternalCache cache = getCache(); + Cache cache = getCache(); DataCommandResult dataResult; if (StringUtils.isEmpty(query)) { @@ -94,19 +95,19 @@ private DataCommandResult select(String query) { // authorize data read on these regions for (String region : regions) { - cache.getSecurityService().authorize(Resource.DATA, Operation.READ, region); + authorize(Resource.DATA, Operation.READ, region); } regionsInQuery = Collections.unmodifiableSet(regions); if (regionsInQuery.size() > 0) { Set members = - CliUtil.getQueryRegionsAssociatedMembers(regionsInQuery, cache, false); + CliUtil.getQueryRegionsAssociatedMembers(regionsInQuery, (InternalCache) cache, false); if (members != null && members.size() > 0) { DataCommandFunction function = new DataCommandFunction(); DataCommandRequest request = new DataCommandRequest(); request.setCommand(CliStrings.QUERY); request.setQuery(query); - Subject subject = cache.getSecurityService().getSubject(); + Subject subject = getSubject(); if (subject != null) { request.setPrincipal(subject.getPrincipal()); } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java index d5a66b0acb4f..7b643ca390b7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java @@ -81,8 +81,8 @@ public Result rebalance( List> commandResult = new ArrayList<>(); Result result; try { - commandResult.add(commandExecutors.submit( - new ExecuteRebalanceWithTimeout(includeRegions, excludeRegions, simulate, getCache()))); + commandResult.add(commandExecutors.submit(new ExecuteRebalanceWithTimeout(includeRegions, + excludeRegions, simulate, (InternalCache) getCache()))); Future fs = commandResult.get(0); if (timeout > 0) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java index 4f76684d6bb8..f7b972469b47 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java @@ -25,6 +25,7 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.Region; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.cache.InternalCache; @@ -53,16 +54,16 @@ public Result remove( specifiedDefaultValue = "true", unspecifiedDefaultValue = "false") boolean removeAllKeys, @CliOption(key = {CliStrings.REMOVE__KEYCLASS}, help = CliStrings.REMOVE__KEYCLASS__HELP) String keyClass) { - InternalCache cache = getCache(); + Cache cache = getCache(); if (!removeAllKeys && (key == null)) { return createUserErrorResult(CliStrings.REMOVE__MSG__KEY_EMPTY); } if (removeAllKeys) { - cache.getSecurityService().authorize(Resource.DATA, Operation.WRITE, regionPath); + authorize(Resource.DATA, Operation.WRITE, regionPath); } else { - cache.getSecurityService().authorize(Resource.DATA, Operation.WRITE, regionPath, key); + authorize(Resource.DATA, Operation.WRITE, regionPath, key); } Region region = cache.getRegion(regionPath); @@ -83,7 +84,8 @@ public Result remove( request.setRegionName(regionPath); dataResult = callFunctionForRegion(request, removefn, memberList); } else { - dataResult = removefn.remove(key, keyClass, regionPath, removeAllKeys ? "ALL" : null, cache); + dataResult = removefn.remove(key, keyClass, regionPath, removeAllKeys ? "ALL" : null, + (InternalCache) cache); } dataResult.setKeyClass(keyClass); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java index d95c7b83c9c2..991f77f85fae 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java @@ -22,10 +22,9 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewaySenderMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -58,9 +57,8 @@ public Result resumeGatewaySender(@CliOption(key = CliStrings.RESUME_GATEWAYSEND senderId = senderId.trim(); } - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + Cache cache = getCache(); + SystemManagementService service = (SystemManagementService) getManagementService(); GatewaySenderMXBean bean; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java index e06a59e2cfd1..7d4a4643f587 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java @@ -27,7 +27,6 @@ import org.apache.geode.distributed.internal.deadlock.Dependency; import org.apache.geode.distributed.internal.deadlock.DependencyGraph; import org.apache.geode.distributed.internal.deadlock.GemFireDeadlockDetector; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.i18n.CliStrings; @@ -51,8 +50,6 @@ public Result showDeadlock(@CliOption(key = CliStrings.SHOW_DEADLOCK__DEPENDENCI return ResultBuilder .createUserErrorResult(CliStrings.format(CliStrings.INVALID_FILE_EXTENSION, ".txt")); } - InternalCache cache = getCache(); - Set allMembers = getAllMembers(); GemFireDeadlockDetector gfeDeadLockDetector = new GemFireDeadlockDetector(allMembers); DependencyGraph dependencyGraph = gfeDeadLockDetector.find(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java index 838f49a9f2db..b42b3871d104 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java @@ -20,9 +20,8 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.MemberMXBean; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; @@ -46,11 +45,8 @@ public Result showLog( help = CliStrings.SHOW_LOG_MEMBER_HELP, mandatory = true) String memberNameOrId, @CliOption(key = CliStrings.SHOW_LOG_LINE_NUM, unspecifiedDefaultValue = "0", help = CliStrings.SHOW_LOG_LINE_NUM_HELP) int numberOfLines) { - Result result; - - InternalCache cache = getCache(); DistributedMember targetMember = getMember(memberNameOrId); - MemberMXBean targetMemberMXBean = getMemberMxBean(cache, targetMember); + MemberMXBean targetMemberMXBean = getMemberMxBean(targetMember); if (numberOfLines > ManagementConstants.MAX_SHOW_LOG_LINES) { numberOfLines = ManagementConstants.MAX_SHOW_LOG_LINES; @@ -76,11 +72,10 @@ public Result showLog( return ResultBuilder.buildResult(resultData); } - public MemberMXBean getMemberMxBean(InternalCache cache, DistributedMember targetMember) { - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + public MemberMXBean getMemberMxBean(DistributedMember targetMember) { + SystemManagementService service = (SystemManagementService) getManagementService(); - if (cache.getDistributedSystem().getDistributedMember().equals(targetMember)) { + if (getCache().getDistributedSystem().getDistributedMember().equals(targetMember)) { return service.getMemberMXBean(); } else { ObjectName objectName = service.getMemberMBeanName(targetMember); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java index e1d35b996f4c..1322b75bc12f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java @@ -30,7 +30,6 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.CacheServerMXBean; import org.apache.geode.management.DistributedRegionMXBean; import org.apache.geode.management.DistributedSystemMXBean; @@ -143,8 +142,7 @@ public Result showMetrics( */ private ResultData getSystemWideMetrics(String export_to_report_to, String[] categoriesArr, StringBuilder csvBuilder) { - final InternalCache cache = getCache(); - final ManagementService managementService = ManagementService.getManagementService(cache); + final ManagementService managementService = getManagementService(); DistributedSystemMXBean dsMxBean = managementService.getDistributedSystemMXBean(); if (dsMxBean == null) { String errorMessage = @@ -180,9 +178,8 @@ private ResultData getSystemWideMetrics(String export_to_report_to, String[] cat private ResultData getMemberMetrics(DistributedMember distributedMember, String export_to_report_to, String[] categoriesArr, int cacheServerPort, StringBuilder csvBuilder) throws ResultDataException { - final InternalCache cache = getCache(); final SystemManagementService managementService = - (SystemManagementService) ManagementService.getManagementService(cache); + (SystemManagementService) getManagementService(); ObjectName memberMBeanName = managementService.getMemberMBeanName(distributedMember); MemberMXBean memberMxBean = @@ -243,8 +240,7 @@ private ResultData getMemberMetrics(DistributedMember distributedMember, private ResultData getDistributedRegionMetrics(String regionName, String export_to_report_to, String[] categoriesArr, StringBuilder csvBuilder) throws ResultDataException { - final InternalCache cache = getCache(); - final ManagementService managementService = ManagementService.getManagementService(cache); + final ManagementService managementService = getManagementService(); DistributedRegionMXBean regionMxBean = managementService.getDistributedRegionMXBean(regionName); @@ -285,9 +281,8 @@ private ResultData getRegionMetricsFromMember(String regionName, DistributedMember distributedMember, String export_to_report_to, String[] categoriesArr, StringBuilder csvBuilder) throws ResultDataException { - final InternalCache cache = getCache(); final SystemManagementService managementService = - (SystemManagementService) ManagementService.getManagementService(cache); + (SystemManagementService) getManagementService(); ObjectName regionMBeanName = managementService.getRegionMBeanName(distributedMember, regionName); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java index e637fb139a3e..472cb41dd321 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java @@ -26,6 +26,7 @@ import org.apache.geode.cache.execute.FunctionInvocationTargetException; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.execute.AbstractExecution; import org.apache.geode.internal.cache.partitioned.ColocatedRegionDetails; import org.apache.geode.internal.cache.persistence.PersistentMemberPattern; @@ -49,7 +50,8 @@ public class ShowMissingDiskStoreCommand extends GfshCommand { public Result showMissingDiskStore() { try { - Set dataMembers = DiskStoreCommandsUtils.getNormalMembers(getCache()); + Set dataMembers = + DiskStoreCommandsUtils.getNormalMembers((InternalCache) getCache()); if (dataMembers.isEmpty()) { return ResultBuilder.createInfoResult(CliStrings.NO_CACHING_MEMBERS_FOUND_MESSAGE); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java index 28484238f18e..2f874d3426e5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java @@ -68,7 +68,7 @@ public Result shutdown( // convert to milliseconds long timeout = userSpecifiedTimeout * 1000; - InternalCache cache = getCache(); + InternalCache cache = (InternalCache) getCache(); int numDataNodes = getAllNormalMembers().size(); Set locators = getAllMembers(); Set dataNodes = getAllNormalMembers(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java index 58d0a3cbc656..8cbdc73fbfd4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java @@ -23,9 +23,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewayReceiverMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -54,9 +52,7 @@ public Result startGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliString throws Exception { Result result; - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + SystemManagementService service = (SystemManagementService) getManagementService(); GatewayReceiverMXBean receiverBean; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java index edc733d182b3..e7ab86c3dec2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java @@ -32,10 +32,9 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewaySenderMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -67,9 +66,8 @@ public Result startGatewaySender(@CliOption(key = CliStrings.START_GATEWAYSENDER Result result; final String id = senderId.trim(); - final InternalCache cache = getCache(); - final SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + final Cache cache = getCache(); + final SystemManagementService service = (SystemManagementService) getManagementService(); TabularResultData resultData = ResultBuilder.createTabularResultData(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java index cf4d2321df97..e9940b767368 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java @@ -46,7 +46,7 @@ public class StatusClusterConfigServiceCommand extends GfshCommand { @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_LOCATOR) @ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ) public Result statusSharedConfiguration() { - final InternalCache cache = getCache(); + final InternalCache cache = (InternalCache) getCache(); final Set locators = new HashSet<>( cache.getDistributionManager().getAllHostedLocatorsWithSharedConfiguration().keySet()); if (locators.isEmpty()) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java index ae65535215c0..c4fa0e2b55fa 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java @@ -23,9 +23,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewayReceiverMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -54,9 +52,7 @@ public Result statusGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliStrin Result result; - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + SystemManagementService service = (SystemManagementService) getManagementService(); CompositeResultData crd = ResultBuilder.createCompositeResultData(); TabularResultData availableReceiverData = diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java index fe76a3a5db49..38546444985b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java @@ -22,10 +22,9 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewaySenderMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -59,9 +58,8 @@ public Result statusGatewaySender(@CliOption(key = CliStrings.STATUS_GATEWAYSEND senderId = senderId.trim(); } - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + Cache cache = getCache(); + SystemManagementService service = (SystemManagementService) getManagementService(); GatewaySenderMXBean bean; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java index 5f711b54fabd..ee63419fb9bd 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java @@ -23,9 +23,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewayReceiverMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -53,9 +51,7 @@ public Result stopGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliStrings Result result; - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + SystemManagementService service = (SystemManagementService) getManagementService(); GatewayReceiverMXBean receiverBean; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java index 1769e388234d..3652391a3885 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java @@ -59,9 +59,8 @@ public Result stopGatewaySender(@CliOption(key = CliStrings.STOP_GATEWAYSENDER__ senderId = senderId.trim(); } - InternalCache cache = getCache(); - SystemManagementService service = - (SystemManagementService) ManagementService.getExistingManagementService(cache); + InternalCache cache = (InternalCache) getCache(); + SystemManagementService service = (SystemManagementService) getManagementService(); GatewaySenderMXBean bean; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java index f45f008136a9..929645ed25af 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java @@ -99,7 +99,7 @@ public Result undeploy( Result result = ResultBuilder.buildResult(tabularData); if (tabularData.getStatus().equals(Result.Status.OK)) { persistClusterConfiguration(result, - () -> getSharedConfiguration().removeJars(jars, groups)); + () -> getConfigurationService().removeJars(jars, groups)); } return result; } catch (VirtualMachineError e) { diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java index d5658e707bd5..2eaf7cb61cfe 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommandTest.java @@ -61,7 +61,7 @@ public class AlterAsyncEventQueueCommandTest { public void before() throws Exception { command = spy(AlterAsyncEventQueueCommand.class); service = mock(InternalClusterConfigurationService.class); - doReturn(service).when(command).getSharedConfiguration(); + doReturn(service).when(command).getConfigurationService(); configRegion = mock(Region.class); when(service.getConfigurationRegion()).thenReturn(configRegion); when(service.lockSharedConfiguration()).thenReturn(true); @@ -111,7 +111,7 @@ public void emptyConfiguration_ifExists() throws Exception { @Test public void cluster_config_service_not_available() throws Exception { - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); gfsh.executeAndAssertThat(command, "alter async-event-queue --id=test --batch-size=100") .statusIsError().containsOutput("Cluster Configuration Service is not available"); } diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java index f448e6e61cec..85a73f5c4a3c 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java @@ -74,7 +74,7 @@ public void setUp() throws Exception { doReturn(xmlEntity).when(command).createXmlEntity(any()); doReturn(cacheCreation).when(command).getCacheCreation(anyBoolean()); doReturn(Collections.emptySet()).when(command).getAllNormalMembers(); - doReturn(clusterConfigurationService).when(command).getSharedConfiguration(); + doReturn(clusterConfigurationService).when(command).getConfigurationService(); } @Test diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java index 206a2c74f792..6465d7be58e3 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandTest.java @@ -68,7 +68,7 @@ public class CreateAsyncEventQueueCommandTest { public void before() throws Exception { command = spy(CreateAsyncEventQueueCommand.class); service = mock(InternalClusterConfigurationService.class); - doReturn(service).when(command).getSharedConfiguration(); + doReturn(service).when(command).getConfigurationService(); } @Test @@ -188,7 +188,7 @@ public void buildResult_one_failure_one_success() throws Exception { @Test public void command_succeeded_but_no_cluster_config_service() throws Exception { - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); doReturn(Collections.emptySet()).when(command).getMembers(any(), any()); List functionResults = new ArrayList<>(); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java index 99f57180d9dc..002d25425582 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommandTest.java @@ -89,7 +89,7 @@ public void creationFailure() throws Exception { InternalClusterConfigurationService mockService = mock(InternalClusterConfigurationService.class); - doReturn(mockService).when(command).getSharedConfiguration(); + doReturn(mockService).when(command).getConfigurationService(); doReturn(Collections.singleton(member)).when(command).findMembers(any(), any()); doReturn(Arrays.asList(new CliFunctionResult(member.getId(), new Exception("MockException"), "Exception Message."))).when(resultCollector).getResult(); @@ -110,7 +110,7 @@ public void creationSuccess() throws Exception { InternalClusterConfigurationService mockService = mock(InternalClusterConfigurationService.class); - doReturn(mockService).when(command).getSharedConfiguration(); + doReturn(mockService).when(command).getConfigurationService(); doReturn(Collections.singleton(member)).when(command).findMembers(any(), any()); doReturn(Arrays.asList(new CliFunctionResult(member.getId(), xmlEntity))).when(resultCollector) .getResult(); @@ -145,7 +145,7 @@ public void multipleIndexesOnMultipleRegions() throws Exception { CliFunctionResult member2Region2Result = new CliFunctionResult(member2.getId(), xmlEntityRegion2); - doReturn(mockService).when(command).getSharedConfiguration(); + doReturn(mockService).when(command).getConfigurationService(); doReturn(new HashSet<>(Arrays.asList(new DistributedMember[] {member1, member2}))).when(command) .findMembers(any(), any()); doReturn(Arrays.asList(new CliFunctionResult[] {member1Region1Result, member1Region2Result, diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java index 384bcbb0a30b..49ef4e0922d2 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommandTest.java @@ -61,7 +61,7 @@ public void before() { xmlEntity = mock(XmlEntity.class); cache = mock(InternalCache.class); doReturn(cache).when(command).getCache(); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); functionResults = new ArrayList<>(); doReturn(functionResults).when(command).executeAndGetFunctionResult(any(), any(), any(Set.class)); @@ -92,7 +92,7 @@ public void endMustBeLargerThanStart() { @Test public void whenNoCCService() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", xmlEntity, "result1"); functionResults.add(result1); gfsh.executeAndAssertThat(command, "create gateway-receiver").statusIsSuccess() @@ -103,7 +103,7 @@ public void whenNoCCService() { @Test public void whenCommandOnMember() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", xmlEntity, "result1"); functionResults.add(result1); gfsh.executeAndAssertThat(command, "create gateway-receiver --member=xyz").statusIsSuccess() @@ -114,7 +114,7 @@ public void whenCommandOnMember() { @Test public void whenNoXml() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", false, "result1"); functionResults.add(result1); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java index b24792f7ea7a..6456354a5165 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java @@ -65,7 +65,7 @@ public void before() { xmlEntity = mock(XmlEntity.class); cache = mock(InternalCache.class); doReturn(cache).when(command).getCache(); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); functionResults = new ArrayList<>(); doReturn(functionResults).when(command).executeAndGetFunctionResult(any(), any(), any(Set.class)); @@ -119,7 +119,7 @@ public void orderPolicyAutoComplete() { @Test public void whenNoCCService() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", xmlEntity, "result1"); functionResults.add(result1); gfsh.executeAndAssertThat(command, @@ -131,7 +131,7 @@ public void whenNoCCService() { @Test public void whenCommandOnMember() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", xmlEntity, "result1"); functionResults.add(result1); gfsh.executeAndAssertThat(command, @@ -143,7 +143,7 @@ public void whenCommandOnMember() { @Test public void whenNoXml() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", false, "result1"); functionResults.add(result1); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java index 8e0de9094180..5f0e4ff6d430 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommandTest.java @@ -103,7 +103,7 @@ public void returnsErrorIfBindingAlreadyExistsAndIfUnspecified() CacheConfig cacheConfig = mock(CacheConfig.class); JndiBindingsType.JndiBinding existingBinding = mock(JndiBindingsType.JndiBinding.class); - doReturn(clusterConfigService).when(command).getSharedConfiguration(); + doReturn(clusterConfigService).when(command).getConfigurationService(); doReturn(cacheConfig).when(clusterConfigService).getCacheConfig(any()); doReturn(existingBinding).when(clusterConfigService).findIdentifiable(any(), any()); @@ -120,7 +120,7 @@ public void skipsIfBindingAlreadyExistsAndIfSpecified() CacheConfig cacheConfig = mock(CacheConfig.class); JndiBindingsType.JndiBinding existingBinding = mock(JndiBindingsType.JndiBinding.class); - doReturn(clusterConfigService).when(command).getSharedConfiguration(); + doReturn(clusterConfigService).when(command).getConfigurationService(); doReturn(cacheConfig).when(clusterConfigService).getCacheConfig(any()); doReturn(existingBinding).when(clusterConfigService).findIdentifiable(any(), any()); @@ -138,7 +138,7 @@ public void skipsIfBindingAlreadyExistsAndIfSpecifiedTrue() CacheConfig cacheConfig = mock(CacheConfig.class); JndiBindingsType.JndiBinding existingBinding = mock(JndiBindingsType.JndiBinding.class); - doReturn(clusterConfigService).when(command).getSharedConfiguration(); + doReturn(clusterConfigService).when(command).getConfigurationService(); doReturn(cacheConfig).when(clusterConfigService).getCacheConfig(any()); doReturn(existingBinding).when(clusterConfigService).findIdentifiable(any(), any()); @@ -155,7 +155,7 @@ public void returnsErrorIfBindingAlreadyExistsAndIfSpecifiedFalse() { CacheConfig cacheConfig = mock(CacheConfig.class); JndiBindingsType.JndiBinding existingBinding = mock(JndiBindingsType.JndiBinding.class); - doReturn(clusterConfigService).when(command).getSharedConfiguration(); + doReturn(clusterConfigService).when(command).getConfigurationService(); doReturn(cacheConfig).when(clusterConfigService).getCacheConfig(any()); doReturn(existingBinding).when(clusterConfigService).findIdentifiable(any(), any()); @@ -169,7 +169,7 @@ public void returnsErrorIfBindingAlreadyExistsAndIfSpecifiedFalse() { public void whenNoMembersFoundAndNoClusterConfigServiceRunningThenError() { doReturn(Collections.emptySet()).when(command).findMembers(any(), any()); - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); gfsh.executeAndAssertThat(command, COMMAND + " --type=SIMPLE --name=name --jdbc-driver-class=driver --connection-url=url") @@ -183,7 +183,7 @@ public void whenNoMembersFoundAndClusterConfigRunningThenUpdateClusterConfig() { CacheConfig cacheConfig = mock(CacheConfig.class); doReturn(Collections.emptySet()).when(command).findMembers(any(), any()); - doReturn(clusterConfigService).when(command).getSharedConfiguration(); + doReturn(clusterConfigService).when(command).getConfigurationService(); doReturn(cacheConfig).when(clusterConfigService).getCacheConfig(any()); doReturn(null).when(clusterConfigService).findIdentifiable(any(), any()); @@ -208,7 +208,7 @@ public void whenMembersFoundAndNoClusterConfigRunningThenOnlyInvokeFunction() { results.add(result); doReturn(members).when(command).findMembers(any(), any()); - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); doReturn(results).when(command).executeAndGetFunctionResult(any(), any(), any()); gfsh.executeAndAssertThat(command, @@ -248,7 +248,7 @@ public void whenMembersFoundAndClusterConfigRunningThenUpdateClusterConfigAndInv CacheConfig cacheConfig = mock(CacheConfig.class); doReturn(members).when(command).findMembers(any(), any()); - doReturn(clusterConfigService).when(command).getSharedConfiguration(); + doReturn(clusterConfigService).when(command).getConfigurationService(); doReturn(results).when(command).executeAndGetFunctionResult(any(), any(), any()); doReturn(cacheConfig).when(clusterConfigService).getCacheConfig(any()); doReturn(null).when(clusterConfigService).findIdentifiable(any(), any()); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java index 6bb511f42ded..089646b7c7ff 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommandTest.java @@ -157,7 +157,7 @@ public void defaultValues() throws Exception { doReturn(resultCollector).when(command).executeFunction(any(), any(), any(Set.class)); when(resultCollector.getResult()).thenReturn(Collections.emptyList()); DistributedSystemMXBean dsMBean = mock(DistributedSystemMXBean.class); - doReturn(dsMBean).when(command).getDSMBean(any()); + doReturn(dsMBean).when(command).getDSMBean(); doReturn(Collections.singleton(mock(DistributedMember.class))).when(command).findMembers(any(), any()); doReturn(true).when(command).verifyDistributedRegionMbean(any(), any()); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java index 1fe2b1237968..2a16347d1934 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommandTest.java @@ -60,7 +60,7 @@ public void before() throws Exception { xmlEntity = mock(XmlEntity.class); cache = mock(InternalCache.class); doReturn(cache).when(command).getCache(); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); functionResults = new ArrayList<>(); doReturn(functionResults).when(command).executeAndGetFunctionResult(any(), any(), any(Set.class)); @@ -115,7 +115,7 @@ public void oneFunctionThrowsGeneralException() throws Exception { @Test public void whenNoCCService() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", xmlEntity, "result1"); functionResults.add(result1); parser.executeAndAssertThat(command, "destroy gateway-sender --id=1").statusIsSuccess() @@ -126,7 +126,7 @@ public void whenNoCCService() { @Test public void whenCommandOnMember() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", xmlEntity, "result1"); functionResults.add(result1); parser.executeAndAssertThat(command, "destroy gateway-sender --member=xyz --id=1") @@ -137,7 +137,7 @@ public void whenCommandOnMember() { @Test public void whenNoXml() { doReturn(mock(Set.class)).when(command).getMembers(any(), any()); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); result1 = new CliFunctionResult("member", false, "result1"); functionResults.add(result1); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java index dc4fe8e05203..62c93c221356 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommandTest.java @@ -69,7 +69,7 @@ public void setUp() throws Exception { doReturn(cache).when(command).getCache(); cacheConfig = mock(CacheConfig.class); ccService = mock(InternalClusterConfigurationService.class); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); when(ccService.getCacheConfig(any())).thenReturn(cacheConfig); doCallRealMethod().when(ccService).updateCacheConfig(any(), any()); when(ccService.getConfigurationRegion()).thenReturn(mock(Region.class)); @@ -112,7 +112,7 @@ public void returnsErrorIfBindingDoesNotExistAndIfExistsSpecifiedFalse() { @Test public void whenNoMembersFoundAndNoClusterConfigServiceRunningThenError() { doReturn(Collections.emptySet()).when(command).findMembers(any(), any()); - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); gfsh.executeAndAssertThat(command, COMMAND + " --name=name").statusIsSuccess() .containsOutput("No members found").hasFailToPersistError(); @@ -143,7 +143,7 @@ public void whenMembersFoundAndNoClusterConfigRunningThenOnlyInvokeFunction() { results.add(result); doReturn(members).when(command).findMembers(any(), any()); - doReturn(null).when(command).getSharedConfiguration(); + doReturn(null).when(command).getConfigurationService(); doReturn(results).when(command).executeAndGetFunctionResult(any(), any(), any()); gfsh.executeAndAssertThat(command, COMMAND + " --name=name").statusIsSuccess() diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java index 2c7a7746fd9a..62db86a5c776 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommandTest.java @@ -61,7 +61,7 @@ public void before() throws Exception { xmlEntity = mock(XmlEntity.class); command = spy(DestroyRegionCommand.class); ccService = mock(InternalClusterConfigurationService.class); - doReturn(ccService).when(command).getSharedConfiguration(); + doReturn(ccService).when(command).getConfigurationService(); doReturn(mock(InternalCache.class)).when(command).getCache(); List functionResults = new ArrayList<>(); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java index 7ad3564b43fa..fd59094a053f 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java @@ -35,6 +35,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.FunctionInvocationTargetException; import org.apache.geode.cache.execute.ResultCollector; @@ -381,7 +382,7 @@ private static class TestDescribeDiskStoreCommand extends DescribeDiskStoreComma } @Override - public InternalCache getCache() { + public Cache getCache() { return this.cache; } @@ -418,7 +419,7 @@ private static class TestListDiskStoresCommand extends ListDiskStoresCommand { } @Override - public InternalCache getCache() { + public Cache getCache() { return this.cache; } diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java index c2817523c910..619414777ae6 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java @@ -64,14 +64,14 @@ public void isConnectedAndReady() throws Exception { @Test public void persistClusterConfiguration() throws Exception { - when(command.getSharedConfiguration()).thenReturn(null); + when(command.getConfigurationService()).thenReturn(null); Result result = ResultBuilder.createInfoResult("info"); Runnable runnable = mock(Runnable.class); command.persistClusterConfiguration(result, runnable); assertThat(result.failedToPersist()).isTrue(); - when(command.getSharedConfiguration()).thenReturn(clusterConfigurationService); + when(command.getConfigurationService()).thenReturn(clusterConfigurationService); command.persistClusterConfiguration(result, runnable); assertThat(result.failedToPersist()).isFalse(); } diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java index a7ce9d3d44f4..0a0576cf8a36 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListIndexCommandJUnitTest.java @@ -34,6 +34,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.FunctionInvocationTargetException; import org.apache.geode.cache.execute.ResultCollector; @@ -204,7 +205,7 @@ private static class TestListIndexCommands extends ListIndexCommand { } @Override - public InternalCache getCache() { + public Cache getCache() { return this.cache; } diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java index 0a66d2512368..38cc43ac219b 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ShowLogCommandDUnitTest.java @@ -34,9 +34,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.apache.geode.cache.CacheFactory; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.CliUtil; @@ -162,16 +160,16 @@ public void testShowLogInvalidMember() throws Exception { private static boolean allMembersAreConnected() { return manager.getVM().invoke(() -> { - InternalCache cache = (InternalCache) CacheFactory.getAnyInstance(); DistributedMember server1 = CliUtil.getDistributedMemberByNameOrId(SERVER1_NAME, ClusterStartupRule.getCache()); DistributedMember server2 = CliUtil.getDistributedMemberByNameOrId(SERVER2_NAME, ClusterStartupRule.getCache()); ShowLogCommand showLogCommand = new ShowLogCommand(); + showLogCommand.setCache(ClusterStartupRule.getCache()); - boolean server1isConnected = showLogCommand.getMemberMxBean(cache, server1) != null; - boolean server2isConnected = showLogCommand.getMemberMxBean(cache, server2) != null; + boolean server1isConnected = showLogCommand.getMemberMxBean(server1) != null; + boolean server2isConnected = showLogCommand.getMemberMxBean(server2) != null; return server1isConnected && server2isConnected; }); } diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java index 52cc1a251efb..56cecbb1f112 100755 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java @@ -85,7 +85,7 @@ public Result listIndex(@CliOption(key = LuceneCliStrings.LUCENE_LIST_INDEX__STA specifiedDefaultValue = "true", unspecifiedDefaultValue = "false", help = LuceneCliStrings.LUCENE_LIST_INDEX__STATS__HELP) final boolean stats) { - getSecurityService().authorize(Resource.CLUSTER, Operation.READ, LucenePermission.TARGET); + authorize(Resource.CLUSTER, Operation.READ, LucenePermission.TARGET); return toTabularResult(getIndexListing(), stats); } @@ -171,9 +171,9 @@ public Result createIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, Result result; // Every lucene index potentially writes to disk. - getSecurityService().authorize(Resource.CLUSTER, Operation.MANAGE, LucenePermission.TARGET); + authorize(Resource.CLUSTER, Operation.MANAGE, LucenePermission.TARGET); - final InternalCache cache = getCache(); + final InternalCache cache = (InternalCache) getCache(); // trim fields for any leading trailing spaces. String[] trimmedFields = Arrays.stream(fields).map(String::trim).toArray(String[]::new); @@ -199,7 +199,7 @@ public Result createIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, result = ResultBuilder.buildResult(tabularResult); if (xmlEntity != null) { persistClusterConfiguration(result, () -> { - getSharedConfiguration().addXmlEntity(xmlEntity, null); + getConfigurationService().addXmlEntity(xmlEntity, null); }); } return result; @@ -217,7 +217,7 @@ public Result describeIndex( help = LuceneCliStrings.LUCENE_DESCRIBE_INDEX__REGION_HELP) final String regionPath) throws Exception { - getSecurityService().authorize(Resource.CLUSTER, Operation.READ, LucenePermission.TARGET); + authorize(Resource.CLUSTER, Operation.READ, LucenePermission.TARGET); LuceneIndexInfo indexInfo = new LuceneIndexInfo(indexName, regionPath); return toTabularResult(getIndexDetails(indexInfo), true); } @@ -259,7 +259,7 @@ public Result searchIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, unspecifiedDefaultValue = "false", help = LuceneCliStrings.LUCENE_SEARCH_INDEX__KEYSONLY__HELP) boolean keysOnly) throws Exception { - getSecurityService().authorize(Resource.DATA, Operation.READ, regionPath); + authorize(Resource.DATA, Operation.READ, regionPath); LuceneQueryInfo queryInfo = new LuceneQueryInfo(indexName, regionPath, queryString, defaultField, limit, keysOnly); int pageSize = Integer.MAX_VALUE; @@ -283,7 +283,7 @@ public Result destroyIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, CliStrings.format(LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__INDEX_CANNOT_BE_EMPTY)); } - getSecurityService().authorize(Resource.CLUSTER, Operation.MANAGE, LucenePermission.TARGET); + authorize(Resource.CLUSTER, Operation.MANAGE, LucenePermission.TARGET); Result result; List accumulatedResults = new ArrayList<>(); final XmlEntity xmlEntity = @@ -292,7 +292,7 @@ public Result destroyIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, if (xmlEntity != null) { persistClusterConfiguration(result, () -> { // Delete the xml entity to remove the index(es) in all groups - getSharedConfiguration().deleteXmlEntity(xmlEntity, null); + getConfigurationService().deleteXmlEntity(xmlEntity, null); }); } @@ -316,7 +316,6 @@ private XmlEntity executeDestroyIndexFunction(List accumulate // region members. Then send the function to the remaining members to handle the case where // the index has been created, but not the region XmlEntity xmlEntity = null; - InternalCache cache = getCache(); Set regionMembers = findMembersForRegion(regionPath); Set normalMembers = getAllNormalMembers(); LuceneDestroyIndexInfo indexInfo = new LuceneDestroyIndexInfo(indexName, regionPath); @@ -497,7 +496,7 @@ private Result getResults(int fromIndex, int toIndex, boolean keysonly) throws E protected ResultCollector executeFunctionOnRegion(Function function, LuceneFunctionSerializable functionArguments, boolean returnAllMembers) { Set targetMembers = CliUtil.getRegionAssociatedMembers( - functionArguments.getRegionPath(), getCache(), returnAllMembers); + functionArguments.getRegionPath(), (InternalCache) getCache(), returnAllMembers); if (targetMembers.isEmpty()) { throw new UserErrorException(CliStrings.format( LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULDNOT_FIND_MEMBERS_FOR_REGION_0, diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java index 07f1953a9296..5bc5f0f1428d 100644 --- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java @@ -48,6 +48,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; +import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.cache.lucene.LuceneSerializer; @@ -649,20 +650,14 @@ private LuceneSearchResults createQueryResults(final String key, final String va private static class LuceneTestIndexCommands extends LuceneIndexCommands { - private final InternalCache cache; private final Execution functionExecutor; protected LuceneTestIndexCommands(final InternalCache cache, final Execution functionExecutor) { assert cache != null : "The InternalCache cannot be null!"; - this.cache = cache; + setCache(cache); this.functionExecutor = functionExecutor; } - @Override - public InternalCache getCache() { - return this.cache; - } - @Override public Set getAllMembers() { return Collections.emptySet(); From 63ebca4a09a06d40ab0e3a25022fd1b833f28682 Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Tue, 20 Mar 2018 15:35:27 -0700 Subject: [PATCH 03/15] Fix help guide url in Pulse --- .../src/main/webapp/clusterDetail.html | 2 +- geode-pulse/src/main/webapp/dataBrowser.html | 2 +- .../main/webapp/scripts/pulsescript/common.js | 20 +++++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/geode-pulse/src/main/webapp/clusterDetail.html b/geode-pulse/src/main/webapp/clusterDetail.html index 26ae3d147e40..c74299dbb3a2 100644 --- a/geode-pulse/src/main/webapp/clusterDetail.html +++ b/geode-pulse/src/main/webapp/clusterDetail.html @@ -118,7 +118,7 @@
-
Help
+
Help
Welcome
diff --git a/geode-pulse/src/main/webapp/dataBrowser.html b/geode-pulse/src/main/webapp/dataBrowser.html index dac5a4df7b8f..b6d49f1c4428 100644 --- a/geode-pulse/src/main/webapp/dataBrowser.html +++ b/geode-pulse/src/main/webapp/dataBrowser.html @@ -137,7 +137,7 @@
-
Help
+
Help
Welcome
diff --git a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js index 5de8b4c856d8..b99348396616 100644 --- a/geode-pulse/src/main/webapp/scripts/pulsescript/common.js +++ b/geode-pulse/src/main/webapp/scripts/pulsescript/common.js @@ -114,6 +114,26 @@ function getCookie(c_name) { } } +function openHelpGuide() { + $.getJSON("pulseVersion", function(data) { + var pulseVersion = data.pulseVersion; + if (data.pulseVersion != undefined && data.pulseVersion != "") { + //1.6.0-SNAPSHOT + var pulseGuideLocation; + var tokens = pulseVersion.split("."); + if(pulseVersion.indexOf("SNAPSHOT") > 0) { + //fall back to one version older guide in case if its snapshot. + pulseGuideLocation = tokens[0] + (tokens[1] - 1); + } else { + pulseGuideLocation = tokens[0]+tokens[1]; + } + var url = `http://geode.apache.org/docs/guide/${pulseGuideLocation}/tools_modules/pulse/pulse-overview.html`; + window.open(url, '_blank'); + } + }); + return false; +} + // function used for setting cookies function setCookie(c_name, value, exdays) { var exdate = new Date(); From 1cca96a579c025e3daa731b9d9b9c72175b598de Mon Sep 17 00:00:00 2001 From: Ken Howe Date: Wed, 21 Mar 2018 12:43:22 -0700 Subject: [PATCH 04/15] GEODE-3922: Fix additional help links Change default the value of pulse-help-custom property in the default gemfire.properties file to be a valid link. --- geode-pulse/src/main/resources/gemfire.properties | 2 +- geode-pulse/src/main/webapp/dataBrowser.html | 2 +- geode-pulse/src/main/webapp/memberDetails.html | 2 +- geode-pulse/src/main/webapp/properties/gemfire.properties | 2 +- geode-pulse/src/main/webapp/queryStatistics.html | 6 +----- geode-pulse/src/main/webapp/regionDetail.html | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/geode-pulse/src/main/resources/gemfire.properties b/geode-pulse/src/main/resources/gemfire.properties index 48899dec4818..7f6a70cebbbb 100644 --- a/geode-pulse/src/main/resources/gemfire.properties +++ b/geode-pulse/src/main/resources/gemfire.properties @@ -25,7 +25,7 @@ pulse-writes-custom=Writes pulse-reads-custom=Reads pulse-monitoring-custom=images/pulse-monitoring.png pulse-aboutimg-custom=images/about-geode.png -pulse-help-custom=http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html +pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html pulse-about-custom=The Pulse tool monitors Apache Geode© system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients. pulse-regionstableCaps-custom=Regions pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count diff --git a/geode-pulse/src/main/webapp/dataBrowser.html b/geode-pulse/src/main/webapp/dataBrowser.html index b6d49f1c4428..478bce55a710 100644 --- a/geode-pulse/src/main/webapp/dataBrowser.html +++ b/geode-pulse/src/main/webapp/dataBrowser.html @@ -137,7 +137,7 @@
-
Help
+
Help
Welcome
diff --git a/geode-pulse/src/main/webapp/memberDetails.html b/geode-pulse/src/main/webapp/memberDetails.html index 18a5eac72efd..fa5998f9fe1f 100644 --- a/geode-pulse/src/main/webapp/memberDetails.html +++ b/geode-pulse/src/main/webapp/memberDetails.html @@ -128,7 +128,7 @@
-
Help
+
Help
Welcome
diff --git a/geode-pulse/src/main/webapp/properties/gemfire.properties b/geode-pulse/src/main/webapp/properties/gemfire.properties index 613bde98b965..c10bdaab33c8 100644 --- a/geode-pulse/src/main/webapp/properties/gemfire.properties +++ b/geode-pulse/src/main/webapp/properties/gemfire.properties @@ -23,7 +23,7 @@ pulse-writes-custom=Writes pulse-reads-custom=Reads pulse-monitoring-custom=images/pulse-monitoring.png pulse-aboutimg-custom=images/about-geode.png -pulse-help-custom=http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html +pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html pulse-about-custom=The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients. pulse-regionstableCaps-custom=Regions pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count diff --git a/geode-pulse/src/main/webapp/queryStatistics.html b/geode-pulse/src/main/webapp/queryStatistics.html index 0b0e3e101488..cbaf157992a1 100644 --- a/geode-pulse/src/main/webapp/queryStatistics.html +++ b/geode-pulse/src/main/webapp/queryStatistics.html @@ -148,11 +148,7 @@
-
- Help -
+
Help
Welcome
diff --git a/geode-pulse/src/main/webapp/regionDetail.html b/geode-pulse/src/main/webapp/regionDetail.html index 94d3b88e28be..e303d60fbbc0 100644 --- a/geode-pulse/src/main/webapp/regionDetail.html +++ b/geode-pulse/src/main/webapp/regionDetail.html @@ -210,7 +210,7 @@

M1

-
Help
+
Help
Welcome
From 3d5ad6903c73997af9a31cc2d1cf93c3f192035f Mon Sep 17 00:00:00 2001 From: Ken Howe Date: Wed, 21 Mar 2018 15:29:16 -0700 Subject: [PATCH 05/15] GEODE-3922: Removed pulse-help-custom from gemfire.properties Removing the property because Help URLs are now dynamic. --- geode-pulse/src/main/resources/gemfire.properties | 1 - geode-pulse/src/main/webapp/properties/gemfire.properties | 1 - 2 files changed, 2 deletions(-) diff --git a/geode-pulse/src/main/resources/gemfire.properties b/geode-pulse/src/main/resources/gemfire.properties index 7f6a70cebbbb..99b6d1e94cf8 100644 --- a/geode-pulse/src/main/resources/gemfire.properties +++ b/geode-pulse/src/main/resources/gemfire.properties @@ -25,7 +25,6 @@ pulse-writes-custom=Writes pulse-reads-custom=Reads pulse-monitoring-custom=images/pulse-monitoring.png pulse-aboutimg-custom=images/about-geode.png -pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html pulse-about-custom=The Pulse tool monitors Apache Geode© system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients. pulse-regionstableCaps-custom=Regions pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count diff --git a/geode-pulse/src/main/webapp/properties/gemfire.properties b/geode-pulse/src/main/webapp/properties/gemfire.properties index c10bdaab33c8..f91c2c53a71d 100644 --- a/geode-pulse/src/main/webapp/properties/gemfire.properties +++ b/geode-pulse/src/main/webapp/properties/gemfire.properties @@ -23,7 +23,6 @@ pulse-writes-custom=Writes pulse-reads-custom=Reads pulse-monitoring-custom=images/pulse-monitoring.png pulse-aboutimg-custom=images/about-geode.png -pulse-help-custom=http://geode.apache.org/docs/guide/15/tools_modules/pulse/pulse-overview.html pulse-about-custom=The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients. pulse-regionstableCaps-custom=Regions pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count From d23c6d1c40a3998ebbd36a2a55edf2820493f33d Mon Sep 17 00:00:00 2001 From: Jens Deppe Date: Thu, 22 Mar 2018 09:31:44 -0700 Subject: [PATCH 06/15] GEODE-4386: Add gfsh command to describe jndi-binding (#1653) --- .../cache/configuration/JndiBindingsType.java | 12 +- .../commands/DescribeJndiBindingCommand.java | 102 +++++++++++++ .../sanctioned-geode-core-serializables.txt | 1 + .../cli/GfshParserAutoCompletionTest.java | 8 +- .../DescribeJndiBindingCommandDUnitTest.java | 140 ++++++++++++++++++ .../ManagedConnectionFactoryForTesting.java | 58 ++++++++ 6 files changed, 316 insertions(+), 5 deletions(-) create mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ManagedConnectionFactoryForTesting.java diff --git a/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java b/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java index 8c65c2881e17..e677d57d8dca 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java +++ b/geode-core/src/main/java/org/apache/geode/cache/configuration/JndiBindingsType.java @@ -659,7 +659,7 @@ public String getId() { @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"configPropertyName", "configPropertyType", "configPropertyValue"}) - public static class ConfigProperty { + public static class ConfigProperty implements CacheElement { @XmlElement(name = "config-property-name", namespace = "http://geode.apache.org/schema/cache", required = true) @@ -679,6 +679,16 @@ public ConfigProperty(String name, String type, String value) { this.configPropertyValue = value; } + /** + * Get the id of the element. The id is the same as the name. + * + * @return the id of the element + */ + @Override + public String getId() { + return getName(); + } + /** * Gets the value of the configPropertyName property. * diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java new file mode 100644 index 000000000000..b7d860f3896d --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java @@ -0,0 +1,102 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.management.internal.cli.commands; + +import java.util.List; + +import org.apache.logging.log4j.Logger; +import org.springframework.shell.core.annotation.CliCommand; +import org.springframework.shell.core.annotation.CliOption; + +import org.apache.geode.cache.configuration.CacheConfig; +import org.apache.geode.cache.configuration.JndiBindingsType; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.management.cli.Result; +import org.apache.geode.management.internal.cli.functions.ListJndiBindingFunction; +import org.apache.geode.management.internal.cli.result.ResultBuilder; +import org.apache.geode.management.internal.cli.result.TabularResultData; +import org.apache.geode.management.internal.security.ResourceOperation; +import org.apache.geode.security.ResourcePermission; + +public class DescribeJndiBindingCommand extends GfshCommand { + private static final Logger logger = LogService.getLogger(); + + private static final String DESCRIBE_JNDI_BINDING = "describe jndi-binding"; + private static final String DESCRIBE_JNDIBINDING__HELP = + "Describe the given active jndi binding. An active binding is one that is bound to the server's jndi context."; + private static final Function LIST_BINDING_FUNCTION = new ListJndiBindingFunction(); + + @CliCommand(value = DESCRIBE_JNDI_BINDING, help = DESCRIBE_JNDIBINDING__HELP) + @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, + operation = ResourcePermission.Operation.READ) + public Result describeJndiBinding(@CliOption(key = "name", mandatory = true, + help = "Name of the binding to describe") String bindingName) { + Result result = null; + TabularResultData tabularData = ResultBuilder.createTabularResultData(); + + InternalClusterConfigurationService ccService = getSharedConfiguration(); + if (ccService != null) { + CacheConfig cacheConfig = ccService.getCacheConfig("cluster"); + List jndiBindings = cacheConfig.getJndiBindings(); + for (JndiBindingsType.JndiBinding binding : jndiBindings) { + if (binding.getJndiName().equals(bindingName) + || binding.getJndiName().equals("java:" + bindingName)) { + addTableRow(tabularData, "type", binding.getType()); + addTableRow(tabularData, "jndi-name", binding.getJndiName()); + addTableRow(tabularData, "jdbc-driver-class", binding.getJdbcDriverClass()); + addTableRow(tabularData, "user-name", binding.getUserName()); + addTableRow(tabularData, "connection-url", binding.getConnectionUrl()); + + if (!"SimpleDataSource".equals(binding.getType())) { + if ("ManagedDataSource".equals(binding.getType())) { + addTableRow(tabularData, "managed-conn-factory-class", + binding.getManagedConnFactoryClass()); + } else if ("PooledDataSource".equals(binding.getType())) { + addTableRow(tabularData, "conn-pooled-datasource-class", + binding.getConnPooledDatasourceClass()); + } else if ("XAPooledDataSource".equals(binding.getType())) { + addTableRow(tabularData, "xa-datasource-class", binding.getXaDatasourceClass()); + } + + addTableRow(tabularData, "init-pool-size", binding.getInitPoolSize()); + addTableRow(tabularData, "max-pool-size", binding.getMaxPoolSize()); + addTableRow(tabularData, "idle-timeout-seconds", binding.getIdleTimeoutSeconds()); + addTableRow(tabularData, "blocking-timeout-seconds", + binding.getBlockingTimeoutSeconds()); + addTableRow(tabularData, "login-timeout-seconds", binding.getLoginTimeoutSeconds()); + } + + for (JndiBindingsType.JndiBinding.ConfigProperty confProp : binding.getConfigProperty()) { + addTableRow(tabularData, confProp.getName(), confProp.getValue()); + } + + break; + } + } + } + + result = ResultBuilder.buildResult(tabularData); + + return result; + } + + private void addTableRow(TabularResultData table, String property, String value) { + table.accumulate("Property", property); + table.accumulate("Value", value != null ? value : ""); + } +} diff --git a/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt b/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt index 52c3d49f48fd..d296f7706eac 100644 --- a/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt +++ b/geode-core/src/main/resources/org/apache/geode/internal/sanctioned-geode-core-serializables.txt @@ -123,6 +123,7 @@ org/apache/geode/cache/client/internal/pooling/ConnectionDestroyedException,true org/apache/geode/cache/configuration/EnumActionDestroyOverflow,false,value:java/lang/String org/apache/geode/cache/configuration/EnumReadableWritable,false,value:java/lang/String org/apache/geode/cache/configuration/JndiBindingsType$JndiBinding,false,blockingTimeoutSeconds:java/lang/String,configProperty:java/util/List,connPooledDatasourceClass:java/lang/String,connectionUrl:java/lang/String,idleTimeoutSeconds:java/lang/String,initPoolSize:java/lang/String,jdbcDriverClass:java/lang/String,jndiName:java/lang/String,loginTimeoutSeconds:java/lang/String,managedConnFactoryClass:java/lang/String,maxPoolSize:java/lang/String,password:java/lang/String,transactionType:java/lang/String,type:java/lang/String,userName:java/lang/String,xaDatasourceClass:java/lang/String +org/apache/geode/cache/configuration/JndiBindingsType$JndiBinding$ConfigProperty,false,configPropertyName:java/lang/String,configPropertyType:java/lang/String,configPropertyValue:java/lang/String org/apache/geode/cache/configuration/RegionAttributesDataPolicy,false,value:java/lang/String org/apache/geode/cache/configuration/RegionAttributesIndexUpdateType,false,value:java/lang/String org/apache/geode/cache/configuration/RegionAttributesMirrorType,false,value:java/lang/String diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java index 1462ac2801a0..ec7ea8c3f2ba 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java @@ -36,18 +36,18 @@ public class GfshParserAutoCompletionTest { private GfshParserRule.CommandCandidate candidate; @Test - public void testCompletionDescibe() throws Exception { + public void testCompletionDescribe() throws Exception { buffer = "describe"; candidate = parser.complete(buffer); - assertThat(candidate.size()).isEqualTo(7); + assertThat(candidate.size()).isEqualTo(8); assertThat(candidate.getFirstCandidate()).isEqualTo("describe client"); } @Test - public void testCompletionDescibeWithSpace() throws Exception { + public void testCompletionDescribeWithSpace() throws Exception { buffer = "describe "; candidate = parser.complete(buffer); - assertThat(candidate.size()).isEqualTo(7); + assertThat(candidate.size()).isEqualTo(8); assertThat(candidate.getFirstCandidate()).isEqualTo("describe client"); } diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java new file mode 100644 index 000000000000..b15b08e8acfe --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommandDUnitTest.java @@ -0,0 +1,140 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.management.internal.cli.commands; + +import java.util.Properties; + +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.test.dunit.rules.ClusterStartupRule; +import org.apache.geode.test.dunit.rules.MemberVM; +import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.rules.GfshCommandRule; + +@Category(DistributedTest.class) +public class DescribeJndiBindingCommandDUnitTest { + + private static MemberVM locator, server; + + @ClassRule + public static ClusterStartupRule cluster = new ClusterStartupRule(); + + @ClassRule + public static GfshCommandRule gfsh = new GfshCommandRule(); + + @BeforeClass + public static void before() throws Exception { + Properties props = new Properties(); + // props.setProperty(ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER, + // ListJndiBindingFunction.class.getName()); + + locator = cluster.startLocatorVM(0); + server = cluster.startServerVM(1, props, locator.getPort()); + + gfsh.connectAndVerify(locator); + } + + @Test + public void describeJndiBindingForSimpleDataSource() { + gfsh.executeAndAssertThat( + "create jndi-binding --name=jndi-simple --type=SIMPLE --jdbc-driver-class=org.apache.derby.jdbc.EmbeddedDriver --connection-url=\"jdbc:derby:newDB;create=true\" --username=joe --datasource-config-properties={'name':'prop1','value':'value1'}") + .statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1"); + + gfsh.executeAndAssertThat("describe jndi-binding --name=jndi-simple").statusIsSuccess() + .tableHasRowWithValues("Property", "Value", "jndi-name", "jndi-simple") + .tableHasRowWithValues("Property", "Value", "type", "SimpleDataSource") + .tableHasRowWithValues("Property", "Value", "jdbc-driver-class", + "org.apache.derby.jdbc.EmbeddedDriver") + .tableHasRowWithValues("Property", "Value", "user-name", "joe").tableHasRowWithValues( + "Property", "Value", "connection-url", "jdbc:derby:newDB;create=true"); + } + + @Test + public void describeJndiBindingForManagedDataSource() { + gfsh.executeAndAssertThat( + "create jndi-binding --name=jndi-managed --type=MANAGED --jdbc-driver-class=org.apache.derby.jdbc.EmbeddedDriver --connection-url=\"jdbc:derby:newDB;create=true\" --init-pool-size=1 --max-pool-size=10 --idle-timeout-seconds=2 --blocking-timeout-seconds=11 --login-timeout-seconds=7 --datasource-config-properties={'name':'prop1','value':'value1','type':'java.lang.String'} --managed-conn-factory-class=" + + ManagedConnectionFactoryForTesting.class.getName()) + .statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1"); + + gfsh.executeAndAssertThat("describe jndi-binding --name=jndi-managed").statusIsSuccess() + .tableHasRowWithValues("Property", "Value", "jndi-name", "jndi-managed") + .tableHasRowWithValues("Property", "Value", "type", "ManagedDataSource") + .tableHasRowWithValues("Property", "Value", "jdbc-driver-class", + "org.apache.derby.jdbc.EmbeddedDriver") + .tableHasRowWithValues("Property", "Value", "user-name", "") + .tableHasRowWithValues("Property", "Value", "connection-url", + "jdbc:derby:newDB;create=true") + .tableHasRowWithValues("Property", "Value", "managed-conn-factory-class", + ManagedConnectionFactoryForTesting.class.getName()) + .tableHasRowWithValues("Property", "Value", "init-pool-size", "1") + .tableHasRowWithValues("Property", "Value", "max-pool-size", "10") + .tableHasRowWithValues("Property", "Value", "idle-timeout-seconds", "2") + .tableHasRowWithValues("Property", "Value", "blocking-timeout-seconds", "11") + .tableHasRowWithValues("Property", "Value", "login-timeout-seconds", "7") + .tableHasRowWithValues("Property", "Value", "prop1", "value1"); + } + + @Test + public void describeJndiBindingForPooledDataSource() { + gfsh.executeAndAssertThat( + "create jndi-binding --name=jndi-pooled --type=POOLED --jdbc-driver-class=org.apache.derby.jdbc.EmbeddedDriver --connection-url=\"jdbc:derby:newDB;create=true\" --conn-pooled-datasource-class=org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource --init-pool-size=1 --max-pool-size=10 --idle-timeout-seconds=2 --blocking-timeout-seconds=11 --login-timeout-seconds=7 --datasource-config-properties={'name':'prop1','value':'value1','type':'java.lang.String'}") + .statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1"); + + gfsh.executeAndAssertThat("describe jndi-binding --name=jndi-pooled").statusIsSuccess() + .tableHasRowWithValues("Property", "Value", "jndi-name", "jndi-pooled") + .tableHasRowWithValues("Property", "Value", "type", "PooledDataSource") + .tableHasRowWithValues("Property", "Value", "jdbc-driver-class", + "org.apache.derby.jdbc.EmbeddedDriver") + .tableHasRowWithValues("Property", "Value", "user-name", "") + .tableHasRowWithValues("Property", "Value", "connection-url", + "jdbc:derby:newDB;create=true") + .tableHasRowWithValues("Property", "Value", "conn-pooled-datasource-class", + "org.apache.derby.jdbc.EmbeddedConnectionPoolDataSource") + .tableHasRowWithValues("Property", "Value", "init-pool-size", "1") + .tableHasRowWithValues("Property", "Value", "max-pool-size", "10") + .tableHasRowWithValues("Property", "Value", "idle-timeout-seconds", "2") + .tableHasRowWithValues("Property", "Value", "blocking-timeout-seconds", "11") + .tableHasRowWithValues("Property", "Value", "login-timeout-seconds", "7") + .tableHasRowWithValues("Property", "Value", "prop1", "value1"); + } + + @Test + public void describeJndiBindingForXAPooledDataSource() { + gfsh.executeAndAssertThat( + "create jndi-binding --name=jndi-xapooled --type=XAPOOLED --jdbc-driver-class=org.apache.derby.jdbc.EmbeddedDriver --connection-url=\"jdbc:derby:newDB;create=true\" --xa-datasource-class=org.apache.derby.jdbc.EmbeddedXADataSource --init-pool-size=1 --max-pool-size=10 --idle-timeout-seconds=2 --blocking-timeout-seconds=11 --login-timeout-seconds=7 --datasource-config-properties={'name':'prop1','value':'value1','type':'java.lang.String'}") + .statusIsSuccess().tableHasColumnOnlyWithValues("Member", "server-1"); + + gfsh.executeAndAssertThat("describe jndi-binding --name=jndi-xapooled").statusIsSuccess() + .tableHasRowWithValues("Property", "Value", "jndi-name", "jndi-xapooled") + .tableHasRowWithValues("Property", "Value", "type", "XAPooledDataSource") + .tableHasRowWithValues("Property", "Value", "jdbc-driver-class", + "org.apache.derby.jdbc.EmbeddedDriver") + .tableHasRowWithValues("Property", "Value", "user-name", "") + .tableHasRowWithValues("Property", "Value", "connection-url", + "jdbc:derby:newDB;create=true") + .tableHasRowWithValues("Property", "Value", "xa-datasource-class", + "org.apache.derby.jdbc.EmbeddedXADataSource") + .tableHasRowWithValues("Property", "Value", "init-pool-size", "1") + .tableHasRowWithValues("Property", "Value", "max-pool-size", "10") + .tableHasRowWithValues("Property", "Value", "idle-timeout-seconds", "2") + .tableHasRowWithValues("Property", "Value", "blocking-timeout-seconds", "11") + .tableHasRowWithValues("Property", "Value", "login-timeout-seconds", "7") + .tableHasRowWithValues("Property", "Value", "prop1", "value1"); + } +} diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ManagedConnectionFactoryForTesting.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ManagedConnectionFactoryForTesting.java new file mode 100644 index 000000000000..916b3da81413 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ManagedConnectionFactoryForTesting.java @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.apache.geode.management.internal.cli.commands; + +import java.io.PrintWriter; +import java.util.Set; + +import javax.resource.ResourceException; +import javax.resource.spi.ConnectionManager; +import javax.resource.spi.ConnectionRequestInfo; +import javax.resource.spi.ManagedConnection; +import javax.resource.spi.ManagedConnectionFactory; +import javax.security.auth.Subject; + +public class ManagedConnectionFactoryForTesting implements ManagedConnectionFactory { + @Override + public Object createConnectionFactory(ConnectionManager cxManager) throws ResourceException { + return null; + } + + @Override + public Object createConnectionFactory() throws ResourceException { + return null; + } + + @Override + public ManagedConnection createManagedConnection(Subject subject, + ConnectionRequestInfo cxRequestInfo) throws ResourceException { + return null; + } + + @Override + public ManagedConnection matchManagedConnections(Set connectionSet, Subject subject, + ConnectionRequestInfo cxRequestInfo) throws ResourceException { + return null; + } + + @Override + public void setLogWriter(PrintWriter out) throws ResourceException {} + + @Override + public PrintWriter getLogWriter() throws ResourceException { + return null; + } +} From 846e58676cc77d484948aacc61455d02b08de505 Mon Sep 17 00:00:00 2001 From: Jens Deppe Date: Thu, 22 Mar 2018 10:00:29 -0700 Subject: [PATCH 07/15] GEODE-4386: Fix compilation issue --- .../internal/cli/commands/DescribeJndiBindingCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java index b7d860f3896d..787d23e8aea3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java @@ -49,7 +49,7 @@ public Result describeJndiBinding(@CliOption(key = "name", mandatory = true, Result result = null; TabularResultData tabularData = ResultBuilder.createTabularResultData(); - InternalClusterConfigurationService ccService = getSharedConfiguration(); + InternalClusterConfigurationService ccService = getConfigurationService(); if (ccService != null) { CacheConfig cacheConfig = ccService.getCacheConfig("cluster"); List jndiBindings = cacheConfig.getJndiBindings(); From 7c27d885fff84fa7a736299ed7ddc62137e112a3 Mon Sep 17 00:00:00 2001 From: Lynn Hughes-Godfrey Date: Fri, 16 Mar 2018 16:47:55 -0700 Subject: [PATCH 08/15] GEODE-4881: Support lucene reindexing (of existing data) with rebalance * LuceneServiceImpl changes to support AEQ addition to existing region (after index initialized) * Testing with and without redundancy --- .../lucene/internal/LuceneServiceImpl.java | 12 +- ...thRegionCreatedBeforeReindexDUnitTest.java | 344 ++++++++++++++++++ 2 files changed, 350 insertions(+), 6 deletions(-) create mode 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java index 5d0ea484d64f..01bc5c625b3a 100644 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java @@ -224,18 +224,15 @@ private void createIndexOnExistingRegion(PartitionedRegion region, String indexN LuceneSerializer serializer) { validateRegionAttributes(region.getAttributes()); - String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, regionPath); - region.addCacheServiceProfile(new LuceneIndexCreationProfile(indexName, regionPath, fields, analyzer, fieldAnalyzers, serializer)); + String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, regionPath); LuceneIndexImpl luceneIndex = beforeDataRegionCreated(indexName, regionPath, region.getAttributes(), analyzer, fieldAnalyzers, aeqId, serializer, fields); afterDataRegionCreated(luceneIndex); - region.addAsyncEventQueueId(aeqId, true); - createLuceneIndexOnDataRegion(region, luceneIndex); } @@ -309,15 +306,18 @@ static void validateRegionAttributes(RegionAttributes attrs) { */ public void afterDataRegionCreated(InternalLuceneIndex index) { index.initialize(); - registerIndex(index); + if (this.managementListener != null) { this.managementListener.afterIndexCreated(index); } + String aeqId = LuceneServiceImpl.getUniqueIndexName(index.getName(), index.getRegionPath()); + + ((LuceneIndexImpl) index).getDataRegion().addAsyncEventQueueId(aeqId, true); PartitionedRepositoryManager repositoryManager = (PartitionedRepositoryManager) index.getRepositoryManager(); repositoryManager.allowRepositoryComputation(); - + registerIndex(index); } public LuceneIndexImpl beforeDataRegionCreated(final String indexName, final String regionPath, diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java new file mode 100644 index 000000000000..866dda180dfa --- /dev/null +++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java @@ -0,0 +1,344 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.cache.lucene; + +import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME; +import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME; + +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; + +import junitparams.JUnitParamsRunner; +import junitparams.Parameters; +import org.apache.logging.log4j.Logger; +import org.awaitility.Awaitility; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; + +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.control.RebalanceFactory; +import org.apache.geode.cache.control.RebalanceOperation; +import org.apache.geode.cache.control.RebalanceResults; +import org.apache.geode.cache.control.ResourceManager; +import org.apache.geode.cache.lucene.internal.LuceneIndexFactoryImpl; +import org.apache.geode.cache.lucene.internal.LuceneServiceImpl; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRebalanceInfo; +import org.apache.geode.cache.partition.PartitionRegionInfo; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.test.dunit.AsyncInvocation; +import org.apache.geode.test.dunit.Host; +import org.apache.geode.test.dunit.SerializableRunnable; +import org.apache.geode.test.dunit.SerializableRunnableIF; +import org.apache.geode.test.dunit.VM; +import org.apache.geode.test.junit.categories.DistributedTest; +import org.apache.geode.test.junit.categories.LuceneTest; + +@Category({DistributedTest.class, LuceneTest.class}) +@RunWith(JUnitParamsRunner.class) +public class RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest + extends LuceneQueriesAccessorBase { + + private static final Logger logger = LogService.getLogger(); + + protected VM dataStore3; + protected VM dataStore4; + + public void postSetUp() throws Exception { + super.postSetUp(); + dataStore3 = Host.getHost(0).getVM(2); + dataStore4 = Host.getHost(0).getVM(3); + } + + @Before + public void setNumBuckets() { + NUM_BUCKETS = 113; + } + + @Before + public void setLuceneReindexFlag() { + dataStore1.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true); + dataStore2.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true); + dataStore3.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true); + dataStore4.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true); + } + + @Override + protected RegionTestableType[] getListOfRegionTestTypes() { + return new RegionTestableType[] {RegionTestableType.PARTITION, + RegionTestableType.PARTITION_REDUNDANT}; + } + + @After + public void clearLuceneReindexFlag() { + dataStore1.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false); + dataStore2.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false); + dataStore3.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false); + dataStore4.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false); + } + + protected SerializableRunnable createIndex = new SerializableRunnable("createIndex") { + public void run() { + LuceneService luceneService = LuceneServiceProvider.get(getCache()); + ((LuceneIndexFactoryImpl) luceneService.createIndexFactory()).addField("text") + .create(INDEX_NAME, REGION_NAME, LuceneServiceImpl.LUCENE_REINDEX); + } + }; + + protected SerializableRunnable rebalance = new SerializableRunnable("rebalance") { + public void run() throws InterruptedException { + Cache cache = getCache(); + cache.getRegion(REGION_NAME); + + ResourceManager resMan = cache.getResourceManager(); + RebalanceFactory factory = resMan.createRebalanceFactory(); + logger.info("Starting rebalance"); + RebalanceResults rebalanceResults = null; + RebalanceOperation rebalanceOp = factory.start(); + rebalanceResults = rebalanceOp.getResults(); + Awaitility.await().atMost(60, TimeUnit.SECONDS).until(() -> rebalanceOp.isDone()); + logger.info("Rebalance completed: " + + RebalanceResultsToString(rebalanceResults, "Rebalance completed")); + } + }; + + protected SerializableRunnable doConcOps = new SerializableRunnable("doConcOps") { + public void run() { + putEntryInEachBucket(113); + } + }; + + protected void createIndexAndRebalance(RegionTestableType regionTestType, + SerializableRunnableIF createIndex, boolean doOps) throws Exception { + + // give rebalance some work to do by adding another vm + // dataStore4.invoke(() -> (createIndex)); + dataStore4.invoke(() -> initDataStore(regionTestType)); + + AsyncInvocation aiRebalancer = dataStore1.invokeAsync(rebalance); + + if (doOps) { + AsyncInvocation aiConcOps = dataStore1.invokeAsync(doConcOps); + aiConcOps.join(); + aiConcOps.checkException(); + } + + // re-index stored data + AsyncInvocation ai1 = dataStore1.invokeAsync(createIndex); + AsyncInvocation ai2 = dataStore2.invokeAsync(createIndex); + AsyncInvocation ai3 = dataStore3.invokeAsync(createIndex); + AsyncInvocation ai4 = dataStore4.invokeAsync(createIndex); + + aiRebalancer.join(); + aiRebalancer.checkException(); + + ai1.join(); + ai2.join(); + ai3.join(); + ai4.join(); + + ai1.checkException(); + ai2.checkException(); + ai3.checkException(); + ai4.checkException(); + + } + + @Test + @Parameters(method = "getListOfRegionTestTypes") + public void returnCorrectResultsWithConcurrentOpsAndRebalance(RegionTestableType regionTestType) + throws Exception { + + createAndPopulateRegion(regionTestType, NUM_BUCKETS / 2); + + createIndexAndRebalance(regionTestType, createIndex, true); + + executeTextSearch(dataStore3, "world", "text", NUM_BUCKETS); + + } + + private void createAndPopulateRegion(RegionTestableType regionTestType, int numEntries) { + + dataStore1.invoke(() -> initDataStore(regionTestType)); + dataStore2.invoke(() -> initDataStore(regionTestType)); + dataStore3.invoke(() -> initDataStore(regionTestType)); + + putEntryInEachBucket(numEntries); + } + + protected void putEntryInEachBucket(int numBuckets) { + dataStore3.invoke(() -> { + final Cache cache = getCache(); + Region region = cache.getRegion(REGION_NAME); + IntStream.range(0, numBuckets).forEach(i -> region.put(i, new TestObject("hello world"))); + }); + } + + public static String RebalanceResultsToString(RebalanceResults results, String title) { + if (results == null) { + return "null"; + } + StringBuffer aStr = new StringBuffer(); + aStr.append("Rebalance results (" + title + ") totalTime: " + + valueToString(results.getTotalTime()) + "\n"); + + // bucketCreates + aStr.append( + "totalBucketCreatesCompleted: " + valueToString(results.getTotalBucketCreatesCompleted())); + aStr.append(" totalBucketCreateBytes: " + valueToString(results.getTotalBucketCreateBytes())); + aStr.append( + " totalBucketCreateTime: " + valueToString(results.getTotalBucketCreateTime()) + "\n"); + + // bucketTransfers + aStr.append("totalBucketTransfersCompleted: " + + valueToString(results.getTotalBucketTransfersCompleted())); + aStr.append( + " totalBucketTransferBytes: " + valueToString(results.getTotalBucketTransferBytes())); + aStr.append( + " totalBucketTransferTime: " + valueToString(results.getTotalBucketTransferTime()) + "\n"); + + // primaryTransfers + aStr.append("totalPrimaryTransfersCompleted: " + + valueToString(results.getTotalPrimaryTransfersCompleted())); + aStr.append(" totalPrimaryTransferTime: " + valueToString(results.getTotalPrimaryTransferTime()) + + "\n"); + + // PartitionRebalanceDetails (per region) + Set prdSet = results.getPartitionRebalanceDetails(); + for (PartitionRebalanceInfo prd : prdSet) { + aStr.append(partitionRebalanceDetailsToString(prd)); + } + aStr.append("total time (ms): " + valueToString(results.getTotalTime())); + + String returnStr = aStr.toString(); + return returnStr; + } + + private static String partitionRebalanceDetailsToString(PartitionRebalanceInfo details) { + if (details == null) { + return "null\n"; + } + + StringBuffer aStr = new StringBuffer(); + aStr.append("PartitionedRegionDetails for region named " + getRegionName(details) + " time: " + + valueToString(details.getTime()) + "\n"); + + // bucketCreates + aStr.append("bucketCreatesCompleted: " + valueToString(details.getBucketCreatesCompleted())); + aStr.append(" bucketCreateBytes: " + valueToString(details.getBucketCreateBytes())); + aStr.append(" bucketCreateTime: " + valueToString(details.getBucketCreateTime()) + "\n"); + + // bucketTransfers + aStr.append( + "bucketTransfersCompleted: " + valueToString(details.getBucketTransfersCompleted())); + aStr.append(" bucketTransferBytes: " + valueToString(details.getBucketTransferBytes())); + aStr.append(" bucketTransferTime: " + valueToString(details.getBucketTransferTime()) + "\n"); + + // primaryTransfers + aStr.append( + "PrimaryTransfersCompleted: " + valueToString(details.getPrimaryTransfersCompleted())); + aStr.append(" PrimaryTransferTime: " + valueToString(details.getPrimaryTransferTime()) + "\n"); + + // PartitionMemberDetails (before) + aStr.append("PartitionedMemberDetails (before)\n"); + Set pmdSet = details.getPartitionMemberDetailsBefore(); + for (PartitionMemberInfo pmd : pmdSet) { + aStr.append(partitionMemberDetailsToString(pmd)); + } + + // PartitionMemberDetails (after) + aStr.append("PartitionedMemberDetails (after)\n"); + pmdSet = details.getPartitionMemberDetailsAfter(); + for (PartitionMemberInfo pmd : pmdSet) { + aStr.append(partitionMemberDetailsToString(pmd)); + } + + return aStr.toString(); + } + + public static String partitionedRegionDetailsToString(PartitionRegionInfo prd) { + + if (prd == null) { + return "null\n"; + } + + StringBuffer aStr = new StringBuffer(); + + aStr.append("PartitionedRegionDetails for region named " + getRegionName(prd) + "\n"); + aStr.append(" configuredBucketCount: " + valueToString(prd.getConfiguredBucketCount()) + "\n"); + aStr.append(" createdBucketCount: " + valueToString(prd.getCreatedBucketCount()) + "\n"); + aStr.append( + " lowRedundancyBucketCount: " + valueToString(prd.getLowRedundancyBucketCount()) + "\n"); + aStr.append( + " configuredRedundantCopies: " + valueToString(prd.getConfiguredRedundantCopies()) + "\n"); + aStr.append(" actualRedundantCopies: " + valueToString(prd.getActualRedundantCopies()) + "\n"); + + // memberDetails + Set pmd = prd.getPartitionMemberInfo(); + for (PartitionMemberInfo memberDetails : pmd) { + aStr.append(partitionMemberDetailsToString(memberDetails)); + } + + // colocatedWithDetails + String colocatedWith = prd.getColocatedWith(); + aStr.append(" colocatedWith: " + colocatedWith + "\n"); + + String returnStr = aStr.toString(); + return returnStr; + } + + private static String partitionMemberDetailsToString(PartitionMemberInfo pmd) { + StringBuffer aStr = new StringBuffer(); + long localMaxMemory = pmd.getConfiguredMaxMemory(); + long size = pmd.getSize(); + aStr.append(" Member Details for: " + pmd.getDistributedMember() + "\n"); + aStr.append(" configuredMaxMemory: " + valueToString(localMaxMemory)); + double inUse = (double) size / localMaxMemory; + double heapUtilization = inUse * 100; + aStr.append(" size: " + size + " (" + valueToString(heapUtilization) + "%)"); + aStr.append(" bucketCount: " + valueToString(pmd.getBucketCount())); + aStr.append(" primaryCount: " + valueToString(pmd.getPrimaryCount()) + "\n"); + return aStr.toString(); + } + + /** + * Convert the given long to a String; if it is negative then flag it in the string + */ + private static String valueToString(long value) { + String returnStr = "" + value; + return returnStr; + } + + /** + * Convert the given double to a String; if it is negative then flag it in the string + */ + private static String valueToString(double value) { + String returnStr = "" + value; + return returnStr; + } + + public static String getRegionName(PartitionRegionInfo prd) { + return prd.getRegionPath().substring(1); + } + + public static String getRegionName(PartitionRebalanceInfo prd) { + return prd.getRegionPath().substring(1); + } +} From 7c86962667f834145e31f5f52b9b0962cef96123 Mon Sep 17 00:00:00 2001 From: Jens Deppe Date: Thu, 22 Mar 2018 11:54:37 -0700 Subject: [PATCH 09/15] GEODE-4915: Fix ClusterConfigLocatorRestartDUnitTest intermittent failures (#1664) - Use Awaitility to poll for expected results. --- .../ClusterConfigLocatorRestartDUnitTest.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java index 933da25f45a0..ae67f243ee43 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigLocatorRestartDUnitTest.java @@ -29,6 +29,7 @@ import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper; import org.apache.geode.test.dunit.Host; import org.apache.geode.test.dunit.IgnoredException; +import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; import org.apache.geode.test.junit.categories.DistributedTest; @@ -62,8 +63,10 @@ public void serverRestartsAfterLocatorReconnects() throws Exception { rule.startServerVM(3, locator0.getPort()); gfsh.connectAndVerify(locator0); - gfsh.executeAndAssertThat("list members").statusIsSuccess().tableHasColumnOnlyWithValues("Name", - "locator-0", "server-1", "server-2", "server-3"); + + Awaitility.await().atMost(10, TimeUnit.SECONDS) + .until(() -> gfsh.executeAndAssertThat("list members").statusIsSuccess() + .tableHasColumnOnlyWithValues("Name", "locator-0", "server-1", "server-2", "server-3")); } @Test @@ -86,9 +89,12 @@ public void serverRestartsAfterOneLocatorDies() throws Exception { MemberVM server2 = rule.startServerVM(2, props, locator0.getPort(), locator1.getPort()); MemberVM server3 = rule.startServerVM(3, props, locator0.getPort(), locator1.getPort()); - // Go away and don't come back + // Shut down hard locator0.invokeAsync(() -> System.exit(1)); + // Recover the VM so that subsequent rule cleanup works + locator0.getVM().bounce(); + server3.invokeAsync(() -> MembershipManagerHelper .crashDistributedSystem(InternalDistributedSystem.getConnectedInstance())); @@ -97,11 +103,10 @@ public void serverRestartsAfterOneLocatorDies() throws Exception { rule.startServerVM(4, locator1.getPort(), locator0.getPort()); gfsh.connectAndVerify(locator1); - gfsh.executeAndAssertThat("list members").statusIsSuccess().tableHasColumnOnlyWithValues("Name", - "locator-1", "server-2", "server-3", "server-4"); - // Recover the VM so that subsequent rule cleanup works - Host.getHost(0).getVM(0).bounce(); + Awaitility.await().atMost(10, TimeUnit.SECONDS) + .until(() -> gfsh.executeAndAssertThat("list members").statusIsSuccess() + .tableHasColumnOnlyWithValues("Name", "locator-1", "server-2", "server-3", "server-4")); } private void waitForLocatorToReconnect(MemberVM locator) { From 3f2bae860e6438e5800bd4c7e6bf3945a3c3283c Mon Sep 17 00:00:00 2001 From: "Michael \"Sarge\" Dodge" Date: Fri, 23 Mar 2018 09:32:57 -0700 Subject: [PATCH 10/15] GEODE-3881: Prevent illegal region names in the unit tests. (#1668) --- .../org/apache/geode/redis/GeodeRedisServer.java | 7 +------ .../java/org/apache/geode/redis/SetsJUnitTest.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java index 4087418d74d5..afa66400f8de 100644 --- a/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java +++ b/geode-core/src/main/java/org/apache/geode/redis/GeodeRedisServer.java @@ -144,7 +144,6 @@ @Experimental public class GeodeRedisServer { - /** * Thread used to start main method */ @@ -236,7 +235,7 @@ public class GeodeRedisServer { * The field that defines the name of the {@link Region} which holds all of the Redis meta data. * The current value of this field is {@code REDIS_META_DATA_REGION}. */ - public static final String REDIS_META_DATA_REGION = "__ReDiS_MeTa_DaTa"; + public static final String REDIS_META_DATA_REGION = "ReDiS_MeTa_DaTa"; /** * The system property name used to set the default {@link Region} creation type. The property @@ -493,7 +492,6 @@ public Thread newThread(Runnable r) { t.setDaemon(true); return t; } - }; ThreadFactory workerThreadFactory = new ThreadFactory() { @@ -505,7 +503,6 @@ public Thread newThread(Runnable r) { t.setName("GeodeRedisServer-WorkerThread-" + counter.incrementAndGet()); return t; } - }; bossGroup = null; @@ -596,7 +593,6 @@ private void afterKeyDestroy(EntryEvent event) { } private class MetaCacheListener extends CacheListenerAdapter { - @Override public void afterCreate(EntryEvent event) { afterKeyCreate(event); @@ -735,5 +731,4 @@ private static String getLogLevel(String arg) { } return logLevel; } - } diff --git a/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java index 21225706e1ef..e1792585500c 100755 --- a/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/redis/SetsJUnitTest.java @@ -40,7 +40,6 @@ @Category(IntegrationTest.class) public class SetsJUnitTest { - private static Jedis jedis; private static GeodeRedisServer server; private static GemFireCache cache; @@ -51,7 +50,6 @@ public class SetsJUnitTest { public static void setUp() throws IOException { rand = new Random(); CacheFactory cf = new CacheFactory(); - // cf.set("log-file", "redis.log"); cf.set(LOG_LEVEL, "error"); cf.set(MCAST_PORT, "0"); cf.set(LOCATORS, ""); @@ -160,7 +158,6 @@ public void testSDiffAndStore() { Set destResult = jedis.smembers(destination); assertEquals(result, destResult); - } @Test @@ -196,7 +193,6 @@ public void testSUnionAndStore() { Set destResult = jedis.smembers(destination); assertEquals(result, destResult); - } @Test @@ -232,16 +228,18 @@ public void testSInterAndStore() { Set destResult = jedis.smembers(destination); assertEquals(result, destResult); - } private String randString() { int length = rand.nextInt(8) + 5; StringBuilder rString = new StringBuilder(); - for (int i = 0; i < length; i++) - rString.append((char) (rand.nextInt(57) + 65)); + for (int i = 0; i < length; i++) { + // Use random upper- and lower-case letters only. Using punctuation characters, + // namely the underscore, can lead to spurious test failures due to invalid region + // names, e.g., two leading underscores. + rString.append((char) (65 + rand.nextInt(26) + (rand.nextBoolean() ? 26 : 0))); + } return rString.toString(); - // return Long.toHexString(Double.doubleToLongBits(Math.random())); } @After From 1b66a6506f27700377aacb898705305fe9c10555 Mon Sep 17 00:00:00 2001 From: "Michael \"Sarge\" Dodge" Date: Fri, 23 Mar 2018 09:33:12 -0700 Subject: [PATCH 11/15] GEODE-4749: Remove method bytecodes from serializable analysis. (#1660) - Modify the class-and-method details to elide method byte codes. - Update the sanctioned data serializables to no longer contain the actual method bytecodes. --- .../codeAnalysis/ClassAndMethodDetails.java | 56 +- .../codeAnalysis/CompiledClassUtils.java | 33 +- .../sanctionedDataSerializables.txt | 2160 ++++++++--------- .../sanctionedDataSerializables.txt | 4 +- .../sanctionedDataSerializables.txt | 60 +- .../sanctionedDataSerializables.txt | 28 +- 6 files changed, 1148 insertions(+), 1193 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethodDetails.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethodDetails.java index f42f4ec0c472..d0e0d664c2f4 100644 --- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethodDetails.java +++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/ClassAndMethodDetails.java @@ -22,20 +22,17 @@ import java.util.List; import java.util.Map; -import org.apache.geode.codeAnalysis.decode.CompiledClass; import org.apache.geode.codeAnalysis.decode.CompiledCode; import org.apache.geode.codeAnalysis.decode.CompiledMethod; /** - * A class used to store the names of dataserializable classes and the sizes of their + * A class used to store the names of data-serializable classes and the sizes of their * toData/fromData methods. */ public class ClassAndMethodDetails implements Comparable { - static String[] hexChars; - - public String className; - public Map methodCode = new HashMap(); + String className; + Map methods = new HashMap<>(); static { String[] digits = new String[] {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", @@ -47,12 +44,10 @@ public class ClassAndMethodDetails implements Comparable { } } - public ClassAndMethodDetails(CompiledClass dclass) { - this.className = dclass.fullyQualifiedName(); + private ClassAndMethodDetails() { + // Do nothing. } - private ClassAndMethodDetails() {} - public static ClassAndMethodDetails create(LineNumberReader in) throws IOException { String line; while ((line = in.readLine()) != null) { @@ -75,20 +70,11 @@ public static ClassAndMethodDetails create(LineNumberReader in) throws IOExcepti fields = line.split(","); String methodName = fields[0]; int codeLength = Integer.parseInt(fields[1]); - String codeString = fields[2].trim(); - int codeStringLength = codeString.length(); - if (codeStringLength != codeLength * 2) { - System.err.println("Code string has been tampered with on line " + in.getLineNumber()); + if (fields.length != 2) { + System.err.println("Method detail has been tampered with on line " + in.getLineNumber()); continue; } - byte[] code = new byte[codeLength]; - int codeIdx = 0; - for (int j = 0; j < codeStringLength; j += 2) { - String substr = codeString.substring(j, j + 2); - // System.out.println("parsing " + j + ": '" + substr + "'"); - code[codeIdx++] = (byte) (0xff & Integer.parseInt(substr, 16)); - } - instance.methodCode.put(methodName, code); + instance.methods.put(methodName, codeLength); } return instance; } catch (Exception e) { @@ -96,23 +82,6 @@ public static ClassAndMethodDetails create(LineNumberReader in) throws IOExcepti } } - /** - * returns a string that can be parsed by ClassAndMethodDetails(String) - */ - public String valuesAsString() { - StringBuilder sb = new StringBuilder(80); - sb.append(className).append(',').append(methodCode.size()).append("\n"); - for (Map.Entry entry : methodCode.entrySet()) { - sb.append(entry.getKey()).append(','); - byte[] code = entry.getValue(); - for (int i = 0; i < code.length; i++) { - sb.append(hexChars[(code[i] & 0xff)]); - } - sb.append("\n"); - } - return sb.toString(); - } - /** * convert a ClassAndMethods into a string that can then be used to instantiate a * ClassAndMethodDetails @@ -138,7 +107,14 @@ public static String convertForStoring(ClassAndMethods cam) { @Override public String toString() { - return valuesAsString(); + StringBuilder sb = new StringBuilder(80); + sb.append(className).append(',').append(methods.size()).append("\n"); + for (Map.Entry entry : methods.entrySet()) { + sb.append(entry.getKey()).append(','); + sb.append(entry.getValue()); + sb.append("\n"); + } + return sb.toString(); } @Override diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java index 7d63037960af..318dbac87d2c 100644 --- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java +++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/CompiledClassUtils.java @@ -37,8 +37,6 @@ import org.apache.geode.codeAnalysis.decode.CompiledField; import org.apache.geode.codeAnalysis.decode.CompiledMethod; - - public class CompiledClassUtils { /** * Parse the given class files and return a map of name->Dclass. Any IO exceptions are consumed by @@ -193,7 +191,7 @@ public static String diffSortedClassesAndMethods(List gol if (comparison == 0) { ClassAndMethods nc = newclass; newclass = null; - if (gold.methodCode.size() != nc.numMethods()) { + if (gold.methods.size() != nc.numMethods()) { changedClassesSb.append(nc).append(": method count\n"); continue; } @@ -201,7 +199,7 @@ public static String diffSortedClassesAndMethods(List gol for (Map.Entry entry : nc.methods.entrySet()) { CompiledMethod method = entry.getValue(); String name = method.name(); - byte[] goldCode = gold.methodCode.get(name); + Integer goldCode = gold.methods.get(name); if (goldCode == null) { if (comma) { changedClassesSb.append(", and "); @@ -212,19 +210,19 @@ public static String diffSortedClassesAndMethods(List gol changedClassesSb.append(name).append(" was added"); continue; // only report one diff per class } - String diff; - if ((diff = codeDiff(goldCode, method.getCode().code)) != null) { + if (goldCode != method.getCode().code.length) { if (comma) { changedClassesSb.append(", and "); } else { changedClassesSb.append(nc).append(": "); comma = true; } - changedClassesSb.append(name).append(diff); + changedClassesSb.append(name) + .append(" (len=" + method.getCode().code.length + ",expected=" + goldCode + ")"); continue; } } - for (Map.Entry entry : gold.methodCode.entrySet()) { + for (Map.Entry entry : gold.methods.entrySet()) { if (!nc.methods.containsKey(entry.getKey())) { if (comma) { changedClassesSb.append(", and "); @@ -256,8 +254,6 @@ public static String diffSortedClassesAndMethods(List gol return result; } - - public static void storeClassesAndMethods(List cams, File file) throws IOException { FileWriter fw = new FileWriter(file); @@ -270,20 +266,6 @@ public static void storeClassesAndMethods(List cams, File file) out.close(); } - static String codeDiff(byte[] method1, byte[] method2) { - if (method1.length != method2.length) { - return " (len=" + method2.length + ",expected=" + method1.length + ")"; - } - // for (int i=0; i loadClassesAndVariables(File file) throws IOException { List result = new LinkedList(); @@ -418,8 +400,6 @@ public static String diffSortedClassesAndVariables(List return result; } - - public static void storeClassesAndVariables(List cams, File file) throws IOException { FileWriter fw = new FileWriter(file); @@ -431,5 +411,4 @@ public static void storeClassesAndVariables(List cams, File f out.flush(); out.close(); } - } diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt index 2d415769a84b..c2e98ee1f03a 100644 --- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt +++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt @@ -1,2143 +1,2143 @@ org/apache/geode/admin/RegionSubRegionSnapshot,2 -fromData,62,2a2bb80023b500082a2bb900240100b5000b2a2bb80025b500052ab40005b9002601004d2cb9002701009900132cb900280100c000292ab6001ba7ffeab1 -toData,30,2ab400082bb800202b2ab4000bb9002102002ab40005c000032bb80022b1 +fromData,62 +toData,30 org/apache/geode/admin/internal/SystemMemberCacheEventProcessor$SystemMemberCacheMessage,2 -fromData,27,2a2bb7001a2a2bb8001bb5000c2a2bb9001c0100b8001db5000fb1 -toData,27,2a2bb7001e2ab4000c2bb8001f2b2ab4000fb40020b900210200b1 +fromData,27 +toData,27 org/apache/geode/admin/jmx/internal/StatAlertNotification,2 -fromData,39,2a2bb8002ab600032a2bb8002bb600072a2bb8002cc0002dc0002db600052a2bb8002eb50008b1 -toData,33,2ab600162bb800262ab600202bb800272ab6000e2bb800282ab400082bb80029b1 +fromData,39 +toData,33 org/apache/geode/cache/ExpirationAttributes,2 -fromData,22,2a2bb900120100b500022a2bb80013c00014b50004b1 -toData,19,2b2ab40002b9001502002ab400042bb80016b1 +fromData,22 +toData,19 org/apache/geode/cache/MembershipAttributes,2 -fromData,39,2a2a2bb80032b7000bb500032a2bb900330100b80034b500052a2bb900330100b80035b50007b1 -toData,89,2ab40003b9002c0100bd002d4d2ab40003b9002101004e03360415042cbea2001b2c15042db900240100c00025b90026010053840401a7ffe42c2bb8002e2b2ab40005b4002fb9003002002b2ab40007b40031b900300200b1 +fromData,39 +toData,89 org/apache/geode/cache/SubscriptionAttributes,2 -fromData,14,2a2bb9000f0100b80010b50003b1 -toData,14,2b2ab40003b4000db9000e0200b1 +fromData,14 +toData,14 org/apache/geode/cache/client/internal/CacheServerLoadMessage,2 -fromData,52,2a2bb7000d2abb000e59b7000fb500022ab400022bb800102abb001159b70012b500032ab400032bb800102a2bb80013b50004b1 -toData,30,2a2bb700142ab400022bb800152ab400032bb800152ab400042bb80016b1 +fromData,52 +toData,30 org/apache/geode/cache/client/internal/locator/ClientConnectionRequest,2 -fromData,14,2a2bb700042a2bb80005b50003b1 -toData,14,2a2bb700062ab400032bb80007b1 +fromData,14 +toData,14 org/apache/geode/cache/client/internal/locator/ClientConnectionResponse,2 -fromData,35,2a2bb80004b500022ab400029900162abb000559b70006b500032ab400032bb60007b1 -toData,31,2ab40003c6000704a70004033d1c2bb800081c99000b2ab400032bb60009b1 +fromData,35 +toData,31 org/apache/geode/cache/client/internal/locator/ClientReplacementRequest,2 -fromData,25,2a2bb700042abb000559b70006b500032ab400032bb80007b1 -toData,14,2a2bb700082ab400032bb80009b1 +fromData,25 +toData,14 org/apache/geode/cache/client/internal/locator/GetAllServersRequest,2 -fromData,6,2a2bb70003b1 -toData,6,2a2bb70004b1 +fromData,6 +toData,6 org/apache/geode/cache/client/internal/locator/GetAllServersResponse,2 -fromData,31,2a2bb80005b500032ab40003c600122ab40003b600049a00082a04b50002b1 -toData,9,2ab400032bb80006b1 +fromData,31 +toData,9 org/apache/geode/cache/client/internal/locator/LocatorListResponse,2 -fromData,43,2a2bb80006b500032a2bb900070100b500052ab40003c600142ab40003b9000401009a00082a04b50002b1 -toData,19,2ab400032bb800082b2ab40005b900090200b1 +fromData,43 +toData,19 org/apache/geode/cache/client/internal/locator/LocatorStatusResponse,2 -fromData,56,2a2bb6001f2a2bb600202a2bb600212a2bb600222a2bb600232a2bb600242a2bb600252a2bb600262a2bb600272a2bb600282a2bb60029b1 -toData,56,2a2bb600312a2bb600322a2bb600332a2bb600342a2bb600352a2bb600362a2bb600372a2bb600382a2bb600392a2bb6003a2a2bb6003bb1 +fromData,56 +toData,56 org/apache/geode/cache/client/internal/locator/QueueConnectionRequest,2 -fromData,40,2a2bb700072a2bb80008b500042a2bb80009b500062a2bb8000ab500052a2bb9000b0100b50002b1 -toData,40,2a2bb7000c2ab400042bb8000d2ab400062bb8000e2ab400052bb8000f2b2ab40002b900100200b1 +fromData,40 +toData,40 org/apache/geode/cache/client/internal/locator/QueueConnectionResponse,2 -fromData,41,2a2bb80006b500032a2bb80007b500042ab40004c600142ab40004b9000501009a00082a04b50002b1 -toData,17,2ab400032bb800082ab400042bb80009b1 +fromData,41 +toData,17 org/apache/geode/cache/client/internal/locator/ServerLocationRequest,2 -fromData,9,2a2bb80003b50002b1 -toData,9,2ab400022bb80004b1 +fromData,9 +toData,9 org/apache/geode/cache/query/internal/CqEntry,2 -fromData,17,2a2bb80009b500022a2bb80009b50003b1 -toData,17,2ab400022bb8000b2ab400032bb8000bb1 +fromData,17 +toData,17 org/apache/geode/cache/query/internal/CumulativeNonDistinctResults,2 -fromData,126,2bb8001dc0001e4d2abb00035912042cb70005b500012cb9001f01003e2bb90020010037042abb001a59160488b70021b5000816043706160609949e00421d9900232bb800223a082ab40008bb0023592cc000241908b70025b90026020057a700152bb8001d3a082ab400081908b9002602005716060a653706a7ffbdb1 -toData,125,2ab40001b900280100b9001f01003d2ab40001b9002801002bb80029bb002a5911040001b7002b4e2db6002c3a042ab600143a050336061905b9001501009900311905b9001601003a071c9900181907c0002db9002e01003a0819082bb8002fa7000919072db80029840601a7ffcb1904150685b600302d2bb60031b1 +fromData,126 +toData,125 org/apache/geode/cache/query/internal/LinkedResultSet,2 -fromData,40,2bb9001501003d2a2bb80016c00017b500071c3e1d9e00122a2bb80016b60018578403ffa7fff0b1 -toData,46,2b2ab60019b9001a02002ab400072bb8001b2ab6001c4d2cb9001d01009900102cb9001e01002bb8001ba7ffedb1 +fromData,40 +toData,46 org/apache/geode/cache/query/internal/LinkedStructSet,2 -fromData,68,2a2bb900300100b500022bb9003101003d2a2bb80032c00020b500071c3e1d9e00242bb80032c000333a042abb000c592ab400071904b70034b60035578403ffa7ffdeb1 -toData,66,2b2ab40002b9003702002b2ab60038b9003902002ab400072bb8003a2ab600284d2cb90029010099001a2cb9002a0100c000124e2db9003b01002bb8003aa7ffe3b1 +fromData,68 +toData,66 org/apache/geode/cache/query/internal/NWayMergeResults,2 -fromData,134,2bb8001ec0001f4d2abb00045912202cb70006b500022cb9002101003e2a2bb80022b500012bb90023010037042abb001b59160488b70024b5000916043706160609949e00421d9900232bb800253a082ab40009bb0026592cc000271908b70028b90029020057a700152bb8001e3a082ab400091908b9002902005716060a653706a7ffbdb1 -toData,133,2ab40002b9002b0100b9002101003d2ab40002b9002b01002bb8002c2ab400012bb8002dbb002e5911040001b7002f4e2db600303a042ab600153a050336061905b9001601009900311905b9001701003a071c9900181907c00031b9003201003a0819082bb80033a7000919072db8002c840601a7ffcb1904150685b600342d2bb60035b1 +fromData,134 +toData,133 org/apache/geode/cache/query/internal/NullToken,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/cache/query/internal/PRQueryTraceInfo,2 -fromData,29,2a2bb900090100b500042a2bb9000a0100b500062a2bb8000bb50003b1 -toData,29,2b2ab40004b9000502002b2ab40006b9000702002ab400032bb80008b1 +fromData,29 +toData,29 org/apache/geode/cache/query/internal/ResultsBag,2 -fromData,106,2a2bb80018c00019b5001a2a2bb9001b0100b50017b2001c9a00162ab400179c000fbb001d592ab40017b7001ebf2a2ab6001fb500042a2bb600202ab400172ab40021643d1c9e00232bb800184e2bb9001b010036042ab400042d1504b60022571c1504643da7ffdfb1 -toData,116,2ab4001a2bb800242b2ab60025b9002602002a2bb600272ab600252ab40021643d2ab40004b60028b9002901004e2db9000a010099003f1c9e003b2db9000b0100c0002a3a041904b6002b3a0519052bb800241904b6002c36061c1506a200061c36062b1506b9002602001c1506643da7ffbeb1 +fromData,106 +toData,116 org/apache/geode/cache/query/internal/ResultsCollectionWrapper,2 -fromData,55,2bb9005801003d1c99000e2a2bb80059b50002a7000e2a2bb8005ac0005bb500022a2bb8005ac0005cb5000d2a2bb900580100b50004b1 -toData,60,2ab40002c100543d2b1cb9005502001c9900112ab40002c0004e2bb80056a7000b2ab400022bb800572ab4000d2bb800572b2ab40004b900550200b1 +fromData,55 +toData,60 org/apache/geode/cache/query/internal/ResultsSet,2 -fromData,49,2bb9001801003dbb001959b7001a4e2d2bb8001b2a2db600051c360415049e00122a2bb8001cb6001d578404ffa7ffefb1 -toData,70,2b2ab6001eb9001f02002ab60020b900040100c000194d2cc6000704a70004031221b800222c2bb800232ab600244e2db9002501009900102db9002601002bb80027a7ffedb1 +fromData,49 +toData,70 org/apache/geode/cache/query/internal/SortedResultSet,2 -fromData,40,2bb9001601003d2a2bb80017c00018b500081c3e1d9e00122a2bb80017b60019578403ffa7fff0b1 -toData,46,2b2ab6001ab9001b02002ab400082bb8001c2ab6001d4d2cb9001e01009900102cb9001f01002bb8001ca7ffedb1 +fromData,40 +toData,46 org/apache/geode/cache/query/internal/SortedStructSet,2 -fromData,57,2a2bb900440100b500022bb9004501003d2a2bb80046c00034b500091c3e1d9e00192bb80046c000283a042a1904b60013578403ffa7ffe9b1 -toData,64,2b2ab40002b9004702002b2ab6002bb9004802002ab400092bb800492ab6002c4d2cb9002601009900182cb900270100c00028c000284e2d2bb8004aa7ffe5b1 +fromData,57 +toData,64 org/apache/geode/cache/query/internal/StructBag,2 -fromData,16,2a2bb700482a2bb900490100b50002b1 -toData,16,2a2bb7004a2b2ab40002b9004b0200b1 +fromData,16 +toData,16 org/apache/geode/cache/query/internal/StructImpl,2 -fromData,72,2a2bb80026c00027b500072a2bb80028b500082ab40008c600302ab400084d2cbe3e03360415041da2001f2c1504323a051905c1000999000b2a04b50002a70009840401a7ffe1b1 -toData,17,2ab400072bb800292ab400082bb8002ab1 +fromData,72 +toData,17 org/apache/geode/cache/query/internal/StructSet,2 -fromData,58,2abb000359bb000459b70005b70006b500072bb9005101003d2a2bb80052c00041b5000c1c3e1d9e00122a2bb80052b60031578403ffa7fff0b1 -toData,46,2b2ab6003ab9005302002ab4000c2bb800542ab6004a4d2cb9001201009900102cb9001301002bb80054a7ffedb1 +fromData,58 +toData,46 org/apache/geode/cache/query/internal/Undefined,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/cache/query/internal/index/IndexCreationData,2 -fromData,106,2a2bb9000f0100b500022a2bb9000f0100b500052a2bb9000f0100b500042a2bb900100100b500082bb9001101003d031ca0000d2ab2000cb50003a70019041ca0000d2ab2000eb50003a7000a2ab20012b500032bb9001001003e1d99000d2a2bb9000f0100b50006b1 -toData,122,2b2ab40002b9000a02002b2ab40005b9000a02002b2ab40004b9000a02002b2ab40008b9000b0200b2000c2ab40003a6000d2b03b9000d0200a7001eb2000e2ab40003a6000d2b04b9000d0200a7000a2b05b9000d02002ab40006c600172b04b9000b02002b2ab40006b9000a0200a7000a2b03b9000b0200b1 +fromData,106 +toData,122 org/apache/geode/cache/query/internal/types/CollectionTypeImpl,2 -fromData,17,2a2bb700232a2bb80024c00025b50003b1 -toData,14,2a2bb700262ab400032bb80027b1 +fromData,17 +toData,14 org/apache/geode/cache/query/internal/types/MapTypeImpl,2 -fromData,17,2a2bb7001c2a2bb8001dc00015b50003b1 -toData,14,2a2bb7001e2ab400032bb8001fb1 +fromData,17 +toData,14 org/apache/geode/cache/query/internal/types/ObjectTypeImpl,2 -fromData,9,2a2bb8000ab50002b1 -toData,9,2ab400022bb8000bb1 +fromData,9 +toData,9 org/apache/geode/cache/query/internal/types/StructTypeImpl,2 -fromData,28,2a2bb700292a2bb8002ab5000b2a2bb8002bc0002cc0002cb5000db1 -toData,22,2a2bb7002d2ab4000b2bb8002e2ab4000d2bb8002fb1 +fromData,28 +toData,22 org/apache/geode/cache/server/ServerLoad,2 -fromData,41,2a2bb900070100b500022a2bb900070100b500042a2bb900070100b500032a2bb900070100b50005b1 -toData,41,2b2ab40002b9000602002b2ab40004b9000602002b2ab40003b9000602002b2ab40005b900060200b1 +fromData,41 +toData,41 org/apache/geode/cache/server/internal/ConnectionCountProbe,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/DistributionAdvisor$Profile,2 -fromData,40,2abb001259b70013b500082ab400082bb800142a2bb900150100b500092a2bb900150100b50003b1 -toData,29,2ab400082bb800102b2ab40009b9001102002b2ab40003b900110200b1 +fromData,40 +toData,29 org/apache/geode/distributed/internal/DistributionMessage,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/HighPriorityAckedMessage,2 -fromData,51,2a2bb700442a2bb900450100b500122ab800462bb90045010032b500092a2bb900470100b5000a2a2bb80048c00049b50007b1 -toData,47,2a2bb700402b2ab40012b9004102002b2ab40009b60024b9004102002b2ab4000ab9004202002ab400072bb80043b1 +fromData,51 +toData,47 org/apache/geode/distributed/internal/ReplyMessage,2 -fromData,101,2a2bb7003d2bb9003e01003d2a1c05b8003fb500022a1c1008b8003fb500031c04b8003f99000d2a2bb900400100b500041c07b8003f9900132a2bb80041b500062a04b50007a700141c1040b8003f99000b2a2bb80041b500062a1c1080b8003fb50039b1 -toData,132,2a2bb70038033d2ab400029900081c0580913d2ab4000799000b1c0780913da700102ab40006c600091c104080913d2ab400049900081c0480913d2ab400039900091c100880913d2ab400399900091c108080913d2b1cb9003a02002ab4000499000d2b2ab40004b9003b02002ab400079a000a2ab40006c6000b2ab400062bb8003cb1 +fromData,101 +toData,132 org/apache/geode/distributed/internal/SerialAckedMessage,2 -fromData,27,2a2bb7002c2a2bb9002d0100b500172a2bb8002ec0001fb50007b1 -toData,24,2a2bb700292b2ab40017b9002a02002ab400072bb8002bb1 +fromData,27 +toData,24 org/apache/geode/distributed/internal/ServerLocation,2 -fromData,19,2a2bb8000bb500092a2bb9000c0100b5000ab1 -toData,19,2ab400092bb8000d2b2ab4000ab9000e0200b1 +fromData,19 +toData,19 org/apache/geode/distributed/internal/ShutdownMessage,2 -fromData,27,2a2bb7000c2a2bb9000d0100b500032a2bb8000ec0000fb50002b1 -toData,24,2a2bb700092b2ab40003b9000a02002ab400022bb8000bb1 +fromData,27 +toData,24 org/apache/geode/distributed/internal/StartupMessage,3 -fromDataProblem,38,2ab40037c7000e2abb006559b70066b500372ab400372bb60067572ab400371268b6006757b1 -fromData,293,2a2bb700692a2bb8006ab500092a2bb9006b0100b5000c2a2bb9006c0100b5000d2a2bb9006c0100b500112bb9006b01003d033e1d1ca2003e2bb8006d3a042bb9006b010036051904c6000d19040301011505b8006ea700183a062ab2006f04bd00205903190653b60024b70070840301a7ffc32bb9006b01003e03360415041da200492bb8006d3a052bb8006d3a062bb9006b010036071905c600121906c6000d19051906150703b80071a700183a082ab2007204bd00205903190853b60024b70070840401a7ffb72a2bb80073c00074b500122a2bb9006b0100b500172a2bb8006ab500182a2bb9006c0100b50019bb005e59b7005f3a0419042bb600752a1904b60076b5000a2a1904b60077b5000b2a1904b60078b5000e2a1904b60079b5000fb1 -toData,318,2a2bb7004b2ab400092bb8004c2b2ab4000cb9004d02002b2ab4000db9004e02002b2ab40011b9004e0200b8004f4d2b2cbeb9004d0200033e1d2cbea2001f2c1d32b600502bb800512b2c1d32b60052b9004d0200840301a7ffe1b800534e2b2dbeb9004d020003360415042dbea200782d150432c100549900302d150432c00054b60055b600563a052d150432c00054b60057b600563a062d150432c00054b600583607a700272d150432c00059b6005a3a052d150432c00059b6005b3a062d150432c00059b6005c360719052bb8005119062bb800512b1507b9004d0200840401a7ff872ab400122bb8005d2b2ab40017b9004d02002ab400182bb8004c2b2ab40019b9004e0200bb005e59b7005f3a0419042ab4000ab6006019042ab4000bb6006119042ab4000eb6006219042ab4000fb6006319042bb60064b1 +fromDataProblem,38 +fromData,293 +toData,318 org/apache/geode/distributed/internal/StartupResponseMessage,3 -fromDataProblem,43,2ab40026c7000e2abb003859b70039b500262ab400262bb6003a572ab40026123b123cb8003db6003a57b1 -fromData,220,2a2bb700442a2bb900450100b500202a2bb80046b500092a2bb900470100b5000a2bb9004501003d2a1cbd0013b500032a1cbc0ab50002033e1d1ca200332ab400031d2bb80048532ab400021d2bb9004501004fa700143a042ab400021d2bb9004501004f1904bf840301a7ffce2bb9004501003e2a1dbd0013b500042a1dbd0013b500052a1dbc0ab5000603360415041da2002c2ab4000415042bb80048532ab4000515042bb80048532ab4000615042bb9004501004f840401a7ffd42a2bb80049c0004ab5000c2a2bb900450100b5000e2a2bb80046b50011b1 -toData,170,2a2bb7003e2b2ab40020b9003f02002ab400092bb800402b2ab4000ab9004102002b2ab40002beb9003f0200033d1c2ab40002bea2001f2ab400031c322bb800422b2ab400021c2eb9003f0200840201a7ffde2b2ab40006beb9003f0200033d1c2ab40006bea200292ab400041c322bb800422ab400051c322bb800422b2ab400061c2eb9003f0200840201a7ffd42ab4000c2bb800432b2ab4000eb9003f02002ab400112bb80040b1 +fromDataProblem,43 +fromData,220 +toData,170 org/apache/geode/distributed/internal/StartupResponseWithVersionMessage,2 -fromData,43,2a2bb7001f2a2bb80020b50004bb001a59b7001b4d2c2bb600212a2cb60022b500062a2cb60023b50009b1 -toData,43,2a2bb700182ab400042bb80019bb001a59b7001b4d2c2ab40006b6001c2c2ab40009b6001d2c2bb6001eb1 +fromData,43 +toData,43 org/apache/geode/distributed/internal/WaitForViewInstallation,2 -fromData,26,2a2bb7001c2a2bb9001d0100b500162a2bb9001e0100b50017b1 -toData,26,2a2bb700192b2ab40016b9001a03002b2ab40017b9001b0200b1 +fromData,26 +toData,26 org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryMessage,2 -fromData,42,2a2bb700472a2bb80048b500032a2bb80049b500432a2bb9004a0100b500322a2bb9004b0100b50002b1 -toData,42,2a2bb700412ab400032bb800422ab400432bb800442b2ab40032b9004502002b2ab40002b900460200b1 +fromData,42 +toData,42 org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryReplyMessage,2 -fromData,74,2a2bb700092a2bb9000a0100b500032ab4000304a000352bb8000bc0000c4d2cc600152abb000d592c2bb9000a0100b7000eb500042a2bb9000a0100b500062a2bb9000f0100b50007b1 -toData,83,2a2bb700102b2ab40003b9001102002ab4000304a0003e2ab40004c7000b012bb80012a7001b2ab40004b600052bb800122b2ab40004b60013b9001102002b2ab40006b9001102002b2ab40007b900140300b1 +fromData,74 +toData,83 org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorMessage,2 -fromData,55,2a2bb700122a2bb80013b500022a2bb900140100b500032a2bb900140100b500052a2bb900150100b500042a2bb80016c00017b50006b1 -toData,52,2a2bb700182ab400022bb800192b2ab40003b9001a02002b2ab40005b9001a02002b2ab40004b9001b03002ab400062bb8001cb1 +fromData,55 +toData,52 org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorReplyMessage,2 -fromData,30,2a2bb700052a2bb900060100b500022a2bb80007c00008c00008b50003b1 -toData,24,2a2bb700092b2ab40002b9000a02002ab400032bb8000bb1 +fromData,30 +toData,24 org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseMessage,2 -fromData,52,2a2bb7004e2a2bb8004fb500032a2bb80050b5002b2a2bb900510100b5002a2a2bb900520100b500022a2bb900520100b50041b1 -toData,52,2a2bb700492ab400032bb8004a2ab4002b2bb8004b2b2ab4002ab9004c02002b2ab40002b9004d02002b2ab40041b9004d0200b1 +fromData,52 +toData,52 org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseReplyMessage,2 -fromData,24,2a2bb700052a2bb80006b500072a2bb900080100b50003b1 -toData,24,2a2bb700092ab400072bb8000a2b2ab40003b9000b0200b1 +fromData,24 +toData,24 org/apache/geode/distributed/internal/locks/DLockRemoteToken,2 -fromData,10,bb000e59120fb70010bf -toData,53,2ab400112bb800252ab40012b600152bb800252b2ab40012b60026b9002702002b2ab40013b9002702002b2ab40014b900280300b1 +fromData,10 +toData,53 org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockRequestMessage,2 -fromData,134,2a2bb700a62a2bb900a70100b500242a2bb800a8b500102a2bb900a90100b500112a2bb900a90100b500122a2bb900a90100b500132a2bb900aa0100b500552a2bb900aa0100b5000e2a2bb900ab0100b5000f2a2bb900ab0100b500142a2bb900ab0100b500152a2bb900a90100b500162a2bb900ab0100b500172a2bb900ab0100b5006cb1 -toData,134,2a2bb700a02b2ab40024b900a102002ab400102bb800a22b2ab40011b900a303002b2ab40012b900a303002b2ab40013b900a303002b2ab40055b900a402002b2ab4000eb900a402002b2ab4000fb900a502002b2ab40014b900a502002b2ab40015b900a502002b2ab40016b900a303002b2ab40017b900a502002b2ab4006cb900a50200b1 +fromData,134 +toData,134 org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockResponseMessage,2 -fromData,72,2a2bb700442a2bb900450100b500032a2bb900460100b500112a2bb80047b500122a2bb900480100b5003f2a2bb80047b500412a2bb900490100b500132a2bb900490100b50043b1 -toData,72,2a2bb7003b2b2ab40003b9003c02002b2ab40011b9003d02002ab400122bb8003e2b2ab4003fb9004003002ab400412bb8003e2b2ab40013b9004202002b2ab40043b900420200b1 +fromData,72 +toData,72 org/apache/geode/distributed/internal/locks/DLockService$SuspendLockingToken,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor$DeposeGrantorMessage,2 -fromData,55,2a2bb700162a2bb900170100b500092a2bb80018b500042a2bb80019c0001ab500052a2bb9001b0100b500062a2bb900170100b50007b1 -toData,52,2a2bb7001c2b2ab40009b9001d02002ab400042bb8001e2ab400052bb8001f2b2ab40006b9002003002b2ab40007b9001d0200b1 +fromData,55 +toData,52 org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitMessage,2 -fromData,16,2a2bb7001d2a2bb9001e0100b50005b1 -toData,16,2a2bb7001f2b2ab40005b900200200b1 +fromData,16 +toData,16 org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitReplyMessage,2 -fromData,38,2a2bb7000e2a2bb8000fb500042a2bb8000fb500052a2bb8000fb500062a2bb8000fb50007b1 -toData,38,2a2bb700102ab400042bb800112ab400052bb800112ab400062bb800112ab400072bb80011b1 +fromData,38 +toData,38 org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorInfoReplyMessage,2 -fromData,47,2a2bb700142a2bb80015c00016b500052a2bb900170100b500092a2bb900180100b5000b2a2bb900190100b50007b1 -toData,44,2a2bb7001a2ab400052bb8001b2b2ab40009b9001c03002b2ab4000bb9001d02002b2ab40007b9001e0200b1 +fromData,47 +toData,44 org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorRequestMessage,2 -fromData,73,2a2bb700292a2bb9002a0100b500052a2bb9002b0100b500062a2bb8002cb500072a2bb9002b0100b5000b2a2bb9002d0100b500092ab4000904a0000e2a2bb8002ec0002fb50008b1 -toData,70,2a2bb700302b2ab40005b9003103002b2ab40006b9003202002ab400072bb800332b2ab4000bb9003202002b2ab40009b9003402002ab4000904a0000b2ab400082bb80035b1 +fromData,73 +toData,70 org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedMessage,2 -fromData,24,2a2bb700282a2bb900290100b500082a2bb8002ab50006b1 -toData,24,2a2bb7002b2b2ab40008b9002c02002ab400062bb8002db1 +fromData,24 +toData,24 org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedReplyMessage,2 -fromData,16,2a2bb700172a2bb900180100b50008b1 -toData,16,2a2bb700192b2ab40008b9001a0200b1 +fromData,16 +toData,16 org/apache/geode/distributed/internal/membership/InternalDistributedMember,6 -fromData,38,2a2bb600a02ab6009bb900190100b20096b60067a100112ab400012bb900970200a700044db1 -fromDataPre_GFE_7_1_0_0,282,2bb800a14d2bb900a201003e2a2bb80090b500072ab2000499000e2c2ab40007b800a3a700072cb60008b500072bb900a4010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5001e2bb900a2010036072bb900a2010036082bb900a4010036092bb800923a0a02360b2bb800903a0c1509100da0000e2a2bb80090b50014a700152bb800903a0d190dc6000a190db800a5360b2bb800903a0d2bb80093b60094360e190db6007d9e0011bb004f59190d150eb70050a70004013a0f2a15042bb700953610bb003259150715081509150b190c190a190fb700333a112a2c1d1505150615101911b80018b500012ab40001b9003e01009e000704a7000403b80047b1 -fromDataPre_GFE_9_0_0_0,282,2bb800a14d2bb900a201003e2a2bb80090b500072ab2000499000e2c2ab40007b800a3a700072cb60008b500072bb900a4010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5001e2bb900a2010036072bb900a2010036082bb900a4010036092bb800923a0a02360b2bb800903a0c1509100da0000e2a2bb80090b50014a700152bb800903a0d190dc6000a190db800a5360b2bb800903a0d2bb80093b60094360e190db6007d9e0011bb004f59190d150eb70050a70004013a0f2a15042bb700953610bb003259150715081509150b190c190a190fb700333a112a2c1d1505150615101911b80018b500012ab40001b9003e01009e000704a7000403b80047b1 -toData,34,2a2bb6009a2ab40001b900190100b20096b60067a1000d2ab6009b2bb9008c0200b1 -toDataPre_GFE_7_1_0_0,271,2ab40001b9003e01009e000704a7000403b800472ab600592bb8009c2b2ab60058b9009d02002ab400072bb80083033d2ab40001b9008401009900071c04803d2ab40001b9007901009900071c05803d2ab4001e9900071c07803d2b1c1100ff7e91b9009e02002b2ab40001b9003d0100b9009d02002b2ab40001b9004b0100b9009d02002b2ab40001b9003e0100b9009e02002ab40001b9004001002bb800862ab40001b9004c01002bb800832ab40001b9003e01003e1d100da0000e2ab400142bb80083a700132ab40001b9003f0100b8009f2bb800832ab40001b9004e01003a041904c70008124da700081904b600872bb800831904c7000911012ca700081904b60088b800892bb8008ab1 -toDataPre_GFE_9_0_0_0,266,2ab600592bb8009c2b2ab60058b9009d02002ab400072bb80083033d2ab40001b9008401009900071c04803d2ab40001b9007901009900071c05803d2ab4001e9900071c07803d1c1008803d2b1c1100ff7e91b9009e02002b2ab40001b9003d0100b9009d02002b2ab40001b9004b0100b9009d02002ab40001b9003e01003e2b1db9009e02002ab40001b9004001002bb800862ab40001b9004c01002bb800831d100da0000e2ab400142bb80083a700132ab40001b9003f0100b8009f2bb800832ab40001b9004e01003a041904c70008124da700081904b600872bb800831904c7000911012ca700081904b60088b800892bb8008a2ab40001b90019010036052b150504b8008bb1 +fromData,38 +fromDataPre_GFE_7_1_0_0,282 +fromDataPre_GFE_9_0_0_0,282 +toData,34 +toDataPre_GFE_7_1_0_0,271 +toDataPre_GFE_9_0_0_0,266 org/apache/geode/distributed/internal/membership/NetView,2 -fromData,109,2a2bb8006ec0002bb500132a2bb9006f0100b500082a2bb80070b5000bb200409a00122ab4000bc7000bbb004159b70042bf2abb000c592ab4000bb7000db5000e2a2bb80071b500102a2bb80071b500122a2bb80072b500052bb800734d2cc6000d2ab400042cb900180200b1 -toData,60,2ab400132bb800682b2ab40008b9006902002a2ab4000b2bb7006a2ab400102bb8006b2ab400122bb8006b2ab400052bb8006c2ab400042bb8006db1 +fromData,109 +toData,60 org/apache/geode/distributed/internal/membership/gms/GMSMember,2 -fromData,62,2a2bb6004b2a2bb9004c0100b500072a2bb9004d0100b5001e2a2bb9004d0100b500092a2bb9004c0100b500082a2bb8004eb5000a2a2bb8004fb5000bb1 -toData,62,2a2bb6003f2b2ab40007b9004002002b2ab4001eb9004102002b2ab40009b9004102002b2ab40008b9004002002ab4000a2bb800422ab4000b2bb80043b1 +fromData,62 +toData,62 org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2 -fromData,97,2a2bb8001dc0001ab500022bb9001e01003d2abb001f591cb70020b50005033e1d1ca2001a2ab400052bb8001dc0001ab90021020057840301a7ffe72a2bb9001e0100b500062a2bb9001e0100b500082a2bb80022b500042a2bb80023b50007b1 -toData,114,2ab400022bb800142ab40005c6003a2b2ab40005b900150100b9001602002ab40005b9001701004d2cb9001801009900152cb900190100c0001a4e2d2bb80014a7ffe8a7000a2b03b9001602002b2ab40006b9001602002b2ab40008b9001602002ab400042bb8001b2ab400072bb8001cb1 +fromData,97 +toData,114 org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse,2 -fromData,105,2a2bb80025c00026b500022a2bb80025c00026b500032a2bb80027b5000a2a2bb80028b5000c2a2bb900290100b500092ab400099a00342a2bb900290100b500042a2bb900290100b500072a2bb900290100b500082a2bb80025c0002ab500052a2bb8002bb50006b1 -toData,89,2ab400022bb800202ab400032bb800202ab4000a2bb800212ab4000c2bb800222b2ab40009b9002302002b2ab40004b9002302002b2ab40007b9002302002b2ab40008b9002302002ab400052bb800202ab400062bb80024b1 +fromData,105 +toData,89 org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse,2 -fromData,12,2a2bb80005c00006b50002b1 -toData,9,2ab400022bb80004b1 +fromData,12 +toData,9 org/apache/geode/distributed/internal/membership/gms/messages/FinalCheckPassedMessage,2 -fromData,12,2a2bb80010c00011b50003b1 -toData,9,2ab400032bb8000fb1 +fromData,12 +toData,9 org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage,2 -fromData,11,2a2bb900110100b50002b1 -toData,11,2b2ab40002b900100200b1 +fromData,11 +toData,11 org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage,2 -fromData,22,2a2bb900130100b500022a2bb80014c00015b50003b1 -toData,19,2b2ab40002b9001102002ab400032bb80012b1 +fromData,22 +toData,19 org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage,2 -fromData,49,2a2bb700112a2bb900120100b500072ab800132bb90012010032b500052a2bb80014c00015b500022a2bb80014b50006b1 -toData,45,2a2bb7000d2b2ab40007b9000e02002b2ab40005b6000fb9000e02002ab400022bb800102ab400062bb80010b1 +fromData,49 +toData,45 org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage,2 -fromData,48,2a2bb8001bc0001cb500042a2bb8001bb500052a2bb8001db500022a2bb9001e0100b6001f2a2bb900200100b50006b1 -toData,45,2ab400042bb800162ab400052bb800162ab400022bb800172b2ab60018b9001902002b2ab40006b9001a0200b1 +fromData,48 +toData,45 org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage,2 -fromData,47,2a2bb8001bc0001cb500022a2bb8001bc0001db500032a2bb8001eb500072a2bb8001fb500082a2bb8001fb50006b1 -toData,41,2ab400022bb800182ab400032bb800182ab400072bb800192ab400082bb8001a2ab400062bb8001ab1 +fromData,47 +toData,41 org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage,2 -fromData,20,2a2bb8000cc0000db500032a2bb8000eb50004b1 -toData,17,2ab400032bb8000a2ab400042bb8000bb1 +fromData,20 +toData,17 org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage,2 -fromData,20,2a2bb80015c00016b500032a2bb80017b50004b1 -toData,17,2ab400032bb800132ab400042bb80014b1 +fromData,20 +toData,17 org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage,2 -fromData,53,2bb9001b01003d033e1d1ca20029bb0016592bb8001cc0001d2bb8001eb7001f3a042ab400031904b90020020057840301a7ffd8b1 -toData,81,2ab40003c600452b2ab40003b900110100b9001202002ab40003b9001301004d2cb9001401009900202cb900150100c000164e2db600172bb800182db600192bb8001aa7ffdda7000a2b03b900120200b1 +fromData,53 +toData,81 org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage,2 -fromData,37,2a2bb7000e2a2bb9000f0100b500032a2bb900100100b500042a2bb80011c00012b50005b1 -toData,34,2a2bb7000a2b2ab40003b9000b02002b2ab40004b9000c02002ab400052bb8000db1 +fromData,37 +toData,34 org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage,2 -fromData,8,bb000859b70009bf -toData,8,bb000859b70009bf +fromData,8 +toData,8 org/apache/geode/distributed/internal/streaming/StreamingOperation$RequestStreamingMessage,2 -fromData,16,2a2bb700202a2bb900210100b50003b1 -toData,16,2a2bb700222b2ab40003b900230200b1 +fromData,16 +toData,16 org/apache/geode/distributed/internal/streaming/StreamingOperation$StreamingReplyMessage,2 -fromData,414,2a2bb700142bb9001501003d2a2bb900150100b500102a2bb900160100b500112a2bb900160100b500032bb800174e2db20018b600199e000704a70004033604013a0503b8001a3a06121bb8001c3a051905b9001d01003a06a7000f3a07b8000a121fb9002002001c02a0000b2a01b50002a7012b2a1cb5000e2abb0021591cb70022b500022ab400039900101905c6000b190504b9002302002ab40008b800243a071907c100253608013a09150899000d1907c00025b600263a0903360a03360b150b1ca20087b20027c6000cb2002706b900280200150899000fb8002999000904360aa700672bb8002a3a0c150899004a1909c600451909b9002b010099003b1504360d150d990017150b9a0012190cc1002c9a000704a7000403360d150d990019bb002d591909c0002e190cc0002fc0002fb700303a0c2ab40002190cb90031020057840b01a7ff79150a9900172a04b50004b20027c6000cb2002705b9002802002ab400039900341905c6002f19051906b60032b900230200a700203a0e2ab400039900141905c6000f19051906b60032b900230200190ebfb1 -toData,85,2a2bb700332ab4000dc7000d2b02b900340200a7000d2b2ab4000eb9003402002b2ab40010b9003402002b2ab40011b9003502002b2ab40003b9003502002ab4000dc600122ab4000e9e000b2ab4000d2bb60036b1 +fromData,414 +toData,85 org/apache/geode/distributed/internal/tcpserver/InfoRequest,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/tcpserver/InfoResponse,2 -fromData,9,2a2bb80003b50002b1 -toData,9,2ab400022bb80004b1 +fromData,9 +toData,9 org/apache/geode/distributed/internal/tcpserver/ShutdownRequest,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/tcpserver/ShutdownResponse,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/tcpserver/VersionRequest,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/distributed/internal/tcpserver/VersionResponse,2 -fromData,11,2a2bb900060100b50004b1 -toData,11,2b2ab40004b900050200b1 +fromData,11 +toData,11 org/apache/geode/internal/DSFIDFactory,2 -fromData,8,bb000259b70003bf -toData,8,bb000259b70003bf +fromData,8 +toData,8 org/apache/geode/internal/InternalDataSerializer$RegistrationMessage,2 -fromData,39,2a2bb700282bb800292a2bb8002ab500042a2bb9002b0100b500062a2bb8002cc00008b50009b1 -toData,32,2a2bb700242ab400042bb800252b2ab40006b9002602002ab400092bb80027b1 +fromData,39 +toData,32 org/apache/geode/internal/InternalInstantiator$RegistrationContextMessage,2 -fromData,14,2a2bb7001a2a2bb8001bb5000db1 -toData,14,2a2bb7001c2ab4000d2bb8001db1 +fromData,14 +toData,14 org/apache/geode/internal/InternalInstantiator$RegistrationMessage,3 -fromDataProblem,38,2ab4000bc7000e2abb001b59b7001cb5000b2ab4000b2bb6001d572ab4000b121eb6001d57b1 -fromData,125,2a2bb7001f2a2bb80020b500122a2bb80020b50013b80021c6004f2a2ab40012b80022b50003a7001b4d2ab2002404bd002559032c53b60026b700272a01b500032a2ab40013b80022b50005a7001b4d2ab2002804bd002559032c53b60026b700272a01b500052a2bb900290100b500072a2bb8002ac00009b5000ab1 -toData,46,2a2bb700162ab40003b600172bb800182ab40005b600172bb800182b2ab40007b9001902002ab4000a2bb8001ab1 +fromDataProblem,38 +fromData,125 +toData,46 org/apache/geode/internal/ManagerInfo,2 -fromData,61,2a2bb900540100b500182a2bb900540100b500192a2bb900540100b5001a2bb9005501003d1c9e00161cbc084e2b2db9005602002a2db80057b5001bb1 -toData,74,2b2ab40018b9005002002b2ab40019b9005002002b2ab4001ab9005002002ab4001bc7000d2b03b900510200a7001d2ab4001bb600524d2b2cbeb9005102002b2c032cbeb900530400b1 +fromData,61 +toData,74 org/apache/geode/internal/admin/ClientMembershipMessage,2 -fromData,32,2a2bb7000d2a2bb8000eb500022a2bb8000eb500032a2bb9000f0100b50004b1 -toData,32,2a2bb7000a2ab400022bb8000b2ab400032bb8000b2b2ab40004b9000c0200b1 +fromData,32 +toData,32 org/apache/geode/internal/admin/remote/AddHealthListenerRequest,2 -fromData,17,2a2bb700102a2bb80011c00012b50007b1 -toData,14,2a2bb7000e2ab400072bb8000fb1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/AddHealthListenerResponse,2 -fromData,16,2a2bb7000c2a2bb9000d0100b50008b1 -toData,16,2a2bb7000a2b2ab40008b9000b0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/AddStatListenerRequest,2 -fromData,26,2a2bb700112a2bb900120100b500042a2bb900130100b50006b1 -toData,26,2a2bb7000e2b2ab40004b9000f03002b2ab40006b900100200b1 +fromData,26 +toData,26 org/apache/geode/internal/admin/remote/AddStatListenerResponse,2 -fromData,16,2a2bb7000c2a2bb9000d0100b50008b1 -toData,16,2a2bb7000a2b2ab40008b9000b0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage,2 -fromData,34,2a2bb7001a2a2bb9001b0100b500052a2bb9001b0100b500042a2bb8001cb50007b1 -toData,34,2a2bb700172b2ab40005b9001802002b2ab40004b9001802002ab400072bb80019b1 +fromData,34 +toData,34 org/apache/geode/internal/admin/remote/AdminConsoleMessage,2 -fromData,16,2a2bb7000f2a2bb900100100b50005b1 -toData,16,2a2bb7000d2b2ab40005b9000e0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/AdminFailureResponse,2 -fromData,17,2a2bb700092a2bb8000ac0000bb50005b1 -toData,14,2a2bb700072ab400052bb80008b1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/AdminRequest,2 -fromData,24,2a2bb7002b2a2bb9002c0100b500052a2bb8002db50003b1 -toData,24,2a2bb700282b2ab40005b9002902002ab400032bb8002ab1 +fromData,24 +toData,24 org/apache/geode/internal/admin/remote/AdminResponse,2 -fromData,16,2a2bb700062a2bb900070100b50002b1 -toData,16,2a2bb700042b2ab40002b900050200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/AlertLevelChangeMessage,2 -fromData,16,2a2bb700132a2bb900140100b50004b1 -toData,16,2a2bb700112b2ab40004b900120200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/AlertListenerMessage,2 -fromData,69,2a2bb7001f2a2bb900200100b500062a2bb80021c00022b500072a2bb80023b500082a2bb80023b5000a2a2bb900240100b5000b2a2bb80023b5000c2a2bb80023b5000db1 -toData,66,2a2bb7001a2b2ab40006b9001b02002ab400072bb8001c2ab400082bb8001d2ab4000a2bb8001d2b2ab4000bb9001e03002ab4000c2bb8001d2ab4000d2bb8001db1 +fromData,69 +toData,66 org/apache/geode/internal/admin/remote/AlertsNotificationMessage,2 -fromData,20,2a2bb700052a2bb80006c00007c00007b50003b1 -toData,14,2a2bb700022ab400032bb80004b1 +fromData,20 +toData,14 org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage,2 -fromData,16,2a2bb700122a2bb900130100b50005b1 -toData,16,2a2bb700102b2ab40005b900110200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/BridgeServerRequest,2 -fromData,47,2a2bb700182a2bb900190100b500052a2bb900190100b500062a2bb8001ac0001bb5000a2a2bb900190100b5000fb1 -toData,44,2a2bb700152b2ab40005b9001602002b2ab40006b9001602002ab4000a2bb800172b2ab4000fb900160200b1 +fromData,47 +toData,44 org/apache/geode/internal/admin/remote/BridgeServerResponse,2 -fromData,28,2a2bb700292a2bb8002ac0000fb5000b2a2bb8002ac00024b50025b1 -toData,22,2a2bb700272ab4000b2bb800282ab400252bb80028b1 +fromData,28 +toData,22 org/apache/geode/internal/admin/remote/CacheConfigRequest,2 -fromData,36,2a2bb700112a2bb900120100b500032a2bb900130100b500042a2bb900130100b50006b1 -toData,36,2a2bb7000e2b2ab40003b9000f02002b2ab40004b9001002002b2ab40006b900100200b1 +fromData,36 +toData,36 org/apache/geode/internal/admin/remote/CacheConfigResponse,2 -fromData,28,2a2bb7001c2a2bb8001dc00014b500092a2bb8001dc00017b50018b1 -toData,22,2a2bb7001a2ab400092bb8001b2ab400182bb8001bb1 +fromData,28 +toData,22 org/apache/geode/internal/admin/remote/CacheInfoRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/CacheInfoResponse,2 -fromData,17,2a2bb7000f2a2bb80010c00008b5000ab1 -toData,14,2a2bb7000d2ab4000a2bb8000eb1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/CancelStatListenerRequest,2 -fromData,16,2a2bb7000d2a2bb9000e0100b50003b1 -toData,16,2a2bb7000b2b2ab40003b9000c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/CancelStatListenerResponse,2 -fromData,6,2a2bb7000ab1 -toData,6,2a2bb70009b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/CancellationMessage,2 -fromData,16,2a2bb7000c2a2bb9000d0100b50004b1 -toData,16,2a2bb7000a2b2ab40004b9000b0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage,2 -fromData,16,2a2bb700072a2bb900080100b50003b1 -toData,16,2a2bb700052b2ab40003b900060300b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/ClientHealthStats,4 -fromData,73,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000c2a2bb80014b50004b1 -fromDataPre_GFE_8_0_0_0,65,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000cb1 -toData,73,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000f2ab400042bb80010b1 -toDataPre_GFE_8_0_0_0,65,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000fb1 +fromData,73 +fromDataPre_GFE_8_0_0_0,65 +toData,73 +toDataPre_GFE_8_0_0_0,65 org/apache/geode/internal/admin/remote/CompactRequest,2 -fromData,6,2a2bb70029b1 -toData,6,2a2bb7002ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/CompactResponse,2 -fromData,14,2a2bb700042a2bb80005b50003b1 -toData,14,2a2bb700062ab400032bb80007b1 +fromData,14 +toData,14 org/apache/geode/internal/admin/remote/DestroyEntryMessage,2 -fromData,25,2a2bb7001b2a2bb8001cc0001db500042a2bb8001cb50005b1 -toData,22,2a2bb700192ab400042bb8001a2ab400052bb8001ab1 +fromData,25 +toData,22 org/apache/geode/internal/admin/remote/DestroyRegionMessage,2 -fromData,17,2a2bb7001a2a2bb8001bc0001cb50004b1 -toData,14,2a2bb700182ab400042bb80019b1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/DurableClientInfoRequest,2 -fromData,28,2a2bb7000c2a2bb8000db500032a2bb9000e0100b500042ab80005b1 -toData,24,2a2bb700092ab400032bb8000a2b2ab40004b9000b0200b1 +fromData,28 +toData,24 org/apache/geode/internal/admin/remote/DurableClientInfoResponse,2 -fromData,16,2a2bb700172a2bb900180100b50002b1 -toData,16,2a2bb700152b2ab40002b900160200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse,2 -fromData,20,2a2bb7001e2a2bb8001fc00018c00018b50019b1 -toData,14,2a2bb7001c2ab400192bb8001db1 +fromData,20 +toData,14 org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest,2 -fromData,27,2a2bb7000d2bb9000e01003d2bb8000fc000104e2a1c2db70003b1 -toData,24,2a2bb7000a2b2ab40005b9000b02002ab400062bb8000cb1 +fromData,27 +toData,24 org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse,2 -fromData,14,2a2bb7000c2a2bb8000db50008b1 -toData,14,2a2bb7000a2ab400082bb8000bb1 +fromData,14 +toData,14 org/apache/geode/internal/admin/remote/FetchHostRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/FetchHostResponse,2 -fromData,67,2a2bb700342a2bb80035b500132a2bb80036c00037b5000e2a2bb80036c00014b500262a2bb80036c00014b500192a2bb900380100b5002d2a2bb900390100b50002b1 -toData,58,2a2bb7002f2ab400132bb800302ab4000e2bb800312ab400262bb800312ab400192bb800312b2ab4002db9003203002b2ab40002b900330200b1 +fromData,67 +toData,58 org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest,2 -fromData,16,2a2bb7000d2a2bb9000e0100b50003b1 -toData,16,2a2bb7000b2b2ab40003b9000c0300b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse,2 -fromData,20,2a2bb7000f2a2bb80010c00011c00011b50009b1 -toData,14,2a2bb7000d2ab400092bb8000eb1 +fromData,20 +toData,14 org/apache/geode/internal/admin/remote/FetchStatsRequest,2 -fromData,14,2a2bb7000c2a2bb8000db50003b1 -toData,14,2a2bb7000a2ab400032bb8000bb1 +fromData,14 +toData,14 org/apache/geode/internal/admin/remote/FetchStatsResponse,2 -fromData,20,2a2bb700152a2bb80016c00011c00011b5000fb1 -toData,14,2a2bb700132ab4000f2bb80014b1 +fromData,20 +toData,14 org/apache/geode/internal/admin/remote/FetchSysCfgRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/FetchSysCfgResponse,2 -fromData,17,2a2bb7000d2a2bb8000ec0000fb50009b1 -toData,14,2a2bb7000b2ab400092bb8000cb1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage,2 -fromData,6,2a2bb70006b1 -toData,6,2a2bb70005b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/HealthListenerMessage,2 -fromData,27,2a2bb7000e2a2bb9000f0100b500042a2bb80010c00011b50005b1 -toData,24,2a2bb7000b2b2ab40004b9000c02002ab400052bb8000db1 +fromData,27 +toData,24 org/apache/geode/internal/admin/remote/LicenseInfoRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/LicenseInfoResponse,2 -fromData,17,2a2bb7000b2a2bb8000cc00005b50007b1 -toData,14,2a2bb700092ab400072bb8000ab1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest,1 -fromData,6,2a2bb7002fb1 +fromData,6 org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse,2 -fromData,124,2a2bb700072bb9000801003d2abb0009591cb7000ab50002033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400021904b9000e020057840301a7ffdd2bb9000801003d2abb0009591cb7000ab50003033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400031904b9000e020057840301a7ffddb1 -toData,110,2a2bb7000f2b2ab40002b900100100b9001102002ab40002b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe82b2ab40003b900100100b9001102002ab40003b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe8b1 +fromData,124 +toData,110 org/apache/geode/internal/admin/remote/ObjectDetailsRequest,2 -fromData,24,2a2bb700182a2bb80019b500032a2bb9001a0100b50004b1 -toData,24,2a2bb700152ab400032bb800162b2ab40004b900170200b1 +fromData,24 +toData,24 org/apache/geode/internal/admin/remote/ObjectDetailsResponse,2 -fromData,33,2a2bb700192a2bb8001ab5000b2a2bb8001ab5000d2a2bb8001ac0000eb50011b1 -toData,30,2a2bb700172ab4000b2bb800182ab4000d2bb800182ab400112bb80018b1 +fromData,33 +toData,30 org/apache/geode/internal/admin/remote/ObjectNamesRequest,2 -fromData,6,2a2bb70014b1 -toData,6,2a2bb70013b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/ObjectNamesResponse,2 -fromData,17,2a2bb700162a2bb80017c00008b5000ab1 -toData,14,2a2bb700142ab4000a2bb80015b1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest,2 -fromData,35,2a2bb700282abb002959b7002ab500022ab400022bb8002b2a2bb9002c0100b50003b1 -toData,24,2a2bb7002d2ab400022bb8002e2b2ab40003b9002f0200b1 +fromData,35 +toData,24 org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest,2 -fromData,6,2a2bb70009b1 -toData,6,2a2bb70008b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse,2 -fromData,17,2a2bb7000e2a2bb8000fc00008b5000ab1 -toData,14,2a2bb7000c2ab4000a2bb8000db1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/RegionAdminMessage,2 -fromData,14,2a2bb700072a2bb80008b50002b1 -toData,14,2a2bb700052ab400022bb80006b1 +fromData,14 +toData,14 org/apache/geode/internal/admin/remote/RegionAdminRequest,2 -fromData,14,2a2bb7000d2a2bb8000eb50002b1 -toData,14,2a2bb7000b2ab400022bb8000cb1 +fromData,14 +toData,14 org/apache/geode/internal/admin/remote/RegionAttributesRequest,2 -fromData,6,2a2bb7000db1 -toData,6,2a2bb7000cb1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/RegionAttributesResponse,2 -fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1 -toData,14,2a2bb7000a2ab400082bb8000bb1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/RegionRequest,2 -fromData,57,2a2bb700142a2bb900150100b500032a2bb900150100b500052a2bb80016b500062a2bb80016b500082a2bb80017c00018b5000b2ab80007b1 -toData,50,2a2bb700102b2ab40003b9001102002b2ab40005b9001102002ab400062bb800122ab400082bb800122ab4000b2bb80013b1 +fromData,57 +toData,50 org/apache/geode/internal/admin/remote/RegionResponse,2 -fromData,33,2a2bb700262a2bb80027b500162a2bb80027b5001b2a2bb80028c0001db5001eb1 -toData,30,2a2bb700232ab400162bb800242ab4001b2bb800242ab4001e2bb80025b1 +fromData,33 +toData,30 org/apache/geode/internal/admin/remote/RegionSizeRequest,2 -fromData,6,2a2bb70015b1 -toData,6,2a2bb70014b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/RegionSizeResponse,2 -fromData,26,2a2bb7000e2a2bb9000f0100b500082a2bb9000f0100b5000ab1 -toData,26,2a2bb7000c2b2ab40008b9000d02002b2ab4000ab9000d0200b1 +fromData,26 +toData,26 org/apache/geode/internal/admin/remote/RegionStatisticsRequest,2 -fromData,6,2a2bb7000db1 -toData,6,2a2bb7000cb1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/RegionStatisticsResponse,2 -fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1 -toData,14,2a2bb7000a2ab400082bb8000bb1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest,2 -fromData,6,2a2bb70010b1 -toData,6,2a2bb7000fb1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse,2 -fromData,27,2a2bb700212a2bb900220100b500062a2bb80023c0000ab50002b1 -toData,24,2a2bb7001e2b2ab40006b9001f02002ab400022bb80020b1 +fromData,27 +toData,24 org/apache/geode/internal/admin/remote/RemoteBridgeServer,2 -fromData,217,2a2bb900420100b500032a2bb900430100b5000a2a2bb900430100b500102a2bb900420100b500122a2bb900420100b500162a2bb900420100b5000e2a2bb900420100b500182a2bb900420100b5001a2a2bb900420100b500142a2bb80044b600452a2bb80046b600472a2bb80044b600482a2bb80049c0004ab6004b2a2bb8004cb6004d2a2bb900420100b5000c2a2bb900430100b500232ab600412bb900420100b9002902002ab600412bb80044b9002702002bb800444d2cc600102ab600412cb9002b0200a700102ab600412bb80044b9002d0200b1 -toData,217,2b2ab40003b9003b02002b2ab4000ab9003c02002b2ab40010b9003c02002b2ab40012b9003b02002b2ab40016b9003b02002b2ab4000eb9003b02002b2ab40018b9003b02002b2ab4001ab9003b02002b2ab40014b9003b02002ab400052bb8003d2ab4001c2bb8003e2ab400072bb8003d2ab4001f2bb8003f2ab400212bb800402b2ab4000cb9003b02002b2ab40023b9003c02002b2ab60041b900280100b9003b02002ab60041b9002601002bb8003d2ab60041b9002a01002bb8003d2ab60041b9002a0100c700102ab60041b9002c01002bb8003db1 +fromData,217 +toData,217 org/apache/geode/internal/admin/remote/RemoteCacheInfo,2 -fromData,106,2a2bb80030b500032a2bb900310100b500052a2bb900320100b500072a2bb900310100b500092a2bb900310100b5000b2a2bb900310100b5000d2a2bb900310100b5000f2a2bb80033b500102a2bb80034c00020b500112a2bb80035b500122a2bb900320100b50029b1 -toData,103,2ab400032bb8002a2b2ab40005b9002b02002b2ab40007b9002c02002b2ab40009b9002b02002b2ab4000bb9002b02002b2ab4000db9002b02002b2ab4000fb9002b02002ab400102bb8002d2ab400112bb8002e2ab400122bb8002f2b2ab40029b9002c0200b1 +fromData,106 +toData,103 org/apache/geode/internal/admin/remote/RemoteCacheStatistics,2 -fromData,51,2a2bb900100100b500032a2bb900100100b500052a2bb900100100b500072a2bb900100100b500092a2bb900110100b5000bb1 -toData,51,2b2ab40003b9000e03002b2ab40005b9000e03002b2ab40007b9000e03002b2ab40009b9000e03002b2ab4000bb9000f0200b1 +fromData,51 +toData,51 org/apache/geode/internal/admin/remote/RemoteDLockInfo,2 -fromData,76,2a2bb80017b500022a2bb80017b500052a2bb80017b500032a2bb900180100b500062a2bb900190100b500092a2bb8001ac0001bb500072a2bb9001c0100b5000c2a2bb9001c0100b5000bb1 -toData,73,2ab400022bb800122ab400052bb800122ab400032bb800122b2ab40006b9001302002b2ab40009b9001402002ab400072bb800152b2ab4000cb9001603002b2ab4000bb900160300b1 +fromData,76 +toData,73 org/apache/geode/internal/admin/remote/RemoteEntrySnapshot,2 -fromData,36,2a2bb80023b500052a2bb80023b500112a2bb80023c00014b500172a2bb80023b50013b1 -toData,33,2ab400052bb800222ab400112bb800222ab400172bb800222ab400132bb80022b1 +fromData,36 +toData,33 org/apache/geode/internal/admin/remote/RemoteObjectName,2 -fromData,27,2a2bb80013b500042a2bb80013b500062a2bb900140100b50008b1 -toData,27,2ab400042bb800112ab400062bb800112b2ab40008b900120200b1 +fromData,27 +toData,27 org/apache/geode/internal/admin/remote/RemoteRegionAttributes,2 -fromData,404,2a2bb80080b500082a2bb80080b5000a2a2bb80081b5000d2a2bb80080b5007a2a2bb80082c00083b5000f2a2bb80082c00083b500112a2bb80082c00084b500132a2bb80082c00084b500152a2bb80082c00084b500172a2bb80080b500192a2bb80082c00084b5001b2a2bb80080b5001d2a2bb80082c00085b5001f2a2bb80082c00086b500212a2bb900870100b500232a2bb900870100b500252a2bb900880100b500272a2bb900890100b5002b2a2bb900880100b5002d2a2bb900870100b5002f2a2bb900870100b500312a2bb900870100b500332a2bb900870100b500352a2bb900870100b500372a2bb80082c0008ab5003b2a2bb80082c0008bc0008bb5003d2a2bb80082c0008cc0008cb5003f2a2bb900870100b5007f2a2bb80082c0008db500412a2bb80082c0008eb500432a2bb80082c0008fb500452a2bb80082c00002b500042a2bb900870100b500472a2bb80080b500392a2bb900870100b5004b2a2bb80081b5004e2a2bb900870100b500052a2bb900870100b500292a2bb80080b500522a2bb900870100b50054b1 -toData,353,2ab400082bb800782ab4000a2bb800782ab4000d2bb800792ab4007a2bb800782ab4000f2bb8007b2ab400112bb8007b2ab400132bb8007b2ab400152bb8007b2ab400172bb8007b2ab400192bb800782ab4001b2bb8007b2ab4001d2bb800782ab4001f2bb8007b2ab400212bb8007b2b2ab40023b9007c02002b2ab40025b9007c02002b2ab40027b9007d02002b2ab4002bb9007e02002b2ab4002db9007d02002b2ab4002fb9007c02002b2ab40031b9007c02002b2ab40033b9007c02002b2ab40035b9007c02002b2ab40037b9007c02002ab4003b2bb8007b2ab4003d2bb8007b2ab4003f2bb8007b2b2ab4007fb9007c02002ab400412bb8007b2ab400432bb8007b2ab400452bb8007b2ab400042bb8007b2b2ab40047b9007c02002ab400392bb800782b2ab4004bb9007c02002ab4004e2bb800792b2ab40005b9007c02002b2ab40029b9007c02002ab400522bb800782b2ab40054b9007c0200b1 +fromData,404 +toData,353 org/apache/geode/internal/admin/remote/RemoteRegionSnapshot,2 -fromData,59,2a2bb80029b500032a2bb8002ac00009b5000c2a2bb8002ac00005b500072a2bb9002b0100b500102a2bb9002b0100b500122a2bb8002ab5001cb1 -toData,53,2ab400032bb800262ab4000c2bb800272ab400072bb800272b2ab40010b9002802002b2ab40012b9002802002ab4001c2bb80027b1 +fromData,59 +toData,53 org/apache/geode/internal/admin/remote/RemoteStat,2 -fromData,66,2a2bb8002ab500052a2bb9002b0100b5000e2a2bb9002c0100b500032a2bb8002ab500072a2bb8002ab5000b2a2bb8002dc0002eb500102a2bb9002f0100b50009b1 -toData,63,2ab400052bb800252b2ab4000eb9002602002b2ab40003b9002702002ab400072bb800252ab4000b2bb800252ab400102bb800282b2ab40009b900290200b1 +fromData,66 +toData,63 org/apache/geode/internal/admin/remote/RemoteStatResource,2 -fromData,45,2a2bb9001a0100b500032a2bb9001a0100b500052a2bb8001bb500072a2bb8001bb5000a2a2bb8001bb5000cb1 -toData,45,2b2ab40003b9001803002b2ab40005b9001803002ab400072bb800192ab4000a2bb800192ab4000c2bb80019b1 +fromData,45 +toData,45 org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest,2 -fromData,16,2a2bb7000d2a2bb9000e0100b50003b1 -toData,16,2a2bb7000b2b2ab40003b9000c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse,2 -fromData,6,2a2bb70008b1 -toData,6,2a2bb70007b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/ResetHealthStatusRequest,2 -fromData,16,2a2bb7000d2a2bb9000e0100b50003b1 -toData,16,2a2bb7000b2b2ab40003b9000c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/ResetHealthStatusResponse,2 -fromData,6,2a2bb7000ab1 -toData,6,2a2bb70009b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/RevokePersistentIDRequest,2 -fromData,25,2a2bb7001d2abb001e59b7001fb500022ab400022bb80020b1 -toData,14,2a2bb700212ab400022bb80022b1 +fromData,25 +toData,14 org/apache/geode/internal/admin/remote/RootRegionRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/RootRegionResponse,2 -fromData,28,2a2bb700232a2bb80024c00019b5001a2a2bb80024c00019b5001bb1 -toData,22,2a2bb700212ab4001a2bb800222ab4001b2bb80022b1 +fromData,28 +toData,22 org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest,2 -fromData,16,2a2bb700072a2bb900080100b50005b1 -toData,16,2a2bb700092b2ab40005b9000a0200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/ShutdownAllRequest,2 -fromData,6,2a2bb70044b1 -toData,6,2a2bb70045b1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/ShutdownAllResponse,2 -fromData,16,2a2bb700072a2bb900080100b50002b1 -toData,16,2a2bb700052b2ab40002b900060200b1 +fromData,16 +toData,16 org/apache/geode/internal/admin/remote/SnapshotResultMessage,2 -fromData,27,2a2bb7000e2a2bb8000fc00010b500062a2bb900110100b50007b1 -toData,24,2a2bb7000b2ab400062bb8000c2b2ab40007b9000d0200b1 +fromData,27 +toData,24 org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage,2 -fromData,30,2a2bb700102a2bb900110100b500052a2bb80012c00013c00013b50002b1 -toData,24,2a2bb7000d2b2ab40005b9000e03002ab400022bb8000fb1 +fromData,30 +toData,24 org/apache/geode/internal/admin/remote/StatListenerMessage,2 -fromData,86,2a2bb700112a2bb900120100b500042a2bb900130100b500052a2ab40005bc0ab500062a2ab40005bc07b50007033d1c2ab40005a200212ab400061c2bb9001301004f2ab400071c2bb90014010052840201a7ffddb1 -toData,66,2a2bb7000d2b2ab40004b9000e03002b2ab40005b9000f0200033d1c2ab40005a200212b2ab400061c2eb9000f02002b2ab400071c31b900100300840201a7ffddb1 +fromData,86 +toData,66 org/apache/geode/internal/admin/remote/StoreSysCfgRequest,2 -fromData,17,2a2bb7000d2a2bb8000ec0000fb50003b1 -toData,14,2a2bb7000b2ab400032bb8000cb1 +fromData,17 +toData,14 org/apache/geode/internal/admin/remote/StoreSysCfgResponse,2 -fromData,6,2a2bb7000eb1 -toData,6,2a2bb7000db1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/SubRegionRequest,2 -fromData,6,2a2bb7000db1 -toData,6,2a2bb7000cb1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/SubRegionResponse,2 -fromData,34,2a2bb7001f2a2bb80020c00013c00013b500142a2bb80020c00013c00013b50015b1 -toData,22,2a2bb7001d2ab400142bb8001e2ab400152bb8001eb1 +fromData,34 +toData,22 org/apache/geode/internal/admin/remote/TailLogRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/TailLogResponse,2 -fromData,22,2a2bb7001a2a2bb8001bb5000d2a2bb8001bb5000ab1 -toData,22,2a2bb700182ab4000d2bb800192ab4000a2bb80019b1 +fromData,22 +toData,22 org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage,2 -fromData,30,2a2bb700092a2bb9000a0100b500042a2bb8000bc0000cc0000cb50003b1 -toData,24,2a2bb700062b2ab40004b9000702002ab400032bb80008b1 +fromData,30 +toData,24 org/apache/geode/internal/admin/remote/VersionInfoRequest,2 -fromData,6,2a2bb7000bb1 -toData,6,2a2bb7000ab1 +fromData,6 +toData,6 org/apache/geode/internal/admin/remote/VersionInfoResponse,2 -fromData,14,2a2bb7000a2a2bb8000bb50006b1 -toData,14,2a2bb700082ab400062bb80009b1 +fromData,14 +toData,14 org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl,2 -fromData,12,2a2bb8002bc0002cb50002b1 -toData,9,2ab400022bb8002ab1 +fromData,12 +toData,9 org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl,2 -fromData,31,2a2bb900100100b500022a2bb900100100b500032a2bb900100100b50004b1 -toData,31,2b2ab40002b9000f02002b2ab40003b9000f02002b2ab40004b9000f0200b1 +fromData,31 +toData,31 org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl,2 -fromData,14,2a2bb700212a2bb80022b50002b1 -toData,14,2a2bb7001f2ab400022bb80020b1 +fromData,14 +toData,14 org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl,2 -fromData,28,2a2bb700252a2bb80026c00027b500032a2bb80026c00027b50004b1 -toData,22,2a2bb700232ab400032bb800242ab400042bb80024b1 +fromData,28 +toData,22 org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl,2 -fromData,31,2a2bb8002fb500032a2bb80030b500072a2bb80031c00032c00032b50009b1 -toData,25,2ab400032bb8002c2ab400072bb8002d2ab400092bb8002eb1 +fromData,31 +toData,25 org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl,2 -fromData,25,2a2bb700262a2bb80027c00028b500032a2bb80029b50004b1 -toData,22,2a2bb700232ab400032bb800242ab400042bb80025b1 +fromData,25 +toData,22 org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl,2 -fromData,28,2a2bb80031b500032a2bb80032b500072a2bb80033c00020b50002b1 -toData,25,2ab400032bb8002e2ab400072bb8002f2ab400022bb80030b1 +fromData,28 +toData,25 org/apache/geode/internal/admin/statalerts/StatisticInfoImpl,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/AbstractRegion,2 -fromData,11,bb017459130175b70176bf -toData,6,2a2bb80173b1 +fromData,11 +toData,6 org/apache/geode/internal/cache/AbstractUpdateOperation$AbstractUpdateMessage,2 -fromData,16,2a2bb700182a2bb900190100b5000cb1 -toData,16,2a2bb7001a2b2ab4000cb9001b0300b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/AddCacheServerProfileMessage,2 -fromData,16,2a2bb7002f2a2bb900300100b50008b1 -toData,16,2a2bb7002d2b2ab40008b9002e0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/BucketAdvisor$BucketProfile,2 -fromData,36,2a2bb700132a2bb900140100b500042a2bb900140100b500062a2bb900140100b50012b1 -toData,36,2a2bb700152b2ab40004b9001602002b2ab40006b9001602002b2ab40012b900160200b1 +fromData,36 +toData,36 org/apache/geode/internal/cache/BucketAdvisor$ServerBucketProfile,2 -fromData,22,2a2bb700162a2bb80017b500052a2bb80018b50004b1 -toData,22,2a2bb700192ab400052bb8001a2ab400042bb8001bb1 +fromData,22 +toData,22 org/apache/geode/internal/cache/BucketServerLocation,2 -fromData,39,2a2bb700062a2bb80007b60008b500032a2bb80009b6000ab500042a2bb8000bb6000cb50005b1 -toData,39,2a2bb7000d2ab40003b8000e2bb8000f2ab40004b800102bb800112ab40005b800122bb80013b1 +fromData,39 +toData,39 org/apache/geode/internal/cache/BucketServerLocation66,2 -fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb60010b500052a2bb900110100b500092a2ab40009bd0006b500072ab400099e001d033d1c2ab40009a200132ab400071c2bb8001253840201a7ffebb1 -toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1 +fromData,93 +toData,91 org/apache/geode/internal/cache/CacheDistributionAdvisor$CacheProfile,2 -fromData,113,2a2bb700692bb9006a01003d2a1cb6001e2a1cb7006b9900162abb006c59b7006db500282ab400282bb8006e2a1cb7006f99000e2a2bb80070c00071b5000e2a1cb7007299000e2a2bb80070c00071b5000f2a2bb80070c00073b500192a1cb7007499000e2a2bb80070c00075b50018b1 -toData,101,2a2bb700612b2ab6001db9006202002ab40028c6000b2ab400282bb800632ab4000eb9002e01009a000c2a2ab4000e2bb700642ab4000fb9002e01009a000c2a2ab4000f2bb700642ab400192bb800652ab40018b9003201009a000b2ab400182bb80065b1 +fromData,113 +toData,101 org/apache/geode/internal/cache/CacheServerAdvisor$CacheServerProfile,2 -fromData,53,2a2bb700122a2bb80013b500042a2bb900140100b500062abb001559b70016b500052ab400052bb800172a2bb900180100b60019b1 -toData,42,2a2bb7000c2ab400042bb8000d2b2ab40006b9000e02002ab400052bb8000f2b2ab60010b900110300b1 +fromData,53 +toData,42 org/apache/geode/internal/cache/ClientRegionEventImpl,2 -fromData,14,2a2bb700142a2bb80015b60003b1 -toData,14,2a2bb700122ab6000d2bb80013b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/CloseCacheMessage,2 -fromData,16,2a2bb700182a2bb900190100b50002b1 -toData,16,2a2bb7001a2b2ab40002b9001b0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/ControllerAdvisor$ControllerProfile,2 -fromData,6,2a2bb70008b1 -toData,6,2a2bb70007b1 +fromData,6 +toData,6 org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionMessage,2 -fromData,45,2a2bb7009d2a2bb8009eb500082a2bb8009fc00053b500412a2bb900a00100b500032a2bb900a10100b50063b1 -toData,42,2a2bb700a32ab400082bb800a42ab400412bb800a52b2ab40003b900a602002b2ab40063b900a70200b1 +fromData,45 +toData,42 org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionReplyMessage,2 -fromData,161,2a2bb700062bb90007010099000e2a2bb80008c00009b5000a2bb9000b01003d1c9a000b2a01b5000ca700352abb000d591cb7000eb5000c033e1d1ca20022bb000f59b700103a0419042bb800112ab4000c1904b6001257840301a7ffdf2bb90007010099000c2a2b03b80013b500142bb9000701009900162abb001559b70016b500172ab400172bb800112a2bb900070100b500182a2bb900190100b50004b1 -toData,195,2a2bb7001a2b2ab4000ac6000704a7000403b9001b02002ab4000ac6000b2ab4000a2bb8001c2ab4000cc7000d2b03b9001d0200a700322ab4000cb6001e3d2b1cb9001d0200033e1d1ca2001c2ab4000c1db6001fc0000f3a0419042bb80020840301a7ffe52ab40014c6001d2b04b9001b02002b2ab40014c00021032ab60022b80023a7000a2b03b9001b02002ab40017c600152b04b9001b02002ab400172bb80020a7000a2b03b9001b02002b2ab40018b9001b02002b2ab40004b900240300b1 +fromData,161 +toData,195 org/apache/geode/internal/cache/DestroyOperation$DestroyMessage,2 -fromData,45,2a2bb700322a2bb80033c00034b500022a2bb80033b500272bb800354d2cb6003699000b2a2bb80037b50005b1 -toData,118,2a2bb700382ab400022bb800392ab400272bb800392ab40003b6003ac000084d2cc1003b99002e2cb6003c4e2db6003d990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fa700262cb60043990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fb1 +fromData,45 +toData,118 org/apache/geode/internal/cache/DestroyOperation$DestroyWithContextMessage,2 -fromData,14,2a2bb700102a2bb80011b50008b1 -toData,14,2a2bb700122ab400082bb80013b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/DestroyPartitionedRegionMessage,2 -fromData,76,2a2bb700432a2bb80044b500062a2bb900450100b80046b500082a2bb900470100b5000a2bb9004701003d2a1cbc0ab5000d033e1d1ca200152ab4000d1d2bb9004701004f840301a7ffecb1 -toData,77,2a2bb700482ab400062bb800492b2ab40008b4004ab9004b02002b2ab4000ab9004c02002b2ab4000dbeb9004c0200033d1c2ab4000dbea200152b2ab4000d1c2eb9004c0200840201a7ffe8b1 +fromData,76 +toData,77 org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionMessage,2 -fromData,41,2a2bb700572a2bb80058c00059b500082a2bb8005ab500112a2bb8005bb5001e2a2bb8005cb50028b1 -toData,38,2a2bb7005d2ab400082bb8005e2ab400112bb8005f2ab4001e2bb800602ab400282bb80061b1 +fromData,41 +toData,38 org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionWithContextMessage,2 -fromData,14,2a2bb7000e2a2bb8000fb50006b1 -toData,14,2a2bb700102ab400062bb80011b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/DistTXCommitMessage,2 -fromData,14,2a2bb700302a2bb80031b50003b1 -toData,14,2a2bb700322ab400032bb80033b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/DistTXCommitMessage$DistTXCommitReplyMessage,2 -fromData,17,2a2bb700192a2bb8001ac0001bb50004b1 -toData,14,2a2bb700172ab400042bb80018b1 +fromData,17 +toData,14 org/apache/geode/internal/cache/DistTXPrecommitMessage,2 -fromData,14,2a2bb700332a2bb80034b5000ab1 -toData,14,2a2bb700312ab4000a2bb80032b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTXPrecommitReplyMessage,2 -fromData,17,2a2bb700192a2bb8001ac0001bb50004b1 -toData,14,2a2bb700172ab400042bb80018b1 +fromData,17 +toData,14 org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTxPrecommitResponse,2 -fromData,17,2a2bb80008b500032a2bb80009b50004b1 -toData,17,2ab400032bb800062ab400042bb80007b1 +fromData,17 +toData,17 org/apache/geode/internal/cache/DistTXRollbackMessage,2 -fromData,6,2a2bb70015b1 -toData,6,2a2bb70016b1 +fromData,6 +toData,6 org/apache/geode/internal/cache/DistTXRollbackMessage$DistTXRollbackReplyMessage,2 -fromData,14,2a2bb700192a2bb8001ab50004b1 -toData,14,2a2bb700172ab400042bb80018b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/DistributedCacheOperation$CacheOperationMessage,2 -fromData,291,2bb9009401003d2bb9009401003e2a1cb500952a1c2bb600962a2bb80097b500102a2bb900980100b80099b500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500561c1102007e99000b2a2bb8009ab500872a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001e2ab4001e9900382bb900980100360415049a000b2a03b5001fa7001b150404a0000b2a04b5001fa7000dbb009b59129cb7009dbf2a2bb8009eb500201c1101007e99000704a700040336042a1c1108007e99000704a7000403b5009f15049900162abb00a059b700a1b5000e2ab4000e2bb800a21c1110007e99001c1c1120007e99000704a700040336052a15052bb800a3b5000a1d1104007e9900082a04b5000fb1 -toData,202,033d033e2a1cb600a43d2a1db600a53e2b1cb900a602002b1db900a602002ab4000d9e000d2b2ab4000db900a702002ab400102bb800a82b2ab40009b400a9b900aa02002ab40087c6000b2ab400872bb800ab2ab4001e9900542b2ab4001f99000704a7000403b900aa02002ab4001fb800ac36042ab4001f9a001f2ab40020c10021990015013a052ab40020c00021c000213a06a7000c2ab400203a05013a061504190519062bb800ad2ab4000ec6000b2ab4000e2bb800ae2ab4000ac6000b2ab4000a2bb800aeb1 +fromData,291 +toData,202 org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionMessage,2 -fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1 -toData,43,2a2bb700282b2ab40002b60016b9002902002ab400062bb8002a2ab400172bb8002a2ab400112bb8002ab1 +fromData,53 +toData,43 org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionWithContextMessage,2 -fromData,14,2a2bb7000e2a2bb8000fb50006b1 -toData,14,2a2bb700102ab400062bb80011b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/DistributedPutAllOperation$EntryVersionsList,2 -fromData,268,2bb9002201003d1c077e07a0000704a70004033e1c10207e1020a0000704a70004033604b80012b20013b900140200990011b8001212231cb80016b9002403001d9900ca2bb80025883605b80012b20013b900140200990015b80012b2001312261505b80027b900280400bb0029591505b700023a0603360715071505a2008e2bb90022010036081508aa000000007b00000000000000030000001e0000002700000035000000542a01b6000757a700572a15042bb8002ab6000757a7004915042bb8002a3a0919061909b6001cb9002b0200572a1909b6000757a7002a15042bb8002a3a092bb8002588360a19091906150ab9002c0200c0002db600212a1909b6000757840701a7ff71b1 -toData,289,033d033e2ab600089e003d1c07803d043e2ab6000b3a041904b9000c01009900271904b9000d0100c0000a3a051905c600131905c1001199000e1c1020803da70006a7ffd5b80012b20013b900140200990015b80012b2001312152a1cb80016b9001705002b1cb9001802001d9900b32ab60008852bb80019bb001a592ab60008b7001b3a040336052ab6000b3a061906b9000c010099008a1906b9000d0100c0000a3a071907c7000d2b03b900180200a7006c1907b6001c3a081908c700132b04b90018020019072bb8001da7005019041908b6001e360915099a00242b05b90018020084050115053609190419081509b6001f5719072bb8001da700212b06b90018020019072b03b6002019071908b6002115090464852bb80019a7ff72b1 +fromData,268 +toData,289 org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllEntryData,1 -toData,229,2ab4000a4d2ab4000c4e2c2bb8003e2dc1003f9a00072dc700182b03b9004002002dc0003fc0003f2bb80041a700312dc1004299001e2dc000423a042b04b9004002001904b9004301002bb80041a7000f2b04b9004002002d2bb800442b2ab40012b40045b9004002002ab4000636042ab40027c6000a150407809136042ab40017c6001d15041008809136042ab40017c1004699000b150410208091360415041080809136042b1504b9004002002ab40027c6000b2ab400272bb8003e2ab40017c6000b2ab400172bb800472ab6002999000b2ab400142bb800472ab400082bb80048b1 +toData,229 org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllMessage,2 -fromData,197,2a2bb7003a2a2bb8003bc0003cb500052a2bb8003d88b500152a2ab40015bd003eb500062ab400159e00722bb8003f4dbb004059b700414e03360415042ab40015a200202ab400061504bb003e592b2ab4000515042c2db7004253840401a7ffdd2bb9004301003604150499002f2bb800443a0503360615062ab40015a2001d2ab4000615063219051506b60045c00046b5002c840601a7ffe02ab400471140007e99000e2a2bb8003bc00048b5000b2a2ab400471180007e99000704a7000403b5001ab1 -toData,165,2a2bb700492ab400052bb8004a2ab40015852bb8004b2ab400159e007bbb004c592ab40015b7004d4d033e03360415042ab40015a200511d9a00122ab40006150432b4002cc60005043e2ab40006150432b4002c3a052c1905b6004e572ab4000615043201b5002c2ab400061504322bb6004f2ab400061504321905b5002c840401a7ffac2b1db9005002001d9900082c2bb800512ab4000bc6000b2ab4000b2bb8004ab1 +fromData,197 +toData,165 org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage,2 -fromData,171,2a2bb700652bb9006601003d1c047e9900142a2bb900670100b500092ab40009b800681c077e99000d2a2bb900670100b500061c057e99000e2a2bb80069c0006ab500072bb800694e2dc1006b9900252a03b5000e2a2dc0006bb8006cb500082ab40008c7001b2a2dc0006bb50050a700102a2dc0006db500082a04b5000e2a2bb80069c0006eb5000a2a2bb8006fb5000c2a2bb80070b5000b2a1c10407e99000704a7000403b5000db1 -toData,173,2a2bb70072033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007302002ab4000999000d2b2ab40009b9007402002ab40006029f000d2b2ab40006b9007402002ab40007c6000b2ab400072bb800752ab4000e99000e2ab400082bb80075a700102ab40008b9005b01002bb800752ab4000a2bb800752ab4000cc000762bb800772ab4000b2bb80078b1 +fromData,171 +toData,173 org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1 -toData,136,2ab4000a4d2c2bb800412b2ab40010b40042b9004302002ab400063e2ab40024c600081d0780913e2ab40015c600191d100880913e2ab40015c100449900091d102080913e1d108080913e2b1db9004302002ab40024c6000b2ab400242bb800412ab40015c6000b2ab400152bb800452ab6002699000b2ab400122bb800452ab400082bb80046b1 +toData,136 org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2 -fromData,197,2a2bb700392a2bb8003ac0003bb500052a2bb8003c88b500152a2ab40015bd003db500062ab400159e00722bb8003e4dbb003f59b700404e03360415042ab40015a200202ab400061504bb003d592b2ab4000515042c2db7004153840401a7ffdd2bb9004201003604150499002f2bb800433a0503360615062ab40015a2001d2ab4000615063219051506b60044c00045b5002c840601a7ffe02ab400461140007e99000e2a2bb8003ac00047b5000b2a2ab400461180007e99000704a7000403b5001ab1 -toData,165,2a2bb700482ab400052bb800492ab40015852bb8004a2ab400159e007bbb004b592ab40015b7004c4d033e03360415042ab40015a200511d9a00122ab40006150432b4002cc60005043e2ab40006150432b4002c3a052c1905b6004d572ab4000615043201b5002c2ab400061504322bb6004e2ab400061504321905b5002c840401a7ffac2b1db9004f02001d9900082c2bb800502ab4000bc6000b2ab4000b2bb80049b1 +fromData,197 +toData,165 org/apache/geode/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2 -fromData,125,2a2bb700172ab800182bb90019010032b5001a2bb9001b01003d2abb001c591cb7001db500122bb9001e01003e03360415041ca2003e1d990019bb001f59b700203a0619062bb8002119063a05a700092bb800223a052ab4001219052bb900230100b80024b90025030057840401a7ffc22a2bb80026c00027b50004b1 -toData,227,2a2bb700282b2ab4001ab60029b9002a02002b2ab40012b9002b0100b9002c0200033d122d4e2ab40012b9002e01009a00252ab40012b9002f0100b900300100b900310100c000323a041904c1001f990005043d2b1cb9003302002ab40012b900340100b9003001003a041904b9003501009900681904b900310100c000363a051905b900370100c000323a061906c1001f99001c1c9a000cbb0038592db70039bf1906c0001f2bb8003aa700191c99000cbb0038592db70039bf1906c0003b2bb6003c2b1905b9003d0100c0003eb6003fb900400300a7ff942ab400042bb80041b1 +fromData,125 +toData,227 org/apache/geode/internal/cache/DynamicRegionAttributes,2 -fromData,17,2a2bb80005b500022a2bb80005b50003b1 -toData,17,2ab400022bb800042ab400032bb80004b1 +fromData,17 +toData,17 org/apache/geode/internal/cache/EntryEventImpl,2 -fromData,219,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500082ab4001b2bb80016b600202a2bb80016c00021b500092bb900220100990013b200239a0040bb0024591225b70026bf2bb90022010099001b2a2bb80027b500282a2ab40028b500062a01b50005a700152a01b500282a01b500062a2bb80016b500052bb9002201009900132a2bb80027b500292a01b50007a700102a01b500292a2bb80016b500072a2bb8002ab5002b2a2bb8002cb5000a2a2bb8002db50013b1 -toData,284,2ab400182bb801502ab600882bb801502ab4001bb6017d2bb801502b2ab4001eb4017eb9017f02002b2ab4000811c03f7eb9018002002ab6004a2bb801502ab400092bb801502b03b9018102002ab600404d2cc1007f3e1d99000d2cc0007fb900b101003e2b1db9018102001d99003b2ab40028c6000e2ab400282bb80182a7002e2ab40006c6000e2ab400062bb80182a7001c2cc0007f3a041904b900bf01002bb80183a700082c2bb801502ab600424d2cc1007f3e1d99000d2cc0007fb900b101003e2b1db9018102001d9900292ab40029c6000e2ab400292bb80182a700212cc0007f3a041904b900bf01002bb80183a7000d2cb800924d2c2bb801502ab4002bc001842bb801852ab600582bb801502ab400132bb80186b1 +fromData,219 +toData,284 org/apache/geode/internal/cache/EntrySnapshot,2 -fromData,50,2a03b500052bb9004201003d1c9900112abb000759b70043b50004a7000e2abb000359b70044b500042ab400042bb60045b1 -toData,22,2b2ab40004c10007b9004002002ab400042bb60041b1 +fromData,50 +toData,22 org/apache/geode/internal/cache/EventID,4 -fromData,53,2a2bb80041b500042bb80041b800424d2a2cb80043b500092a2cb80043b5000b2a2bb900440100b5000c2a2bb900450100b50001b1 -fromDataPre_GFE_8_0_0_0,33,2a2bb80041b500042bb80041b800424d2a2cb80043b500092a2cb80043b5000bb1 -toData,97,2bb8003c4d2cb20033b600349c00292ab20036b6002e4ebb001059b20036b7003d3a042d1904b600151904b600162bb8003ea7000b2ab400042bb8003e2ab400092ab4000bb8003a2bb8003e2b2ab4000cb9003f02002b2ab40001b900400200b1 -toDataPre_GFE_8_0_0_0,24,2ab400042bb8003e2ab400092ab4000bb8003a2bb8003eb1 +fromData,53 +fromDataPre_GFE_8_0_0_0,33 +toData,97 +toDataPre_GFE_8_0_0_0,24 org/apache/geode/internal/cache/EvictionAttributesImpl,2 -fromData,33,2a2bb9001b0100b500072a2bb8001cc0001db500052a2bb8001cc0001eb50003b1 -toData,27,2b2ab40007b9001902002ab400052bb8001a2ab400032bb8001ab1 +fromData,33 +toData,27 org/apache/geode/internal/cache/FilterProfile,2 -fromData,192,bb013759b701384d2c2bb801392a2cb500242ab4000d2bb8013ab60071572ab400052bb8013bb6013c2ab400072bb8013bb6013c2ab400092bb8013bb6013c2ab4000e2bb8013ab60071572ab400062bb8013bb6013c2ab400082bb8013bb6013c2ab4000a2bb8013bb6013c2bb8013d3e1d9e004d05b8013f360403360515051da2002a2bb801403a062bb801413a072a1906190703b601422ab4000f19061907b6008a57840501a7ffd61504b8013f57a7000e3a081504b8013f571908bfb1 -toData,205,2ab400242bb801442ab4000db6006f2ab40027b4011c2bb801452ab40005b601462bb801472ab40007b601462bb801472ab40009b601462bb801472ab4000eb6006f2ab40027b4011c2bb801452ab40006b601462bb801472ab40008b601462bb801472ab4000ab601462bb801472ab4000fb601464d2cb900bd01003e1d2bb801482cb9011e0100b900b301003a041904b900b401009900361904b900b50100c000b63a051905b901200100c0003d3a061905b900b70100c000863a0719062bb8014919072bb80144a7ffc6b1 +fromData,192 +toData,205 org/apache/geode/internal/cache/FilterProfile$OperationMessage,2 -fromData,129,2a2bb700522a2bb900530100b500092a2bb900540100b500412ab800552bb90056010032b500232a2bb900570100b500292a2bb900580100b5004a2ab40023b8004c99002c2a2bb900540100b500322ab40023b2004ea5000d2ab40023b2004fa600202a2bb80059b50033a700152a2bb900580100b500252a2bb8005ab50027b1 -toData,133,2a2bb700452b2ab40009b9004602002b2ab40041b9004702002b2ab40023b60024b9004802002b2ab40029b9004902002b2ab4004ab9004b03002ab40023b8004c9900312b2ab40033b9004d0100b9004702002ab40023b2004ea5000d2ab40023b2004fa600202ab400332bb80050a700152b2ab40025b9004b03002ab400272bb80051b1 +fromData,129 +toData,133 org/apache/geode/internal/cache/FilterRoutingInfo,4 -fromData,88,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a200372bb800213a06bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffc8b1 -fromDataPre_GFE_7_1_0_0,97,014db8001e4e2dc6000a2db9001f01004d2bb900200100360403360515051504a20040bb002559b700293a0619062bb80022bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffbfb1 -toData,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb600261904b9001c0100c000083a0619062bb80027a7ffc8b1 -toDataPre_GFE_7_1_0_0,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb800271904b9001c0100c000083a0619062bb80027a7ffc8b1 +fromData,88 +fromDataPre_GFE_7_1_0_0,97 +toData,88 +toDataPre_GFE_7_1_0_0,88 org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,4 -fromData,9,2a2bb80014b50015b1 -fromDataPre_GFE_8_0_0_0,50,b800279900162a2bb80028b500292a2bb80014b50015a7001b2a2bb8002ab500012a2bb8002bb5000e2a2bb8002bb50012b1 -toData,255,10093e1d2ab4000ec7000707a700112ab4000eb9001601001008680860603e1d2ab40012c7000707a700112ab40012b9001601001008680860603e1d2ab40001c7000703a7000d2ab40001b60017100c68603ebb0018591d01b700194d2ab40001c7000b2c03b6001aa7005d2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701003a041904b9000801009900351904b900090100c0000a3a051905b9000b0100c0001cb6001d2cb8001e1905b9000c0100c0001fb60020852cb8001ea7ffc72ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000f2cb600253a0419042bb80026b1 -toDataPre_GFE_8_0_0_0,213,b800279900b1bb0018591103e82bb8002cb700194d2ab40001c7000b2c03b6001aa7005a2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701004e2db9000801009900342db900090100c0000a3a041904b9000b0100c0001cb6001d2cb8001e1904b9000c0100c0001fb60020852cb8001ea7ffc92ab4000e2ab400212cb800222ab400122ab400212cb800222bc100189900102bc000232cb900240200a7000d2cb600254e2d2bb80026a700232ab400012bb8002d2ab4000e2ab400212bb800222ab400122ab400212bb80022b1 +fromData,9 +fromDataPre_GFE_8_0_0_0,50 +toData,255 +toDataPre_GFE_8_0_0_0,213 org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2 -fromData,24,2a2bb7001e2a2bb9001f0100b500052a2bb80020b50006b1 -toData,24,2a2bb700212b2ab40005b9002202002ab400062bb80023b1 +fromData,24 +toData,24 org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueReply,2 -fromData,14,2a2bb700042a2bb80005b50002b1 -toData,14,2a2bb700062ab400022bb80007b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/FindRemoteTXMessage,2 -fromData,27,2a2bb700452a2bb80046c00047b500032a2bb900480100b50004b1 -toData,24,2a2bb700422ab400032bb800432b2ab40004b900440200b1 +fromData,27 +toData,24 org/apache/geode/internal/cache/FindRemoteTXMessage$FindRemoteTXMessageReply,2 -fromData,46,2a2bb7000a2a2bb9000b0100b500042bb9000b01009900182a2bb9000b0100b500072a2bb8000cc0000db50006b1 -toData,66,2a2bb700032b2ab40004b9000502002ab40006c6000704a70004033d2b1cb9000502001c99001d2b2ab40007b9000502002ab4000601b600082ab400062bb80009b1 +fromData,46 +toData,66 org/apache/geode/internal/cache/FindVersionTagOperation$FindVersionTagMessage,2 -fromData,55,2a2bb700232a2bb900240100b500032a2bb900250100b500042abb002659b70027b500052ab400052bb800282a2bb900290100b50006b1 -toData,44,2a2bb7001e2b2ab40003b9001f02002b2ab40004b9002002002ab400052bb800212b2ab40006b900220200b1 +fromData,55 +toData,44 org/apache/geode/internal/cache/FindVersionTagOperation$VersionTagReply,2 -fromData,17,2a2bb7000c2a2bb8000dc0000eb50002b1 -toData,14,2a2bb7000a2ab400022bb8000bb1 +fromData,17 +toData,14 org/apache/geode/internal/cache/FixedPartitionAttributesImpl,2 -fromData,39,2a2bb80007b500062a2bb900080100b500022a2bb900090100b500032a2bb900090100b50005b1 -toData,39,2ab400062bb8000a2b2ab40002b9000b02002b2ab40003b9000c02002b2ab40005b9000c0200b1 +fromData,39 +toData,39 org/apache/geode/internal/cache/FunctionStreamingReplyMessage,2 -fromData,64,2a2bb700102a2bb900110100b5000b2a2bb900120100b5000c2a2bb900110100b500042a2bb80013b5000da700144dbb001559b700164e2d2cb60017572dbfb1 -toData,90,2a2bb700182b2ab4000bb9001902002b2ab4000cb9001a02002b2ab40004b9001902002ab4000d2bb8001ba7002e4d2cc1001c99000cbb001d592cb7001ebfbb0015592ab4000db6001fb60020b700214e2d2cb60017572dbfb1 +fromData,64 +toData,90 org/apache/geode/internal/cache/GridAdvisor$GridProfile,2 -fromData,26,2a2bb7001d2a2bb8001eb500052a2bb8001fb500062ab60007b1 -toData,22,2a2bb7001a2ab400052bb8001b2ab400062bb8001cb1 +fromData,26 +toData,22 org/apache/geode/internal/cache/HARegion$HARegionAdvisor$HAProfile,2 -fromData,47,2a2bb700032bb9000401003d2a1cb200057e99000704a7000403b500062a1cb200077e99000704a7000403b50008b1 -toData,45,2a2bb70009033d2ab400069900091cb20005803d2ab400089900091cb20007803d2b1c1100ff7eb9000a0200b1 +fromData,47 +toData,45 org/apache/geode/internal/cache/InitialImageFlowControl$FlowControlPermitMessage,2 -fromData,16,2a2bb7000d2a2bb9000e0100b50002b1 -toData,16,2a2bb7000f2b2ab40002b900100200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/InitialImageOperation$Entry,2 -fromData,89,2a2bb900150100b500032bb9001501003d2a2bb80016b5000a2ab40003b8001199000d2ab20017b50002a7000b2a2bb80018b500022a2bb900190100b500041c047e9900162a1c057e99000704a70004032bb8001ab5000bb1 -toData,101,2b2ab40003b9000d02002ab4000bc6000704a70004033d1c2ab4000bc1000f99000705a700040380913d2b1cb9000d02002ab4000a2bb800102ab40003b800119a000b2ab400022bb800122b2ab40004b9001303002ab4000bc6000b2ab4000b2bb80014b1 +fromData,89 +toData,101 org/apache/geode/internal/cache/InitialImageOperation$FilterInfoMessage,2 -fromData,230,2a2bb7008f2a2bb80090b5001f2ab4000403322bb80090b5003e2ab4000403322bb80090b500412ab4000403322bb80090b500432ab4000403322bb80090b500452ab4000403322bb80090b500472ab4000403322bb80090b500492ab4000403322bb80090b5004b2ab4000403322bb80090b5004d2ab4000404322bb80090b5003e2ab4000404322bb80090b500412ab4000404322bb80090b500432ab4000404322bb80090b500452ab4000404322bb80090b500472ab4000404322bb80090b500492ab4000404322bb80090b5004b2ab4000404322bb80090b5004d2a2bb80090b50033b1 -toData,284,2a2bb7008d2ab4001fc000312bb8008e2ab400040332b4003ec000312bb8008e2ab400040332b40041c000312bb8008e2ab400040332b40043c000312bb8008e2ab400040332b40045c000312bb8008e2ab400040332b40047c000312bb8008e2ab400040332b40049c000312bb8008e2ab400040332b4004bc000312bb8008e2ab400040332b4004dc000312bb8008e2ab400040432b4003ec000312bb8008e2ab400040432b40041c000312bb8008e2ab400040432b40043c000312bb8008e2ab400040432b40045c000312bb8008e2ab400040432b40047c000312bb8008e2ab400040432b40049c000312bb8008e2ab400040432b4004bc000312bb8008e2ab400040432b4004dc000312bb8008e2ab40033c000312bb8008eb1 +fromData,230 +toData,284 org/apache/geode/internal/cache/InitialImageOperation$ImageReplyMessage,2 -fromData,224,2a2bb7001c2bb8001d4d014e2cc600102cb6001e9e00092c03b6001f4e2dc1002099000e2a2dc00021b5000fa700082a2cb5000f2a2bb900220100b500102a2bb900220100b500112a2bb900220100b500122a2bb900230100b500132a2bb900220100b500142a2bb80024b500042a2bb900230100b500032a2bb900230100b500152ab4001599000f2abb0025592bb70026b500022bb900270100360415049b00102abb0028591504b70029b5000103360515051504a200292bb8002ac0002b3a062bb8002c37072ab4000119061607b8002db9002e030057840501a7ffd6b1 -toData,234,2a2bb7002f2ab4000fc1002099001dbb00305904b700314d2c2ab4000fb60032572c2bb80033a7000e2ab4000fc000302bb800332b2ab40010b9003402002b2ab40011b9003402002b2ab40012b9003402002b2ab40013b9003502002b2ab40014b9003402002b2ab40003b9003502002b2ab40015b9003502002ab4001599000b2ab400022bb800362b2ab40001c7000702a7000c2ab40001b900370100b9003802002ab40001c600422ab40001b900390100b9003a01004d2cb9003b010099002a2cb9003c0100c0003d4e2db9003e01002bb8003f2db900400100c00041b600422bb80043a7ffd3b1 +fromData,224 +toData,234 org/apache/geode/internal/cache/InitialImageOperation$InitialImageVersionedEntryList,2 -fromData,406,b80022b20023b9002402003d2bb9003601003e1d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b500021d10207e1020a0000704a700040336061c990014b80022b2002312371db80026b900380400150499003c2bb800398836071c990015b80022b20023123a1507b80031b90038040003360815081507a200152a2bb8003bc00014b7001257840801a7ffea15059900e42bb800398836071c990015b80022b20023123c1507b80031b9003804002abb0003591507b70005b50004bb0003591507b700053a0803360915091507a200a22bb900360100360a150aaa000000008f00000000000000030000001e0000002c0000003f000000632ab4000401b90011020057a700662ab4000415062bb8003db90011020057a7005315062bb8003d3a0b1908190bb6002db900110200572ab40004190bb90011020057a7002f15062bb8003d3a0b2bb8003988360c190b1908150cb900160200c0003eb600342ab40004190bb90011020057840901a7ff5da7000e2abb000359b70001b50004b1 -toData,396,033d033e0336042ab700209a00091c05803d043e2ab40004b9000d01009e00431c07803d0436042ab40004b9001a01003a051905b9001b01009900271905b9001c0100c000173a061906c600131906c1002199000e1c1020803da70006a7ffd52ab400029900081c1008803db80022b20023b900240200990015b80022b2002312252a1cb80026b9002705002b1cb9002802001d9900282ab7000e852bb8002903360515052ab7000ea200132a1505b700132bb8002a840501a7ffea15049900cd2ab40004b9000d0100852bb80029bb002b592ab40004b9000d0100b7002c3a050336062ab40004b9001a01003a071907b9001b01009900951907b9001c0100c000173a081908c7000d2b03b900280200a700771908b6002d3a091909c700132b04b90028020019082bb8002ea7005b19051909b9002f0200c000303a0a190ac700292b05b9002802001506840601b800313a0a19051909190ab9003203005719082bb8002ea700222b06b90028020019082b03b6003319081909b60034190ab60035852bb80029a7ff67b1 +fromData,406 +toData,396 org/apache/geode/internal/cache/InitialImageOperation$RVVReplyMessage,2 -fromData,33,2a2bb700162bb9001701003d1c9900132bb9001701003e2a1d2bb80018b50004b1 -toData,51,2a2bb700092ab40004c600222b04b9000a02002b2ab40004c1000bb9000a02002ab400042bb6000ca7000a2b03b9000a0200b1 +fromData,33 +toData,51 org/apache/geode/internal/cache/InitialImageOperation$RegionStateMessage,2 -fromData,66,2a2bb7001f2a2bb900200100b500052bb9002001003d1c99000f2a2b2ab40005b80021b500042bb9002001003d1c9900132bb9002001003e2a1d2bb80022b50006b1 -toData,101,2a2bb7000d2b2ab40005b9000e02002ab40004c6001d2b04b9000e02002b2ab400042ab400052ab6000fb80010a7000a2b03b9000e02002ab40006c600222b04b9000e02002b2ab40006c10011b9000e02002ab400062bb80012a7000a2b03b9000e0200b1 +fromData,66 +toData,101 org/apache/geode/internal/cache/InitialImageOperation$RequestFilterInfoMessage,2 -fromData,24,2a2bb7001e2a2bb8001fb500042a2bb900200100b50002b1 -toData,24,2a2bb700212ab400042bb800222b2ab40002b900230200b1 +fromData,24 +toData,24 org/apache/geode/internal/cache/InitialImageOperation$RequestImageMessage,2 -fromData,98,2a2bb700b52a2bb800b6b500172a2bb900b70100b500022a2bb900b80100b500552a2bb900b80100b500032a2bb900b80100b5004b2a2bb800b9c000bab5003a2a2bb800b9c000bbb500262a2bb800b9c000bcb5003b2a2bb800b9c000bdb50030b1 -toData,86,2a2bb700be2ab400172bb800bf2b2ab40002b900c002002b2ab40055b900c102002b2ab40003b900c102002b2ab4004bb900c102002ab4003a2bb800c22ab400262bb800c22ab4003b2bb800c22ab400302bb800c2b1 +fromData,98 +toData,86 org/apache/geode/internal/cache/InitialImageOperation$RequestRVVMessage,2 -fromData,34,2a2bb7001e2a2bb8001fb500052a2bb900200100b500022a2bb900210100b50003b1 -toData,34,2a2bb700222ab400052bb800232b2ab40002b9002402002b2ab40003b900250200b1 +fromData,34 +toData,34 org/apache/geode/internal/cache/InitialImageOperation$RequestSyncMessage,2 -fromData,73,2a2bb700222a2bb80023b500022bb9002401003d2bb9002501003e2a1dbd0026b5000a03360415041da2001f2ab4000a15041c99000a2bb80027a700072bb8002853840401a7ffe1b1 -toData,77,2a2bb7001c2ab400022bb8001d2b2ab4000a0332c1001eb9001f02002b2ab4000abeb9002002002ab4000a4d2cbe3e03360415041da200172c1504323a0519052bb900210200840401a7ffe9b1 +fromData,73 +toData,77 org/apache/geode/internal/cache/InterestRegistrationEventImpl,2 -fromData,33,2a2bb80010b500052a2bb80011b500062a2bb80012b500072a2bb80013b50008b1 -toData,36,2ab400052bb8000b2ab40006c0000c2bb8000d2ab400072bb8000e2ab400082bb8000fb1 +fromData,33 +toData,36 org/apache/geode/internal/cache/InvalidateOperation$InvalidateMessage,2 -fromData,25,2a2bb700282a2bb80029c0002ab500022a2bb80029b50015b1 -toData,22,2a2bb7002b2ab400022bb8002c2ab400152bb8002cb1 +fromData,25 +toData,22 org/apache/geode/internal/cache/InvalidateOperation$InvalidateWithContextMessage,2 -fromData,14,2a2bb7000c2a2bb8000db50004b1 -toData,14,2a2bb7000e2ab400042bb8000fb1 +fromData,14 +toData,14 org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage,2 -fromData,14,2a2bb700152a2bb80016b50004b1 -toData,14,2a2bb700172ab400042bb80018b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/InvalidateRegionOperation$InvalidateRegionMessage,2 -fromData,17,2a2bb700122a2bb80013c00014b50007b1 -toData,14,2a2bb700152ab400072bb80016b1 +fromData,17 +toData,14 org/apache/geode/internal/cache/JtaAfterCompletionMessage,2 -fromData,26,2a2bb700232a2bb900240100b500042a2bb900240100b50002b1 -toData,26,2a2bb700212b2ab40004b9002202002b2ab40002b900220200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/LatestLastAccessTimeMessage,2 -fromData,30,2a2bb700122a2bb80013b500042a2bb80014b500072a2bb80015b50005b1 -toData,30,2a2bb700162ab400042bb800172ab400072bb800182ab400052bb80019b1 +fromData,30 +toData,30 org/apache/geode/internal/cache/MemberFunctionStreamingMessage,2 -fromData,163,2a2bb700532bb9005401003d1c047e9900142a2bb900550100b500082ab40008b800561c077e99000d2a2bb900550100b500051c057e99000e2a2bb80057c00058b500062bb800574e2dc1002b9900252a03b5000a2a2dc0002bb80059b500072ab40007c7001b2a2dc0002bb5001ba700102a2dc0005ab500072a04b5000a2a2bb80057b500092a2bb80057c0005bb500102a1c10407e99000704a7000403b5000bb1 -toData,162,2a2bb7005d033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000b9900091c104080933d2b1cb9005e02002ab4000899000d2b2ab40008b9005f02002ab40005029f000d2b2ab40005b9005f02002ab40006c6000b2ab400062bb800602ab4000a99000e2ab400072bb80060a700102ab40007b9002001002bb800602ab400092bb800602ab400102bb80060b1 +fromData,163 +toData,162 org/apache/geode/internal/cache/Node,2 -fromData,60,2abb001c59b7001db500052ab400052bb8001e2a2bb9001f0100b500032a2bb900200100b500042a2bb900210100b500152a2bb9001f0100b50006b1 -toData,49,2ab400052bb800182b2ab40003b9001902002b2ab40004b9001a02002b2ab40015b9001b02002b2ab40006b900190200b1 +fromData,60 +toData,49 org/apache/geode/internal/cache/NonLocalRegionEntry,2 -fromData,48,2a2bb80027b500032a2bb80027b500062a2bb900280100b5000c2a2bb900290100b5000e2a2bb80027c0002ab50011b1 -toData,45,2ab400032bb800242ab400062bb800242b2ab4000cb9002503002b2ab4000eb9002602002ab400112bb80024b1 +fromData,48 +toData,45 org/apache/geode/internal/cache/NonLocalRegionEntryWithStats,2 -fromData,36,2a2bb700132a2bb900140100b500032a2bb900140100b500052a2bb900140100b50007b1 -toData,36,2a2bb700112b2ab40003b9001203002b2ab40005b9001203002b2ab40007b900120300b1 +fromData,36 +toData,36 org/apache/geode/internal/cache/PRQueryProcessor$EndOfBucket,2 -fromData,11,2a2bb9000b0100b50002b1 -toData,11,2b2ab40002b9000c0200b1 +fromData,11 +toData,11 org/apache/geode/internal/cache/PartitionAttributesImpl,2 -fromData,102,2a2bb900580100b5001b2a2bb900590100b500082a2bb900580100b5000c2a2bb900580100b500012a2bb8005ab500142a2bb8005bc0001eb5000d2a2bb8005bc0001eb500022a2bb900590100b500162a2bb900590100b500182a2bb8005bc0005cb5002fb1 -toData,97,2ab7002b2b2ab4001bb9005402002b2ab40008b9005503002b2ab60047b9005402002b2ab40001b9005402002ab400142bb800562ab4000d2bb800572ab400022bb800572b2ab40016b9005503002b2ab40018b9005503002ab4002f2bb80057b1 +fromData,102 +toData,97 org/apache/geode/internal/cache/PartitionRegionConfig,2 -fromData,207,2a2bb900500100b500162a2bb900510100b80052b500032a2bb80053b500182a2bb900540100b500052a2bb900540100b5001f2abb001959b7001ab500042ab400042bb800552a2bb80056b500082a2bb80056b500092a2bb80056b500072a2bb80057b5000c2a2bb80058b5000e2a2bb80058b5000d2a2bb80058b500102a2bb80058b5000f2a2bb900540100b500062a2bb80059c0005ab500112ab40011c7000e2abb002159b70022b500112a2bb8005bb500142a2bb80059c0005ab500012ab40001c7000a2ab80015b50001b1 -toData,178,2b2ab40016b9004702002b2ab40003b40048b9004902002ab400182bb8004a2b2ab40005b9004b02002b2ab4001fb9004b02002ab400042bb8004a2ab400082bb8004c2ab400092bb8004c2ab400072bb8004c2ab4000c2bb8004a2ab4000e2bb8004a2ab4000d2bb8004a2ab400102bb8004a2ab4000f2bb8004a2b2ab40006b9004b02002ab400112bb8004d2ab400142bb8004e2ab40001b9004f010099000b012bb8004da7000b2ab400012bb8004db1 +fromData,207 +toData,178 org/apache/geode/internal/cache/PoolFactoryImpl$PoolAttributes,2 -fromData,153,2a2bb80034b500052a2bb80034b500072a2bb80034b500092a2bb80034b5000b2a2bb80034b5000c2a2bb80034b5000d2a2bb80034b500112a2bb80035b500102a2bb80035b500142a2bb80034b500182a2bb80034b5001a2a2bb80036b5000a2a2bb80036b500162a2bb80037b5001d2a2bb80038b500212a2bb80038b500222a2bb80034b500152a2bb80036b5001e2a2bb80034b50004b1 -toData,153,2ab400052bb8002f2ab400072bb8002f2ab400092bb8002f2ab4000b2bb8002f2ab4000c2bb8002f2ab4000d2bb8002f2ab400112bb8002f2ab400102bb800302ab400142bb800302ab400182bb8002f2ab4001a2bb8002f2ab4000a2bb800312ab400162bb800312ab4001d2bb800322ab400212bb800332ab400222bb800332ab400152bb8002f2ab4001e2bb800312ab400042bb8002fb1 +fromData,153 +toData,153 org/apache/geode/internal/cache/PreferBytesCachedDeserializable,2 -fromData,9,2a2bb8000fb50003b1 -toData,9,2ab400032bb80010b1 +fromData,9 +toData,9 org/apache/geode/internal/cache/QueuedOperation,1 -toData,78,2b2ab40002b40035b9003602002ab400072bb800372ab40002b600319900312ab400032bb800372ab40002b600169a000d2ab40002b600159900152b2ab40006b9003602002ab400042bb80038b1 +toData,78 org/apache/geode/internal/cache/RegionEventImpl,2 -fromData,48,2a2bb80023b500092a2bb80024b500022a2bb900250100b80026b5000a2a2bb900270100b500032a2bb80028b5000bb1 -toData,51,2ab400092bb8001c2ab400022bb8001d2b2ab4000ab4001eb9001f02002b2ab40003b9002002002ab4000bc000212bb80022b1 +fromData,48 +toData,51 org/apache/geode/internal/cache/ReleaseClearLockMessage,2 -fromData,24,2a2bb700212a2bb80022b500022a2bb900230100b50003b1 -toData,24,2a2bb700242ab400022bb800252b2ab40003b900260200b1 +fromData,24 +toData,24 org/apache/geode/internal/cache/tx/RemoteContainsKeyValueMessage,2 -fromData,33,2a2bb7002e2a2bb8002fb500062a2ab4003010407e99000704a7000403b50005b1 -toData,14,2a2bb700312ab400062bb80032b1 +fromData,33 +toData,14 org/apache/geode/internal/cache/tx/RemoteContainsKeyValueMessage$RemoteContainsKeyValueReplyMessage,2 -fromData,16,2a2bb700152a2bb900160100b50003b1 -toData,16,2a2bb700172b2ab40003b900180200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/tx/RemoteDestroyMessage,2 -fromData,131,2a2bb700892a2bb8008ab7008b2a2bb8008ab5000c2a2bb9008c0100b8008db5000e2ab4008e1102007e99000e2a2bb8008ac0008fb500102ab4008e1104007e99000e2a2bb8008ac00035b500672a2bb8008ac00090b500122ab400059900122bb9008c0100572a2bb80091b700222a2bb8008ab500082a2bb8008ac00092b50017b1 -toData,135,2a2bb700932ab6006a2bb800942ab4000c2bb800942b2ab4000eb40095b9009602002ab40010c6000b2ab400102bb800942ab40067c6000b2ab400672bb800942ab400122bb800942ab4000599002a2b2ab4000699000704a7000403b9009602002ab40006b800973d1c2ab700982ab6006e2bb800992ab400082bb800942ab400172bb80094b1 +fromData,131 +toData,135 org/apache/geode/internal/cache/tx/RemoteDestroyMessage$DestroyReplyMessage,2 -fromData,52,2a2bb700232bb9002401003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80025b50009b1 -toData,57,2a2bb7001f033d2ab40009c600081c0480913d2ab40009c100209900081c0580913d2b1cb9002102002ab40009c6000b2ab400092bb80022b1 +fromData,52 +toData,57 org/apache/geode/internal/cache/tx/RemoteFetchEntryMessage,2 -fromData,14,2a2bb700312a2bb80032b50004b1 -toData,14,2a2bb700332ab400042bb80034b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/tx/RemoteFetchEntryMessage$FetchEntryReplyMessage,2 -fromData,30,2a2bb7001e2bb9001f01003d1c9a00102abb0020592b01b70021b50003b1 -toData,38,2a2bb7001a2ab40003c7000d2b04b9001b0200a700122b03b9001b02002ab400032bb8001cb1 +fromData,30 +toData,38 org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage,2 -fromData,14,2a2bb700152a2bb80016b50012b1 -toData,14,2a2bb700172ab400122bb80018b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/tx/RemoteFetchVersionMessage$FetchVersionReplyMessage,2 -fromData,17,2a2bb7001b2a2bb8001cc0001db50001b1 -toData,14,2a2bb700192ab400012bb8001ab1 +fromData,17 +toData,14 org/apache/geode/internal/cache/tx/RemoteGetMessage,2 -fromData,33,2a2bb700332a2bb80034b500042a2bb80034b500052a2bb80034c00035b50006b1 -toData,30,2a2bb700362ab400042bb800372ab400052bb800372ab400062bb80037b1 +fromData,33 +toData,30 org/apache/geode/internal/cache/tx/RemoteGetMessage$GetReplyMessage,2 -fromData,48,2a2bb700202a2bb90021010004a0000704a7000403b500052a2bb80022b500232ab400059a000b2a2bb80024b50025b1 -toData,32,2a2bb7001d2b2ab4000599000704a7000403b9001e02002ab400032bb6001fb1 +fromData,48 +toData,32 org/apache/geode/internal/cache/tx/RemoteInvalidateMessage$InvalidateReplyMessage,2 -fromData,52,2a2bb700242bb9002501003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80026b50003b1 -toData,57,2a2bb70020033d2ab40003c600081c0480913d2ab40003c100219900081c0580913d2b1cb9002202002ab40003c6000b2ab400032bb80023b1 +fromData,52 +toData,57 org/apache/geode/internal/cache/tx/RemoteOperationMessage,2 -fromData,43,2a2bb700562a2bb900570100b500582a2ab400582bb600592a2bb8005ab5000a2a2bb9005b0100b50006b1 -toData,103,2a2bb7005c2ab6005d3d2b1cb9005e02002ab4000c99000d2b2ab4000cb9005f02002ab4006099000d2b2ab40060b9006102002ab60015029f000d2b2ab60015b9005f02002ab60016c6000b2ab600162bb800622ab4000a2bb800632b2ab40006b900640200b1 +fromData,43 +toData,103 org/apache/geode/internal/cache/tx/RemotePutAllMessage,2 -fromData,223,2a2bb700502a2bb80051c00052b500382a2bb80051b5003a2a2ab4005310087e99000704a7000403b500052ab4005310407e99000e2a2bb80051c00054b5004e2a2ab400531100807e99000704a7000403b500042a2bb8005588b500072a2ab40007bd0056b500062ab400079e00722bb800574dbb005859b700594e03360415042ab40007a200202ab400061504bb0056592b2ab4003815042c2db7005a53840401a7ffdd2bb9005b01003604150499002f2bb8005c3a0503360615062ab40007a2001d2ab4000615063219051506b6005dc0001fb50020840601a7ffe0b1 -toData,173,2a2bb7005e2ab400382bb8005f2ab4003a2bb8005f2ab4004ec6000b2ab4004e2bb8005f2ab40007852bb800602ab400079e007bbb0061592ab40007b700624d033e03360415042ab40007a200511d9a00122ab40006150432b40020c60005043e2ab40006150432b400203a052c1905b60063572ab4000615043201b500202ab400061504322bb600642ab400061504321905b50020840401a7ffac2b1db9006502001d9900082c2bb80066b1 +fromData,223 +toData,173 org/apache/geode/internal/cache/tx/RemotePutAllMessage$PutAllReplyMessage,2 -fromData,17,2a2bb700192a2bb8001ac0001bb50001b1 -toData,14,2a2bb7001c2ab400012bb8001db1 +fromData,17 +toData,14 org/apache/geode/internal/cache/tx/RemotePutMessage,2 -fromData,223,2a2bb700722a2bb80073b600742bb9007501003d2a1cb200767e91b500072a2bb80073b500202a2bb900770100b500212a2bb900780100b80079b500231cb2007a7e99000e2a2bb80073c0007bb500251cb2007c7e99000e2a2bb80073c0003eb5007d2abb007e59b7007fb500272ab400272bb800802ab400811120007e99000b2a2bb80073b500112ab4000a99001e2a2bb90078010004a0000704a7000403b500082a2bb80082b700832a2bb80082b700842ab400811104007e9900102a04b5000c2a2bb80082b500851cb200867e99000e2a2bb80073c00087b5002cb1 -toData,252,2a03b5000b2a2bb700892ab6008a2bb8008b2ab400073d2ab40025c600091cb2007a803d2ab4007dc600091cb2007c803d2ab4002cc600091cb20086803d2b1cb9008c02002ab6008d2bb8008b2b2ab40021b9008e03002b2ab40023b4008fb9008c02002ab40025c6000b2ab400252bb8008b2ab4007dc6000b2ab4007d2bb8008b2ab400272bb800902ab40011c6000b2ab400112bb8008b2ab4000a99002a2b2ab4000899000704a7000403b9008c02002ab40008b800913e1d2ab700922ab600932bb800942ab400072ab400702ab600952bb800942ab4000eb60096c6000e2ab4000eb600962bb800972ab4002cc6000b2ab4002c2bb8008bb1 +fromData,223 +toData,252 org/apache/geode/internal/cache/tx/RemotePutMessage$PutReplyMessage,2 -fromData,81,2a2bb700252bb9002601001100ff7e913d2a1c047e99000704a7000403b500032a2bb900260100b80027b500022a2bb80028b500061c057e9900181c077e99000704a70004033e2a1d2bb80029b50007b1 -toData,94,2a2bb70032033d2ab400039900081c0480913d2ab40007c600081c0580913d2ab40007c100339900081c0780913d2b1cb9003402002b2ab40002b40035b9003402002b2ab600362ab40037b800382ab40007c6000b2ab400072bb80039b1 +fromData,81 +toData,94 org/apache/geode/internal/cache/tx/RemoteClearMessage,2 -fromData,13,2a2bb700232bb90024010057b1 -toData,18,2a2bb700252bb20004b60026b900270200b1 +fromData,13 +toData,18 org/apache/geode/internal/cache/tx/RemoteClearMessage$RemoteClearReplyMessage,2 -fromData,6,2a2bb70014b1 -toData,6,2a2bb70015b1 +fromData,6 +toData,6 org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage,2 -fromData,203,2a2bb7004e2a2bb8004fc00050b500362a2bb8004fb500382a2ab4005110087e99000704a7000403b500032ab4005110407e99000e2a2bb8004fc00052b5004c2a2bb8005388b500052a2ab40005bd0054b500042ab400059e00722bb800554dbb005659b700574e03360415042ab40005a200202ab400041504bb0054592b2ab4003615042c2db7005853840401a7ffdd2bb9005901003604150499002f2bb8005a3a0503360615062ab40005a2001d2ab4000415063219051506b6005bc0001db5001e840601a7ffe0b1 -toData,173,2a2bb7005c2ab400362bb8005d2ab400382bb8005d2ab4004cc6000b2ab4004c2bb8005d2ab40005852bb8005e2ab400059e007bbb005f592ab40005b700604d033e03360415042ab40005a200511d9a00122ab40004150432b4001ec60005043e2ab40004150432b4001e3a052c1905b60061572ab4000415043201b5001e2ab400041504322bb600622ab400041504321905b5001e840401a7ffac2b1db9006302001d9900082c2bb80064b1 +fromData,203 +toData,173 org/apache/geode/internal/cache/tx/RemoteRemoveAllMessage$RemoveAllReplyMessage,2 -fromData,17,2a2bb700192a2bb8001ac0001bb50001b1 -toData,14,2a2bb7001c2ab400012bb8001db1 +fromData,17 +toData,14 org/apache/geode/internal/cache/RoleEventImpl,2 -fromData,63,2a2bb7000e2bb8000f4dbb0010592cbeb700114e03360415042cbea2001b2c150432b800123a052d1905b90013020057840401a7ffe42a2db80003b50004b1 -toData,72,2a2bb700062ab40004b900070100bd00084d2ab40004b9000901004e03360415042cbea2001f2db9000a0100c0000b3a052c15041905b9000c010053840401a7ffe02c2bb8000db1 +fromData,63 +toData,72 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetLoadReplyMessage,2 -fromData,63,2a2bb7001d2a2bb9001e0100b500072a2bb8001fb500082a2bb80020b5000a2a2bb80020c00021b500092a2bb900220100b5000b2a2bb900220100b5000cb1 -toData,91,2a2bb700162b2ab40007b9001702002ab4000b3d2ab40008c100189900142ab40008c00018c000182bb80019a7000d2ab400082bb8001a043d2ab4000a2bb8001b2ab400092bb8001b2b1cb9001c02002b2ab4000cb9001c0200b1 +fromData,63 +toData,91 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetLoadRequestMessage,2 -fromData,72,2a2bb7001f2a2bb900200100b5000e2a2bb900210100b5000f2a2bb80022b500102a2bb80022b500112a2bb900200100b500122a2bb900200100b500132a2bb900200100b50014b1 -toData,72,2a2bb7001b2b2ab4000eb9001c02002b2ab4000fb9001d02002ab400102bb8001e2ab400112bb8001e2b2ab40012b9001c02002b2ab40013b9001c02002b2ab40014b9001c0200b1 +fromData,72 +toData,72 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetSearchReplyMessage,2 -fromData,131,2a2bb700242a2bb900250100b500072a2bb80026b500082ab40008c6000c2a2ab40008beb5000a2a2bb900270100b5000b2bb9002801003d2a1c047e99000704a7000403b5000c2a1c057e99000704a7000403b5000d2a1c077e99000704a7000403b5000e1c10087e9900191c10107e99000704a70004033e2a1d2bb80029b5000fb1 -toData,145,2a2bb7001c2b2ab40007b9001d02002ab40009c6000e2ab400092bb8001ea7000f2ab400082ab4000a2bb8001f2b2ab4000bb900200300033d2ab4000c9900081c0480913d2ab4000d9900081c0580913d2ab4000e9900081c0780913d2ab4000fc600091c100880913d2ab4000fc100219900091c101080913d2b1cb9002202002ab4000fc6000b2ab4000f2bb80023b1 +fromData,131 +toData,145 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetSearchRequestMessage,2 -fromData,97,2a2bb7001c2bb9001d01003d1c047e9900142a2bb9001e0100b5000b2ab4000bb8001f2a2bb900200100b5000c2a2bb80021b5000d2a2bb9001e0100b5000e1c10407e99000c2a2bb8002288b5000f1c1100807e99000c2a2bb8002288b50010b1 -toData,131,2a2bb70016033d2ab4000b9900081c0480933d2ab4000f9900091c104080933d2ab4001099000a1c11008080933d2b1cb9001702002ab4000b99000d2b2ab4000bb9001802002b2ab4000cb9001902002ab4000d2bb8001a2b2ab4000eb9001802002ab4000f99000c2ab4000f852bb8001b2ab4001099000c2ab40010852bb8001bb1 +fromData,97 +toData,131 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetWriteReplyMessage,2 -fromData,47,2a2bb700182a2bb900190100b500072a2bb9001a0100b500082a2bb8001bc0001cb500092a2bb9001a0100b5000ab1 -toData,44,2a2bb700142b2ab40007b9001502002b2ab40008b9001602002ab400092bb800172b2ab4000ab900160200b1 +fromData,47 +toData,44 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$NetWriteRequestMessage,2 -fromData,57,2a2bb700182a2bb900190100b5000a2a2bb9001a0100b5000b2a2bb900190100b5000c2a2bb8001bc0001cb5000d2a2bb900190100b5000eb1 -toData,54,2a2bb700142b2ab4000ab9001502002b2ab4000bb9001602002b2ab4000cb9001502002ab4000d2bb800172b2ab4000eb900150200b1 +fromData,57 +toData,54 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$QueryMessage,2 -fromData,114,2a2bb7001f2bb9002001003d1c047e9900142a2bb900210100b5000c2ab4000cb800222a2bb900230100b5000d2a2bb80024b5000f2a2bb900210100b500101c10407e99000c2a2bb8002588b500111c1100807e99000c2a2bb8002588b500122a1c1101007e99000704a7000403b50008b1 -toData,145,2a2bb70019033d2ab4000c9900081c0480933d2ab400119900091c104080933d2ab4001299000a1c11008080933d2ab4000899000a1c11010080933d2b1cb9001a02002ab4000c99000d2b2ab4000cb9001b02002b2ab4000db9001c02002ab4000f2bb8001d2b2ab40010b9001b02002ab4001199000c2ab40011852bb8001e2ab4001299000c2ab40012852bb8001eb1 +fromData,114 +toData,145 org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$ResponseMessage,2 -fromData,83,2a2bb7001f2a2bb80020b500072a2bb900210100b500082a2bb80020b500092a2bb900220100b5000a2a2bb900230100b5000b2a2bb900230100b5000c2a2bb900230100b5000d2a2bb80020c00024b5000eb1 -toData,80,2a2bb7001a2ab400072bb8001b2b2ab40008b9001c02002ab400092bb8001b2b2ab4000ab9001d03002b2ab4000bb9001e02002b2ab4000cb9001e02002b2ab4000db9001e02002ab4000e2bb8001bb1 +fromData,83 +toData,80 org/apache/geode/internal/cache/ServerPingMessage,2 -fromData,16,2a2bb7002d2a2bb9002e0100b50002b1 -toData,16,2a2bb7002b2b2ab40002b9002c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/StateFlushOperation$StateMarkerMessage,2 -fromData,62,2a2bb7004f2a2bb80050c00051b500182a2bb900520100b500022a2bb900520100b500032a2bb900530100b5001b2ab4001b9a000b2a2bb80054b50008b1 -toData,59,2a2bb700492ab400182bb8004a2b2ab40002b9004b02002b2ab40003b9004b02002b2ab4001bb9004c02002ab4001b9a000b2ab400082bb8004db1 +fromData,62 +toData,59 org/apache/geode/internal/cache/StateFlushOperation$StateStabilizationMessage,2 -fromData,45,2a2bb700202a2bb900210100b500172a2bb80022b500192a2bb80023c00024b5001b2a2bb900250100b5001db1 -toData,42,2a2bb700162b2ab40017b9001802002ab400192bb8001a2ab4001b2bb8001c2b2ab4001db9001e0200b1 +fromData,45 +toData,42 org/apache/geode/internal/cache/StateFlushOperation$StateStabilizedMessage,2 -fromData,17,2a2bb7000d2a2bb8000ec0000fb50002b1 -toData,14,2a2bb7000a2ab400022bb8000bb1 +fromData,17 +toData,14 org/apache/geode/internal/cache/StoreAllCachedDeserializable,2 -fromData,20,2a2bb8000fb500072a2ab40007b80008b50009b1 -toData,9,2ab400072bb80010b1 +fromData,20 +toData,9 org/apache/geode/internal/cache/TXCommitMessage,2 -fromData,211,2bb900ed01003d2ab700049900122a1cb500942ab40094b800eea700082a02b500942a2bb800efb500152bb900f0010099000b2a2bb800f1b500162bb900ed01003e2a2bb800f2b5001f2a2bb900f30100b500202a2bb900f30100b500212a2bb900f00100b800f4b500022bb900ed010036042abb00cf591504b700d1b500172abb00cf591db700d1b500a403360515051504a2002fbb0025592ab700f53a0619062bb600f6a7000c3a072a1907b600b2b12ab400171906b6004957840501a7ffd02a2bb800f7b500032a2bb800f8b5001bb1 -toData,292,2b2ab40094b900f902002ab400152bb800fa2ab40016c6000704a70004033d2b1cb900fb02001c99000b2ab400162bb800fa033d033e2ab40017c600362ab40017b600d03d03360415042ab40017b600d0a2001f2ab400171504b600fcc000253a051d1905b400fd603e840401a7ffdb2b1db900f902002ab40009c6002b2ab40009b600fe2bb800ff2b2ab40009b60100b9010103002b2ab40009b60102b901010300a7001f2ab4001f2bb800ff2b2ab40020b9010103002b2ab40021b9010103002ab40009c600142ab40009b60103b800f42bb80104a7000b2ab400022bb801042b1cb900f902001c9e0029033e1d2ab40017b600d0a2001c2ab400171db600fcc000253a0419042bb60105840301a7ffdf2ab400032bb801062ab4001b2bb80107b1 +fromData,211 +toData,292 org/apache/geode/internal/cache/TXCommitMessage$CommitProcessForLockIdMessage,2 -fromData,26,2a2bb80010b500022ab40002c6000704a70004031203b80004b1 -toData,9,2ab400022bb8000fb1 +fromData,26 +toData,9 org/apache/geode/internal/cache/TXCommitMessage$CommitProcessForTXIdMessage,2 -fromData,26,2a2bb80010b500022ab40002c6000704a70004031203b80004b1 -toData,9,2ab400022bb8000fb1 +fromData,26 +toData,9 org/apache/geode/internal/cache/TXCommitMessage$CommitProcessQueryMessage,2 -fromData,19,2a2bb80013b500022a2bb900140100b50003b1 -toData,19,2ab400022bb800102b2ab40003b900110200b1 +fromData,19 +toData,19 org/apache/geode/internal/cache/TXCommitMessage$CommitProcessQueryReplyMessage,2 -fromData,16,2a2bb700042a2bb900050100b50002b1 -toData,16,2a2bb700062b2ab40002b900070200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/TXCommitMessage$RegionCommit,2 -fromData,173,2a2bb8005ab5000b2a2bb8005ab5001f2bb9005b01003d1c9e00942abb0055591cb70056b500532abb0055591cb70056b500572bb9005c01003e2a2bb8005dc0005eb5005f03360415041ca20061bb0060592ab700613a0519052b1d2a2ab4000b2ab4001fb70062b600631905b80034c600162ab4005fc6000f1905b800342ab4005fb600642ab400021905b600652ab400531905b4002eb60058572ab400571905b6005857840401a7ff9fb1 -toData,77,2ab40005c600152ab40005b600832ab400052bb60084a700362ab4000404a400292bb800854dbb0086591104002cb700874e2a2db700882a2db500052ab400052bb60084a700082a2bb70088b1 +fromData,173 +toData,77 org/apache/geode/internal/cache/TXCommitMessage$RegionCommit$FarSideEntryOp,2 -fromData,171,2a2bb80006b500072a2bb900080100b80009b5000a1c9900102a2bb9000b0100b5000ca7000d2a2bb900080100b5000c2a2bb80006b5000d2a2bb80006c0000eb500032a2bb80006c0000fb500021d99000d2a2bb900100100b500012a2bb9000b0100b500112ab4000ab600129a003d2a2bb900130100b500142ab4000ab600159a00292bb9001301003604150499000e2a2bb80006b50016a700112a2bb80017b80018b80019b50016b1 -toData,187,2b2ab4000ab4001ab9001b02001c9900102b2ab4000cb9001c0200a7000d2b2ab4000cb9001b02002ab4000d2bb8001d2ab400032bb8001d1d99000b2ab400022bb8001d150499000d2b2ab40001b9001e03002b2ab40011b9001c02002ab4000ab600129a00562b2ab40014b9001f02002ab4000ab600159a00422ab40016b80020360515059a000d2ab40016c1002199000704a700040336052b1505b9001f0200150599000e2ab400162bb8001da7000b2ab400162bb80022b1 +fromData,171 +toData,187 org/apache/geode/internal/cache/TXEntryState$DistTxThinEntryState,2 -fromData,23,2a2bb80009b6000ab500022a2bb80009b6000ab50005b1 -toData,23,2ab40002b800072bb800082ab40005b800072bb80008b1 +fromData,23 +toData,23 org/apache/geode/internal/cache/TXId,2 -fromData,19,2a2bb900120100b500032a2bb80013b50002b1 -toData,19,2b2ab40003b9001002002ab400022bb80011b1 +fromData,19 +toData,19 org/apache/geode/internal/cache/TXManagerImpl$TXRemovalMessage,2 -fromData,9,2a2bb80009b50004b1 -toData,12,2ab40004c000072bb80008b1 +fromData,9 +toData,12 org/apache/geode/internal/cache/TXMessage,2 -fromData,37,2a2bb700502a2bb900510100b500052a2bb900510100b500032a2bb80052c00053b50002b1 -toData,34,2a2bb7004d2b2ab40005b9004e02002b2ab40003b9004e02002ab400022bb8004fb1 +fromData,37 +toData,34 org/apache/geode/internal/cache/TXRegionLockRequestImpl,2 -fromData,71,2a2bb8000db500042ab8000eb500022bb8000f3d2ab40002c6001b1c9e00172a2ab400022ab40004b900100200c00011b500032a2a1c2bb70012b50005a700094d2a01b50005b1 -toData,17,2ab6001f2bb800202ab400052bb80021b1 +fromData,71 +toData,17 org/apache/geode/internal/cache/TXRemoteCommitMessage$TXRemoteCommitReplyMessage,2 -fromData,17,2a2bb700192a2bb8001ac0001bb50004b1 -toData,14,2a2bb700172ab400042bb80018b1 +fromData,17 +toData,14 org/apache/geode/internal/cache/Token$Destroyed,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/Token$EndOfStream,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/Token$Invalid,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/Token$Removed,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/Token$Removed2,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/Token$Tombstone,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/UpdateAttributesProcessor$ProfileReplyMessage,2 -fromData,17,2a2bb700152a2bb80016c00017b50007b1 -toData,14,2a2bb700182ab400072bb80019b1 +fromData,17 +toData,14 org/apache/geode/internal/cache/UpdateAttributesProcessor$ProfilesReplyMessage,2 -fromData,62,2a2bb700152bb9001601003d1c02a0000b2a01b50007a700271cbd00174e03360415041ca200142d15042bb80018c0001753840401a7ffec2a2db50007b1 -toData,59,2a2bb700192ab40007c7000d2b02b9001a0200a700272ab40007be3d2b1cb9001a0200033e1d1ca200132ab400071d322bb8001b840301a7ffeeb1 +fromData,62 +toData,59 org/apache/geode/internal/cache/UpdateAttributesProcessor$UpdateAttributesMessage,2 -fromData,62,2a2bb700292a2bb8002ab500082a2bb9002b0100b500022ab40002b8002c2a2bb8002dc0000eb500052a2bb9002e0100b500032a2bb9002e0100b50004b1 -toData,52,2a2bb7002f2ab400082bb800302b2ab40002b9003102002ab400052bb800322b2ab40003b9003302002b2ab40004b900330200b1 +fromData,62 +toData,52 org/apache/geode/internal/cache/UpdateEntryVersionOperation$UpdateEntryVersionMessage,2 -fromData,45,2a2bb7002a2a2bb8002bc0002cb500022a2bb8002bb500092bb8002d4d2cb6002e99000b2a2bb8002fb50005b1 -toData,118,2a2bb700302ab400022bb800312ab400092bb800312ab40003b60032c000174d2cc1003399002e2cb600344e2db60035990018b200362bb800372ab40003b600382bb80039a7000ab2003a2bb80037a700262cb6003b990018b200362bb800372ab40003b600382bb80039a7000ab2003a2bb80037b1 +fromData,45 +toData,118 org/apache/geode/internal/cache/UpdateOperation$UpdateMessage,2 -fromData,144,2a2bb700692bb9006a01003d1cb2006b7e99000704a70004033e1d9900332abb006c59b7006db500042ab400042bb8006e2bb9006f0100360415049900102a2bb900700100b80006b50007a700082a01b500042a2bb80071b5000d2a1cb200727e91b5000a2ab6002899000e2a2bb80073b50026a7001b2a2bb80073b5000f1cb200747e99000b2a2bb80073b50026b1 -toData,235,2ab40003b60039c000754d2a2cb700762a2bb700772ab4000a3e2ab40004c6000a1db2006b80913e2ab4000a99001b2ab400059900142ab40003b60058c6000a1db2007480913e2b1db9007802002ab40004c6004b2ab400042bb800792cc1007a9900352cb6007b3a041904b6007c9a000d2b03b9007d0200a7001a2b04b9007d02002b2ab40003b6007eb6007fb900800300a7000a2b03b9007d02002ab4000d2bb800812ab6002899001e2ab40003b600582bb800822ab40003b60039b60083b60084a700262ab4000a2ab400102ab4000f2bb800851db200747e99000e2ab40003b600582bb80082b1 +fromData,144 +toData,235 org/apache/geode/internal/cache/UpdateOperation$UpdateWithContextMessage,2 -fromData,14,2a2bb700102a2bb80011b50006b1 -toData,14,2a2bb700122ab400062bb80013b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/VMCachedDeserializable,2 -fromData,17,2bb800214d2a2cbeb500092a2cb50007b1 -toData,9,2ab600222bb80023b1 +fromData,17 +toData,9 org/apache/geode/internal/cache/WrappedCallbackArgument,2 -fromData,9,2a2bb80004b50002b1 -toData,9,2ab400022bb80003b1 +fromData,9 +toData,9 org/apache/geode/internal/cache/backup/BackupResponse,2 -fromData,14,2a2bb700042a2bb80005b50003b1 -toData,14,2a2bb700062ab400032bb80007b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/backup/PrepareBackupRequest,2 -fromData,14,2a2bb700182a2bb80019b50008b1 -toData,14,2a2bb7001a2ab400082bb8001bb1 +fromData,14 +toData,14 org/apache/geode/internal/cache/compression/CompressedCachedDeserializable,2 -fromData,18,2a2ab600082bb8000fb900090200b50003b1 -toData,18,2ab600082ab40003b9000d02002bb8000eb1 +fromData,18 +toData,18 org/apache/geode/internal/cache/control/MemoryThresholds,1 -toData,31,2b2ab4000cb9003803002b2ab4000db9003902002b2ab40013b900390200b1 +toData,31 org/apache/geode/internal/cache/control/MemoryThresholds$MemoryState,1 -toData,12,2ab60009b8000a2bb8000bb1 +toData,12 org/apache/geode/internal/cache/control/ResourceAdvisor$ResourceManagerProfile,2 -fromData,66,2a2bb700202bb900210100412bb800223a042bb800233a052a2019041905b60024572bb90021010037062bb800223a082bb800233a092a160619081909b6002557b1 -toData,99,2a593a0ac22ab40005412ab400063a042ab400043a052ab4000237062ab400033a082ab400013a09190ac3a7000b3a0b190ac3190bbf2a2bb700262b20b90027030019042bb6002819052bb600292b1606b90027030019082bb6002819092bb60029b1 +fromData,66 +toData,99 org/apache/geode/internal/cache/control/ResourceAdvisor$ResourceProfileMessage,2 -fromData,84,2a2bb7001d2a2bb9001e0100b500032bb9001e01003d1c029f00362a1cbd0004b50005033e1d2ab40005bea20020bb000459b7001f3a0419042bb800202ab400051d190453840301a7ffdda700082a01b50005b1 -toData,71,2a2bb700212b2ab40003b9002202002ab40005c6002c2b2ab40005beb900220200033d1c2ab40005bea200132ab400051c322bb80023840201a7ffeaa7000a2b02b900220200b1 +fromData,84 +toData,71 org/apache/geode/internal/cache/event/EventSequenceNumberHolder,2 -fromData,22,2a2bb900100100b500042a2bb80011c00012b50005b1 -toData,19,2b2ab40004b9001303002ab400052bb80014b1 +fromData,22 +toData,19 org/apache/geode/internal/cache/execute/FunctionRemoteContext,2 -fromData,95,2bb800084d2cc100099900252a03b500072a2cc00009b8000ab500022ab40002c7001b2a2cc00009b5000ba700102a2cc0000cb500022a04b500072a2bb80008b500032a2bb8000db500042a2bb8000db500052a2bb8000eb6000fb50006b1 -toData,73,2ab4000799000e2ab400022bb80010a700102ab40002b9001101002bb800102ab400032bb800102ab40004c000122bb800132ab40005c000122bb800132ab40006b800142bb80015b1 +fromData,95 +toData,73 org/apache/geode/internal/cache/ha/HARegionQueue$DispatchedAndCurrentEvents,2 -fromData,35,2a594dc22a2bb9006f0100b500072a2bb9006f0100b500092cc3a700084e2cc32dbfb1 -toData,35,2a594dc22b2ab40007b9007103002b2ab40009b9007103002cc3a700084e2cc32dbfb1 +fromData,35 +toData,35 org/apache/geode/internal/cache/ha/QueueRemovalMessage,2 -fromData,115,2a2bb7002e2bb8002fb6000d3d2abb003059b70031b5000403360415041ca200542ab400042bb80032b900330200572bb8002f3a052ab400041905b900330200571905b6000d3e03360615061da200172ab400042bb80034b90033020057840601a7ffe915041d6004603604840401a7ffacb1 -toData,121,2a2bb700272ab40004b900280100b800292bb8002a2ab40004b9000601004d014e013a04013a052cb90009010099004b2cb9000a0100c0000b4e2d2bb8002b2cb9000a0100c0000c3a0419042bb8002a1904b6000d360603360715071506a200172cb9000a01003a0519052bb8002c840701a7ffe8a7ffb2b1 +fromData,115 +toData,121 org/apache/geode/internal/cache/ha/ThreadIdentifier,2 -fromData,19,2a2bb8002db500022a2bb9002e0100b50003b1 -toData,19,2ab400022bb8002f2b2ab40003b900300300b1 +fromData,19 +toData,19 org/apache/geode/internal/cache/locks/TXLockBatch,2 -fromData,67,2a2bb80014b500032a2bb80015b500052bb9001601003d1c9b002a2abb0008591cb70017b50004033e1d1ca200172ab400042bb80018b90019020057840301a7ffeab1 -toData,86,2ab400032bb8001a2ab400052bb8001b2ab40004c7000d2b02b9001c0200a700372b2ab40004b9001d0100b9001c02002ab40004b9001e01004d2cb9001f01009900152cb900200100c000214e2d2bb8001aa7ffe8b1 +fromData,67 +toData,86 org/apache/geode/internal/cache/locks/TXLockIdImpl,2 -fromData,22,2a2bb80012c00013b500022a2bb900140100b50005b1 -toData,19,2ab400022bb800152b2ab40005b900160200b1 +fromData,22 +toData,19 org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage,2 -fromData,40,2a2bb7001d2a2bb9001e0100b500052a2bb8001fb500022a2bb80020b500032a2bb80021b50004b1 -toData,40,2a2bb700172b2ab40005b9001802002ab400022bb800192ab400032bb8001a2ab400042bb8001bb1 +fromData,40 +toData,40 org/apache/geode/internal/cache/locks/TXLockUpdateParticipantsMessage$TXLockUpdateParticipantsReplyMessage,2 -fromData,6,2a2bb70003b1 -toData,6,2a2bb70004b1 +fromData,6 +toData,6 org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor$TXOriginatorRecoveryMessage,2 -fromData,27,2a2bb700262a2bb80027c00028b5000f2a2bb900290100b50002b1 -toData,24,2a2bb7002a2ab4000f2bb8002b2b2ab40002b9002c0200b1 +fromData,27 +toData,24 org/apache/geode/internal/cache/locks/TXOriginatorRecoveryProcessor$TXOriginatorRecoveryReplyMessage,2 -fromData,6,2a2bb70003b1 -toData,6,2a2bb70004b1 +fromData,6 +toData,6 org/apache/geode/internal/cache/partitioned/AllBucketProfilesUpdateMessage,2 -fromData,37,2a2bb7002b2a2bb9002c0100b500052a2bb9002c0100b500022a2bb8002dc0002eb50006b1 -toData,34,2a2bb7002f2b2ab40005b9003002002b2ab40002b9003002002ab400062bb80031b1 +fromData,37 +toData,34 org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage,2 -fromData,26,2a2bb700252a2bb900260100b500042a2bb900270100b50005b1 -toData,26,2a2bb700282b2ab40004b9002902002b2ab40005b9002a0200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/BecomePrimaryBucketMessage$BecomePrimaryBucketReplyMessage,2 -fromData,16,2a2bb7001e2a2bb9001f0100b50003b1 -toData,16,2a2bb7001b2b2ab40003b9001c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/BucketBackupMessage,2 -fromData,16,2a2bb7001c2a2bb9001d0100b50003b1 -toData,16,2a2bb7001e2b2ab40003b9001f0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/BucketCountLoadProbe,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/partitioned/BucketProfileUpdateMessage,2 -fromData,47,2a2bb700222a2bb900230100b500052a2bb900230100b500062a2bb900230100b500022a2bb80024c00025b50007b1 -toData,44,2a2bb700262b2ab40005b9002702002b2ab40006b9002702002b2ab40002b9002702002ab400072bb80028b1 +fromData,47 +toData,44 org/apache/geode/internal/cache/partitioned/BucketSizeMessage,2 -fromData,16,2a2bb700252a2bb900260100b50004b1 -toData,16,2a2bb700272b2ab40004b900280200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/BucketSizeMessage$BucketSizeReplyMessage,2 -fromData,26,2a2bb7001b2a2bb9001c0100b500022a2bb9001d0100b50003b1 -toData,26,2a2bb7001e2b2ab40002b9001f02002b2ab40003b900200300b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/ColocatedRegionDetails,2 -fromData,81,2bb9000601003d1c99000b2a2bb80007b500022bb9000601003e1d99000b2a2bb80007b500032bb9000601003604150499000b2a2bb80007b500042bb9000601003605150599000b2a2bb80007b50005b1 -toData,133,2b2ab40002c6000704a7000403b9000802002ab40002c6000b2ab400022bb800092b2ab40003c6000704a7000403b9000802002ab40003c6000b2ab400032bb800092b2ab40004c6000704a7000403b9000802002ab40004c6000b2ab400042bb800092b2ab40005c6000704a7000403b9000802002ab40005c6000b2ab400052bb80009b1 +fromData,81 +toData,133 org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage,2 -fromData,37,2a2bb700352a2bb80036b500052a2bb900370100b500042a2bb900380100b80039b50006b1 -toData,37,2a2bb7003a2ab400052bb8003b2b2ab40004b9003c02002b2ab40006b6003db9003e0200b1 +fromData,37 +toData,37 org/apache/geode/internal/cache/partitioned/ContainsKeyValueMessage$ContainsKeyValueReplyMessage,2 -fromData,16,2a2bb700172a2bb900180100b50003b1 -toData,16,2a2bb700192b2ab40003b9001a0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/CreateBucketMessage,2 -fromData,26,2a2bb7002f2a2bb900300100b500042a2bb900300100b50005b1 -toData,26,2a2bb700312b2ab40004b9003202002b2ab40005b900320200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/CreateBucketMessage$CreateBucketReplyMessage,2 -fromData,36,2a2bb700222bb9002301003d1c9900162abb002459b70025b500012ab400012bb80026b1 -toData,39,2a2bb7001e2b2ab40001c6000704a7000403b9001f02002ab40001c6000b2ab400012bb80020b1 +fromData,36 +toData,39 org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage,2 -fromData,16,2a2bb700202a2bb900210100b50004b1 -toData,16,2a2bb700222b2ab40004b900230200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/DeposePrimaryBucketMessage$DeposePrimaryBucketReplyMessage,2 -fromData,6,2a2bb7001db1 -toData,6,2a2bb7001bb1 +fromData,6 +toData,6 org/apache/geode/internal/cache/partitioned/DestroyMessage,2 -fromData,134,2a2bb700662a2bb80067b700682a2bb80067b500092a2bb900690100b8006ab5000b2a2bb9006b0100b5000c2a2bb8006cb5000e2a2bb80067c0006db500192a2bb80067c0006eb500102a2bb80067b500052ab4006f1104007e99000704a70004033d1c9900162abb007059b70071b500722ab400722bb800732a2bb80067c00074b50012b1 -toData,100,2a2bb700752ab600762bb800772ab400092bb800772b2ab4000bb40078b9007902002b2ab4000cb9007a02002ab4000e2bb800772ab400192bb800772ab400102bb800772ab400052bb800772ab40072c6000b2ab400722bb8007b2ab400122bb80077b1 +fromData,134 +toData,100 org/apache/geode/internal/cache/partitioned/DestroyMessage$DestroyReplyMessage,2 -fromData,52,2a2bb700252bb9002601003d1c047e99000704a70004033e1c057e99000704a700040336041d99000d2a15042bb80027b5000bb1 -toData,60,2a2bb700212ab4000bc6000704a70004033d1c2ab4000bc1002299000705a700040380913d2b1cb9002302002ab4000bc6000b2ab4000b2bb80024b1 +fromData,52 +toData,60 org/apache/geode/internal/cache/partitioned/DestroyRegionOnDataStoreMessage,2 -fromData,14,2a2bb7001b2a2bb8001cb50003b1 -toData,14,2a2bb7001d2ab400032bb8001eb1 +fromData,14 +toData,14 org/apache/geode/internal/cache/partitioned/DumpB2NRegion,2 -fromData,26,2a2bb700362a2bb900370100b500042a2bb900380100b50005b1 -toData,26,2a2bb700392b2ab40004b9003a02002b2ab40005b9003b0200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/DumpB2NRegion$DumpB2NReplyMessage,2 -fromData,17,2a2bb700192a2bb8001ac0001bb50003b1 -toData,14,2a2bb7001c2ab400032bb8001db1 +fromData,17 +toData,14 org/apache/geode/internal/cache/partitioned/DumpBucketsMessage,2 -fromData,26,2a2bb7001a2a2bb9001b0100b500032a2bb9001b0100b50004b1 -toData,26,2a2bb7001c2b2ab40003b9001d02002b2ab40004b9001d0200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/EndBucketCreationMessage,2 -fromData,35,2a2bb7001c2a2bb9001d0100b500032abb001e59b7001fb500042ab400042bb80020b1 -toData,24,2a2bb700212b2ab40003b9002202002ab400042bb80023b1 +fromData,35 +toData,24 org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage,2 -fromData,67,2a2bb700282a2bb80029b6002ab500082ab4000804a0000e2a2bb8002bb50004a700122ab400089a000b2a2bb8002cb500052a2bb8002db500062a2bb8002eb50009b1 -toData,67,2a2bb7002f2ab40008b800302bb800312ab4000804a0000e2ab400042bb80032a700122ab400089a000b2ab400052bb800332ab400062bb800342ab400092bb80035b1 +fromData,67 +toData,67 org/apache/geode/internal/cache/partitioned/FetchBulkEntriesMessage$FetchBulkEntriesReplyMessage,2 -fromData,40,2a2bb700542a2bb900550100b500062a2bb80056b500022a2bb80057b500582a2bb80059b50001b1 -toData,40,2a2bb7004f2b2ab40006b9005002002ab400022bb800312ab400072bb800512ab400012bb80052b1 +fromData,40 +toData,40 org/apache/geode/internal/cache/partitioned/FetchEntriesMessage,2 -fromData,16,2a2bb7002e2a2bb9002f0100b50004b1 -toData,16,2a2bb700302b2ab40004b900310200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesReplyMessage,2 -fromData,74,2a2bb700512a2bb900520100b500062a2bb900520100b500072a2bb900520100b500082a2bb900520100b500092a2bb900530100b5000a2a2bb80054b500552a2bb900530100b50001b1 -toData,74,2a2bb7004c2b2ab40006b9004d02002b2ab40007b9004d02002b2ab40008b9004d02002b2ab40009b9004d02002b2ab4000ab9004e02002ab4000b2bb8004f2b2ab40001b9004e0200b1 +fromData,74 +toData,74 org/apache/geode/internal/cache/partitioned/FetchEntryMessage,2 -fromData,14,2a2bb700382a2bb80039b50005b1 -toData,14,2a2bb7003b2ab400052bb8003cb1 +fromData,14 +toData,14 org/apache/geode/internal/cache/partitioned/FetchEntryMessage$FetchEntryReplyMessage,2 -fromData,58,2a2bb7001f2bb9002001003d1c9a002c2ab40003b80021c000224e2dc7000dbb0023591224b70025bf2abb0026592b2db40027b70028b50004b1 -toData,38,2a2bb7001b2ab40004c7000d2b04b9001c0200a700122b03b9001c02002ab400042bb8001db1 +fromData,58 +toData,38 org/apache/geode/internal/cache/partitioned/FetchKeysMessage,2 -fromData,47,2a2bb7003f2a2bb900400100b8002ab500042a2bb900400100b500052a2bb80041b500062a2bb900420100b50007b1 -toData,47,2a2bb700432b2ab40004b60044b9004502002b2ab40005b9004502002ab400062bb800462b2ab40007b900470200b1 +fromData,47 +toData,47 org/apache/geode/internal/cache/partitioned/FetchKeysMessage$FetchKeysReplyMessage,2 -fromData,54,2a2bb7003c2a2bb9003d0100b500042a2bb9003d0100b500052a2bb9003d0100b500062a2bb9003e0100b500072a2bb8003fb50040b1 -toData,54,2a2bb700372b2ab40004b9003802002b2ab40005b9003802002b2ab40006b9003802002b2ab40007b9003902002ab400082bb8003ab1 +fromData,54 +toData,54 org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage,2 -fromData,37,2a2bb700252a2bb900260100b500042a2bb900260100b500052a2bb80027c00028b50006b1 -toData,34,2a2bb700292b2ab40004b9002a02002b2ab40005b9002a02002ab400062bb8002bb1 +fromData,37 +toData,34 org/apache/geode/internal/cache/partitioned/FetchPartitionDetailsMessage$FetchPartitionDetailsReplyMessage,2 -fromData,97,2a2bb700322bb9003301003d1c9900532a2bb900340100b500062a2bb900340100b500082a2bb900350100b5000a2a2bb900350100b5000c1c05a000262a2bb80036b5000e2a2bb80037b500102abb003859b70039b500012ab400012bb8003ab1 -toData,120,2a2bb7002b2ab4000609949a000d2b03b9002c0200a700622ab4000ec7000d2b04b9002c0200a7000a2b05b9002c02002b2ab40006b9002d03002b2ab40008b9002d03002b2ab4000ab9002e02002b2ab4000cb9002e02002ab4000ec6001b2ab4000e2bb8002f2ab400102bb800302ab400012bb8002fb1 +fromData,97 +toData,120 org/apache/geode/internal/cache/partitioned/FlushMessage,2 -fromData,36,2a2bb700252a2bb900260100b500022a2bb900260100b500032a2bb900260100b50004b1 -toData,36,2a2bb700272b2ab40002b9002802002b2ab40003b9002802002b2ab40004b900280200b1 +fromData,36 +toData,36 org/apache/geode/internal/cache/partitioned/GetMessage,2 -fromData,43,2a2bb700502a2bb80051b500052a2bb80051b500062a2bb80051c00052b500072a2bb900530100b50008b1 -toData,40,2a2bb700542ab400052bb800552ab400062bb800552ab400072bb800552b2ab40008b900560200b1 +fromData,43 +toData,40 org/apache/geode/internal/cache/partitioned/GetMessage$GetReplyMessage,2 -fromData,77,2a2bb700292bb9002a01003d1c10087e99000704a7000403593e9900091c10f77e913d2a1cb500072a2bb8002bb5002c1c049f000b2a2bb8002db5002e1d99000e2a2bb8002fc00030b5000ab1 -toData,89,2a2bb700232ab4000ac6000704a70004033d2ab400073e1c9900091d100880913e2b1db9002402002ab4000704a000172ab40003b60004c00025c000252bb80026a7000b2ab400032bb600271c99000b2ab4000a2bb80028b1 +fromData,77 +toData,89 org/apache/geode/internal/cache/partitioned/IdentityRequestMessage,2 -fromData,16,2a2bb7002b2a2bb9002c0100b50005b1 -toData,16,2a2bb7002d2b2ab40005b9002e0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/IdentityRequestMessage$IdentityReplyMessage,2 -fromData,26,2a2bb700202a2bb900210100b500042a2bb900210100b50003b1 -toData,26,2a2bb7001d2b2ab40004b9001e02002b2ab40003b9001e0200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/IdentityUpdateMessage,2 -fromData,26,2a2bb700222a2bb900230100b500042a2bb900230100b50005b1 -toData,26,2a2bb700242b2ab40004b9002502002b2ab40005b900250200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/IndexCreationMsg,2 -fromData,14,2a2bb700902a2bb80091b50003b1 -toData,14,2a2bb700922ab400032bb80093b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/partitioned/IndexCreationMsg$IndexCreationReplyMsg,2 -fromData,47,2a2bb700092a2bb9000a0100b500032a2bb8000bc0000cb500042a2bb9000d0100b500052a2bb9000a0100b50006b1 -toData,44,2a2bb7000e2b2ab40003b9000f02002ab400042bb800102b2ab40005b9001102002b2ab40006b9000f0200b1 +fromData,47 +toData,44 org/apache/geode/internal/cache/partitioned/InterestEventMessage,2 -fromData,17,2a2bb700202a2bb80021c00022b50004b1 -toData,14,2a2bb700232ab400042bb80024b1 +fromData,17 +toData,14 org/apache/geode/internal/cache/partitioned/InterestEventMessage$InterestEventReplyMessage,2 -fromData,16,2a2bb700192a2bb9001a0100b50002b1 -toData,16,2a2bb700172b2ab40002b900180200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/InvalidateMessage$InvalidateReplyMessage,2 -fromData,17,2a2bb700202a2bb80021c00022b50003b1 -toData,14,2a2bb7001e2ab400032bb8001fb1 +fromData,17 +toData,14 org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage,2 -fromData,76,2a2bb700322a2bb900330100b500052a2bb900340100b500062a2bb900340100b500072bb9003401003d1c9900162abb003559b70036b500082ab400082bb800372a2bb900340100b50003b1 -toData,79,2a2bb700382b2ab40005b9003902002b2ab40006b9003a02002b2ab40007b9003a02002b2ab40008c6000704a7000403b9003a02002ab40008c6000b2ab400082bb8003b2b2ab40003b9003a0200b1 +fromData,76 +toData,79 org/apache/geode/internal/cache/partitioned/ManageBackupBucketMessage$ManageBackupBucketReplyMessage,2 -fromData,26,2a2bb7001f2a2bb900200100b500042a2bb900200100b50005b1 -toData,26,2a2bb7001c2b2ab40004b9001d02002b2ab40005b9001d0200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/ManageBucketMessage,2 -fromData,36,2a2bb700302a2bb900310100b500042a2bb900310100b500052a2bb900320100b50006b1 -toData,36,2a2bb700332b2ab40004b9003402002b2ab40005b9003402002b2ab40006b900350200b1 +fromData,36 +toData,36 org/apache/geode/internal/cache/partitioned/ManageBucketMessage$ManageBucketReplyMessage,2 -fromData,26,2a2bb7001e2a2bb9001f0100b500042a2bb9001f0100b50005b1 -toData,26,2a2bb7001b2b2ab40004b9001c02002b2ab40005b9001c0200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/MoveBucketMessage,2 -fromData,27,2a2bb700212a2bb900220100b500042a2bb80023c00024b50005b1 -toData,24,2a2bb700252b2ab40004b9002602002ab400052bb80027b1 +fromData,27 +toData,24 org/apache/geode/internal/cache/partitioned/MoveBucketMessage$MoveBucketReplyMessage,2 -fromData,16,2a2bb7001e2a2bb9001f0100b50004b1 -toData,16,2a2bb7001b2b2ab40004b9001c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/OfflineMemberDetails$1,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/partitioned/OfflineMemberDetailsImpl,2 -fromData,97,2bb9000301003d2a1cbd0004b50002033e1d1ca2004d2bb9000301003604bb0005591504b700063a0503360615061504a20022bb000759b700083a0719072bb8000919051907b9000a020057840601a7ffdd2ab400021d190553840301a7ffb4b1 -toData,94,2b2ab40002beb9000b02002ab400024d2cbe3e03360415041da200442c1504323a052b1905b9000c0100b9000b02001905b9000d01003a061906b9000e01009900181906b9000f0100c000073a0719072bb80010a7ffe4840401a7ffbcb1 +fromData,97 +toData,94 org/apache/geode/internal/cache/partitioned/PRLoad,2 -fromData,10,bb0006591207b70008bf -toData,27,2b2ab40009b9001a02002ab4000a2bb8001b2ab4000b2bb8001bb1 +fromData,10 +toData,27 org/apache/geode/internal/cache/partitioned/PRSanityCheckMessage,2 -fromData,14,2a2bb700082a2bb80009b50003b1 -toData,14,2a2bb7000a2ab400032bb8000bb1 +fromData,14 +toData,14 org/apache/geode/internal/cache/partitioned/PRTombstoneMessage,2 -fromData,63,2a2bb7002f2bb9003001003d2abb0031591cb70032b50014033e1d1ca200172ab400142bb80033b90034020057840301a7ffea2a2bb80033c00035b50015b1 -toData,63,2a2bb700362b2ab40014b900080100b9003702002ab40014b9003801004d2cb9003901009900122cb9003a01004e2d2bb8003ba7ffeb2ab400152bb8003bb1 +fromData,63 +toData,63 org/apache/geode/internal/cache/partitioned/PRUpdateEntryVersionMessage,2 -fromData,49,2a2bb700362a2bb80037b500062a2bb900380100b80039b500082a2bb80037c0003ab5000a2a2bb80037c0003bb5000cb1 -toData,43,2a2bb7003c2ab7000f2bb8003d2b2ab40008b4003eb9003f02002ab4000a2bb8003d2ab4000c2bb8003db1 +fromData,49 +toData,43 org/apache/geode/internal/cache/partitioned/PartitionMessage,2 -fromData,58,2a2bb7007d2a2bb9007e0100b500052a2ab400052bb6007f2a2bb900800100b5000e2bb80081b20082b600839b000d2a2bb900840100b5000ab1 -toData,104,2a2bb70088033d2a1cb600893d2b1cb9008a02002ab4001099000d2b2ab40010b9008b02002ab40008029f000d2b2ab40008b9008b02002ab40006c6000b2ab400062bb8008c2b2ab4000eb9008b02002bb8008db20082b600839b000d2b2ab4000ab9008e0200b1 +fromData,58 +toData,104 org/apache/geode/internal/cache/partitioned/PartitionedRegionFunctionStreamingMessage,2 -fromData,17,2a2bb7003c2a2bb8003dc0003eb50003b1 -toData,14,2a2bb7003f2ab400032bb80040b1 +fromData,17 +toData,14 org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage,2 -fromData,16,2a2bb700222a2bb900230100b50014b1 -toData,16,2a2bb700242b2ab40014b900250200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/PrimaryRequestMessage$PrimaryRequestReplyMessage,2 -fromData,16,2a2bb700092a2bb9000a0100b50007b1 -toData,16,2a2bb7000b2b2ab40007b9000c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/PutAllPRMessage,2 -fromData,183,2a2bb7003d2a2bb8003e88b80009b5000a2ab4003f1110007e99000e2a2bb80040c00041b5003b2a2bb80040b500102a2bb8004288b500052a2ab40005bd000bb5000c2ab400059e006f2bb800434dbb004459b700454e03360415042ab40005a2001d2ab4000c1504bb000b592b0115042c2db7004653840401a7ffe02bb9004701003604150499002f2bb800483a0503360615062ab40005a2001d2ab4000c15063219051506b60049c0004ab5004b840601a7ffe0b1 -toData,194,2a2bb7004c2ab4000ac7000d14004d2bb8004fa7000f2ab4000ab60050852bb8004f2ab4003bc6000b2ab4003b2bb800512ab400102bb800512ab40005852bb800522ab400059e007bbb0053592ab40005b700544d033e03360415042ab40005a200511d9a00122ab4000c150432b4004bc60005043e2ab4000c150432b4004b3a052c1905b60055572ab4000c15043201b5004b2ab4000c1504322bb600562ab4000c1504321905b5004b840401a7ffac2b1db9005702001d9900082c2bb80058b1 +fromData,183 +toData,194 org/apache/geode/internal/cache/partitioned/PutAllPRMessage$PutAllReplyMessage,2 -fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1 -toData,24,2a2bb7001f2b2ab40003b9002002002ab400022bb80021b1 +fromData,27 +toData,24 org/apache/geode/internal/cache/partitioned/PutMessage,2 -fromData,225,2a2bb7005b2bb9005c01003d2a2bb8005db6005e2a2bb8005db500172a2bb9005f0100b500182a2bb900600100b80061b500191cb200627e99000b2a2bb80063b5001a1cb200647e99000e2a2bb8005dc00065b5001c2abb006659b70067b5001d2ab4001d2bb800682ab400691120007e99000b2a2bb8005db500222ab4006a9900162abb006b59b7006cb500282ab400282bb800682a1cb2006d7e91b500072ab4000999000e2a2bb8006eb5000da7001b2a2bb8006eb7006f1cb200707e99000b2a2bb8006eb5000d2ab400691140007e99000e2a2bb8005dc00071b50025b1 -toData,358,014d2ab40021b60072b9007301003e2ab4000cb60074c600161d9900122ab4000b99000b2a04b50009a700082a03b50009a7000d4ebb0076592db70077bf2a2bb700782ab400073e2ab4001ac600091db20062803e2ab400079900282ab40011c7000a2ab60079c6001a2ab4007a9900132ab4000cb60074c600091db20070803e2ab4001cc600091db20064803e2b1db9007b02002ab6007c2bb8007d2ab6007e2bb8007d2b2ab40018b9007f03002b2ab40019b40080b9007b02002ab4001ac6000b2ab4001a2bb8007d2ab4001cc6000b2ab4001c2bb8007d2ab4001d2bb800812ab40022c6000b2ab400222bb8007d2ab4006a99000b2ab400282bb800812ab4000999002f2ab40082b800834da7000f3a04bb0085591286b70087bf2ab4000cb600742bb800882cb60089b6008aa700262ab400072ab400112ab600792bb8008b1db200707e99000e2ab4000cb600742bb800882ab40025c6000b2ab400252bb8007db1 +fromData,225 +toData,358 org/apache/geode/internal/cache/partitioned/PutMessage$PutReplyMessage,2 -fromData,48,2a2bb700252a2bb900260100b500032a2bb900270100b80028b500022a2bb80029b500062a2bb80029c0002ab50007b1 -toData,54,2a2bb7002b2b2ab40003b9002c02002b2ab40002b4002db9002e02002ab6002f4d2b2ab6002f2ab40030b800312ab400072bb80032b1 +fromData,48 +toData,54 org/apache/geode/internal/cache/partitioned/QueryMessage,2 -fromData,63,2a2bb700752a2bb80076b500092a2bb80077b5000a2a2bb80078b5000b2a2bb80079b6007ab5000d2a2bb80079b6007ab500732a2bb80079b6007ab50010b1 -toData,63,2a2bb7007b2ab400092bb8007c2ab4000ac000022bb8007d2ab4000b2bb8007e2ab4000db8007f2bb8008004b8007f2bb800802ab40010b8007f2bb80080b1 +fromData,63 +toData,63 org/apache/geode/internal/cache/partitioned/RegionAdvisor$BucketProfileAndId,2 -fromData,61,2a2bb900070100b500032a2bb900080100b500022ab400029900112abb000659b70009b50005a7000e2abb000459b7000ab500052ab400052bb8000bb1 -toData,29,2b2ab40003b9000c02002b2ab40002b9000d02002ab400052bb8000eb1 +fromData,61 +toData,29 org/apache/geode/internal/cache/partitioned/RegionAdvisor$PartitionProfile,2 -fromData,53,2a2bb7000d2a2bb9000e0100b5000f2a2ab4000f9e000704a7000403b500032a2bb80010c00011b500122a2bb9000e0100b50007b1 -toData,34,2a2bb700132b2ab4000fb9001402002ab400122bb800152b2ab40007b900140200b1 +fromData,53 +toData,34 org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage,2 -fromData,6,2a2bb7001ab1 -toData,6,2a2bb70019b1 +fromData,6 +toData,6 org/apache/geode/internal/cache/tx/RemoteFetchKeysMessage$RemoteFetchKeysReplyMessage,2 -fromData,54,2a2bb7003c2a2bb9003d0100b500042a2bb9003d0100b500052a2bb9003d0100b500062a2bb9003e0100b500072a2bb8003fb50040b1 -toData,54,2a2bb700372b2ab40004b9003802002b2ab40005b9003802002b2ab40006b9003802002b2ab40007b9003902002ab400082bb8003ab1 +fromData,54 +toData,54 org/apache/geode/internal/cache/tx/RemoteSizeMessage,2 -fromData,18,2a2bb700152bb80016572bb90017010057b1 -toData,18,2a2bb70018012bb800192b03b9001a0200b1 +fromData,18 +toData,18 org/apache/geode/internal/cache/tx/RemoteSizeMessage$SizeReplyMessage,2 -fromData,16,2a2bb7001e2a2bb9001f0100b50003b1 -toData,16,2a2bb7001b2b2ab40003b9001c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage,2 -fromData,190,2a2bb7003d2a2bb8003e88b80009b5000a2ab4003f1110007e99000e2a2bb80040c00041b5003b2bb800424d2a2bb80040b500102a2bb8004388b500052a2ab40005bd000bb5000c2ab400059e00712bb800444ebb004559b700463a0403360515052ab40005a2001e2ab4000c1505bb000b592b0115052d1904b7004753840501a7ffdf2bb9004801003605150599002f2bb800493a0603360715072ab40005a2001d2ab4000c15073219061507b6004ac0004bb5004c840701a7ffe0b1 -toData,194,2a2bb7004d2ab4000ac7000d14004e2bb80050a7000f2ab4000ab60051852bb800502ab4003bc6000b2ab4003b2bb800522ab400102bb800522ab40005852bb800532ab400059e007bbb0054592ab40005b700554d033e03360415042ab40005a200511d9a00122ab4000c150432b4004cc60005043e2ab4000c150432b4004c3a052c1905b60056572ab4000c15043201b5004c2ab4000c1504322bb600572ab4000c1504321905b5004c840401a7ffac2b1db9005802001d9900082c2bb80059b1 +fromData,190 +toData,194 org/apache/geode/internal/cache/partitioned/RemoveAllPRMessage$RemoveAllReplyMessage,2 -fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50002b1 -toData,24,2a2bb7001f2b2ab40003b9002002002ab400022bb80021b1 +fromData,27 +toData,24 org/apache/geode/internal/cache/partitioned/RemoveBucketMessage,2 -fromData,26,2a2bb7001f2a2bb900200100b500042a2bb900210100b50005b1 -toData,26,2a2bb700222b2ab40004b9002302002b2ab40005b900240200b1 +fromData,26 +toData,26 org/apache/geode/internal/cache/partitioned/RemoveBucketMessage$RemoveBucketReplyMessage,2 -fromData,16,2a2bb7001e2a2bb9001f0100b50004b1 -toData,16,2a2bb7001b2b2ab40004b9001c0200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage,2 -fromData,33,2a2bb7002a2a2bb9002b0100b500032ab4000399000d2a2bb9002c0100b50004b1 -toData,33,2a2bb7002d2b2ab40003b9002e02002ab4000399000d2b2ab40004b9002f0200b1 +fromData,33 +toData,33 org/apache/geode/internal/cache/partitioned/RemoveIndexesMessage$RemoveIndexesReplyMessage,2 -fromData,36,2a2bb700082a2bb900090100b500032a2bb9000a0100b500042a2bb9000a0100b50005b1 -toData,36,2a2bb7000b2b2ab40003b9000c02002b2ab40004b9000d02002b2ab40005b9000d0200b1 +fromData,36 +toData,36 org/apache/geode/internal/cache/partitioned/SizeMessage,2 -fromData,14,2a2bb700382a2bb80039b50006b1 -toData,14,2a2bb7003a2ab400062bb8003bb1 +fromData,14 +toData,14 org/apache/geode/internal/cache/partitioned/SizeMessage$SizeReplyMessage,2 -fromData,17,2a2bb7001d2a2bb8001ec0001fb50003b1 -toData,14,2a2bb7001a2ab400032bb8001bb1 +fromData,17 +toData,14 org/apache/geode/internal/cache/partitioned/SizedBasedLoadProbe,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/persistence/DiskStoreID,2 -fromData,21,2a2bb900070100b500032a2bb900070100b50005b1 -toData,21,2b2ab40003b9000603002b2ab40005b900060300b1 +fromData,21 +toData,21 org/apache/geode/internal/cache/persistence/MembershipFlushRequest,2 -fromData,24,2a2bb700262a2bb900270100b500032a2bb80028b50002b1 -toData,24,2a2bb700292b2ab40003b9002a02002ab400022bb8002bb1 +fromData,24 +toData,24 org/apache/geode/internal/cache/persistence/MembershipViewRequest,2 -fromData,34,2a2bb700332a2bb900340100b500042a2bb80035b500032a2bb900360100b50005b1 -toData,34,2a2bb700372b2ab40004b9003802002ab400032bb800392b2ab40005b9003a0200b1 +fromData,34 +toData,34 org/apache/geode/internal/cache/persistence/MembershipViewRequest$MembershipViewReplyMessage,2 -fromData,36,2a2bb700042bb9000501003d1c9900162abb000659b70007b500012ab400012bb80008b1 -toData,38,2a2bb700092ab40001c7000d2b03b9000a0200a700122b04b9000a02002ab400012bb8000bb1 +fromData,36 +toData,38 org/apache/geode/internal/cache/persistence/PersistentMemberID,3 -fromData,74,2bb900090100412bb90009010037042abb000a59201604b7000bb500022a2bb8000cb500032a2bb8000db500042a2bb900090100b500062a2bb9000e0100b500072a2bb8000db50005b1 -fromData662,66,2bb900090100412bb90009010037042abb000a59201604b7000bb500022a2bb8000cb500032a2bb8000db500042a2bb900090100b500062a2bb9000e0100b50007b1 -toData,71,2b2ab40002b6000fb9001003002b2ab40002b60011b9001003002ab400032bb800122ab400042bb800132b2ab40006b9001003002b2ab40007b9001402002ab400052bb80013b1 +fromData,74 +fromData662,66 +toData,71 org/apache/geode/internal/cache/persistence/PersistentMemberPattern,2 -fromData,60,2bb9002301003d1c99000b2a2bb80024b500092bb9002301003e1d99000b2a2bb80025b5000a2a2bb80026c00027b5000c2a2bb900280100b5000bb1 -toData,85,2b2ab40009c6000704a7000403b9002902002ab40009c6000b2ab400092bb8002a2b2ab4000ac6000704a7000403b9002902002ab4000ac6000b2ab4000a2bb8002b2ab4000c2bb8002c2b2ab4000bb9002d0300b1 +fromData,60 +toData,85 org/apache/geode/internal/cache/persistence/PersistentMemberState,1 -toData,12,2b2ab6000991b9000a0200b1 +toData,12 org/apache/geode/internal/cache/persistence/PersistentMembershipView,2 -fromData,202,2bb9000501003d2abb0006591cb70007b50002033e1d1ca20024bb000859b700093a0419042bb8000a2ab400021904b9000b020057840301a7ffdd2bb9000501003e2abb000c591db7000db5000303360415041da20035bb000e59b7000f3a0519052bb8000abb000859b700093a0619062bb8000a2ab4000319051906b90010030057840401a7ffcb2bb90005010036042abb0006591504b70007b5000403360515051504a20024bb001159b700123a0619062bb8000a2ab400041906b9000b020057840501a7ffdbb1 -toData,177,2b2ab40002b900130100b9001402002ab40002b9001501004d2cb9001601009900152cb900170100c000084e2d2bb80018a7ffe82b2ab40003b900190100b9001402002ab40003b9001a0100b9001501004d2cb9001601009900242cb900170100c0001b4e2db9001c01002bb800182db9001d01002bb80018a7ffd92b2ab40004b900130100b9001402002ab40004b9001501004d2cb9001601009900152cb900170100c000114e2d2bb80018a7ffe8b1 +fromData,202 +toData,177 org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage,2 -fromData,84,2a2bb7003b2a2bb8003cb500022a2bb9003d0100b500052bb9003e01003d1c9900162abb003f59b70040b500032ab400032bb600412bb9003e01003e1d9900162abb003f59b70040b500042ab400042bb60041b1 -toData,90,2a2bb700422ab400022bb800432b2ab40005b9004402002b2ab40003c6000704a7000403b9004502002ab40003c6000b2ab400032bb600462b2ab40004c6000704a7000403b9004502002ab40004c6000b2ab400042bb60046b1 +fromData,84 +toData,90 org/apache/geode/internal/cache/persistence/PersistentStateQueryMessage$PersistentStateQueryReplyMessage,2 -fromData,144,2a2bb700062bb9000701003d1c9900162abb000859b70009b500032ab400032bb6000a2bb9000701003e1d99000b2a2bb8000bb500022bb900070100360415049900162abb000859b70009b500012ab400012bb6000a2bb9000701003605150599001a2abb000c592bb9000d01002bb9000d0100b7000eb5000f2bb9000701003606150699000b2a2bb80010b50011b1 -toData,184,2a2bb700122ab40003c7000d2b03b900130200a700122b04b9001302002ab400032bb600142ab40002c7000d2b03b900130200a700122b04b9001302002ab400022bb600152ab40001c7000d2b03b900130200a700122b04b9001302002ab400012bb600142ab4000fc7000d2b03b900130200a700242b04b9001302002b2ab4000fb60016b9001703002b2ab4000fb60018b9001703002ab40011c7000d2b03b900130200a700122b04b9001302002ab400112bb80019b1 +fromData,144 +toData,184 org/apache/geode/internal/cache/persistence/PrepareNewPersistentMemberMessage,2 -fromData,73,2a2bb7002c2a2bb8002db500022a2bb9002e0100b500052bb9002f01003d1c9900162abb003059b70031b500042ab400042bb800322abb003059b70031b500032ab400032bb80032b1 -toData,65,2a2bb700332ab400022bb800342b2ab40005b9003502002b2ab40004c6000704a7000403b9003602002ab40004c6000b2ab400042bb800372ab400032bb80037b1 +fromData,73 +toData,65 org/apache/geode/internal/cache/persistence/RemovePersistentMemberMessage,2 -fromData,84,2a2bb7002c2a2bb8002db500022a2bb9002e0100b500052bb9002f01003d1c9900162abb003059b70031b500032ab400032bb800322bb9002f01003e1d9900162abb003059b70031b500042ab400042bb80032b1 -toData,90,2a2bb700332ab400022bb800342b2ab40005b9003502002b2ab40003c6000704a7000403b9003602002ab40003c6000b2ab400032bb800372b2ab40004c6000704a7000403b9003602002ab40004c6000b2ab400042bb80037b1 +fromData,84 +toData,90 org/apache/geode/internal/cache/snapshot/ExportedRegistry,2 -fromData,106,2bb9001a01003d033e1d1ca200262bb8001bc0000c3a042ab400041904b6001cb800091904b9000a030057840301a7ffdb2bb9001a01003e03360415041da2002b2bb9001a010036052bb8001bc0000d3a062ab400051505b800091906b9000a030057840401a7ffd5b1 -toData,143,2b2ab40004b9000e0100b9000f02002ab40004b900100100b9001101004d2cb90012010099001a2cb900130100c000144e2db9001501002bb80016a7ffe32b2ab40005b9000e0100b9000f02002ab40005b900100100b9001101004d2cb90012010099002c2cb900130100c000144e2b2db900170100c00018b60019b9000f02002db9001501002bb80016a7ffd1b1 +fromData,106 +toData,143 org/apache/geode/internal/cache/snapshot/FlowController$FlowControlAbortMessage,2 -fromData,16,2a2bb700162a2bb900170100b50002b1 -toData,16,2a2bb700182b2ab40002b900190200b1 +fromData,16 +toData,16 org/apache/geode/internal/cache/snapshot/FlowController$FlowControlAckMessage,2 -fromData,24,2a2bb700182a2bb900190100b500022a2bb8001ab50003b1 -toData,24,2a2bb7001b2b2ab40002b9001c02002ab400032bb8001db1 +fromData,24 +toData,24 org/apache/geode/internal/cache/snapshot/SnapshotPacket,2 -fromData,79,2a2bb900120100b500022a2bb80013b500052a2bb80014c00015b500062bb800163d2a1cbd0008b5000b033e1d1ca20020bb000859b700173a0419042bb800182ab4000b1d190453840301a7ffe1b1 -toData,71,2b2ab40002b9000d02002ab400052bb8000e2ab400062bb8000f2ab4000bbe2bb800102ab4000b4d2cbe3e03360415041da200152c1504323a0519052bb80011840401a7ffebb1 +fromData,79 +toData,71 org/apache/geode/internal/cache/snapshot/SnapshotPacket$SnapshotRecord,2 -fromData,17,2a2bb8000fb500022a2bb8000fb50003b1 -toData,17,2ab400022bb8000d2ab400032bb8000db1 +fromData,17 +toData,17 org/apache/geode/internal/cache/tier/sockets/ClientBlacklistProcessor$ClientBlacklistMessage,2 -fromData,24,2a2bb700222a2bb900230100b500052a2bb80024b50006b1 -toData,24,2a2bb700252b2ab40005b9002602002ab400062bb80027b1 +fromData,24 +toData,24 org/apache/geode/internal/cache/tier/sockets/ClientDataSerializerMessage,2 -fromData,71,2a2bb9002c0100b8002db500242bb9002e01003d2a1cbd001eb50002033e1d1ca200132ab400021d2bb8002f53840301a7ffee2a2bb80030b500292a2bb80031c00032b5002bb1 -toData,66,2b2ab40024b60025b9002602002ab40002be3d2b1cb900270200033e1d1ca200132ab400021d322bb80028840301a7ffee2ab400292bb8002a2ab4002b2bb8002ab1 +fromData,71 +toData,66 org/apache/geode/internal/cache/tier/sockets/ClientInstantiatorMessage,2 -fromData,71,2a2bb900220100b80023b5001a2bb9002401003d2a1cbd0025b50002033e1d1ca200132ab400021d2bb8002653840301a7ffee2a2bb80027b5001f2a2bb80028c00029b50021b1 -toData,66,2b2ab4001ab6001bb9001c02002ab40002be3d2b1cb9001d0200033e1d1ca200132ab400021d322bb8001e840301a7ffee2ab4001f2bb800202ab400212bb80020b1 +fromData,71 +toData,66 org/apache/geode/internal/cache/tier/sockets/ClientInterestMessageImpl,2 -fromData,68,2a2bb8002fc0000ab500022a2bb80030b500032a2bb8002fb500042a2bb80031b500072a2bb80031b500082a2bb80032b500052a2bb80033b500062a2bb80033b50009b1 -toData,65,2ab400022bb8002a2ab400032bb8002b2ab400042bb8002a2ab400072bb8002c2ab400082bb8002c2ab400052bb8002d2ab400062bb8002e2ab400092bb8002eb1 +fromData,68 +toData,65 org/apache/geode/internal/cache/tier/sockets/ClientMarkerMessageImpl,2 -fromData,12,2a2bb80018c00019b50002b1 -toData,9,2ab400022bb80016b1 +fromData,12 +toData,9 org/apache/geode/internal/cache/tier/sockets/ClientPingMessageImpl,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID,2 -fromData,19,2a2bb80051b500092a2bb900520100b5000bb1 -toData,19,2ab400092bb8004f2b2ab4000bb900500200b1 +fromData,19 +toData,19 org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage,2 -fromData,63,2ab800222bb90023010032b500072a2bb900230100b80024b5001c2a2bb80025b6000a2a2bb80026b500082a2bb80027b500202a2bb80026c00028b50021b1 -toData,59,2b2ab40007b60016b9001b02002b2ab4001cb6001db9001b02002ab600142bb8001e2ab400082bb8001f2ab400202bb8001f2ab400212bb8001fb1 +fromData,63 +toData,59 org/apache/geode/internal/cache/tier/sockets/ClientUpdateMessageImpl,2 -fromData,171,2a2bb900a40100b800a5b500082a2bb800a6b5000a2a2bb80082b5000b2a2bb800a7b5000c2a2bb900a40100b5000d2a2bb800a8b5000f2a2bb900a90100b500032a2bb900a90100b500a22a2bb800a7b500072a2bb900a90100b500042a2bb80082b5000eb800aa4d2bb800ab4e2cc600102dc6000c2c2db600acc0007a4e2a2db500782bb800ab4e2cc600102dc6000c2c2db600acc0007a4e2a2db500372a2bb80082c000adb50013b1 -toData,162,2b2ab40008b6009cb9009d02002ab4000a2bb8009e2ab4000b2bb8009f2ab4000cc100559900142ab4000cc00055c000552bb800a0a7000e2ab4000cb800232bb800a02b2ab4000db9009d02002ab4000f2bb8009f2b2ab40003b900a102002b2ab400a2b900a102002ab400072bb800a02b2ab40004b900a102002ab4000e2bb8009f2ab40078c0007a2bb800a32ab40037c0007a2bb800a32ab400132bb8009fb1 +fromData,171 +toData,162 org/apache/geode/internal/cache/tier/sockets/HAEventWrapper,2 -fromData,432,2bb8003c9901862a2bb8003dc00037b5000d2abb001059b7003eb500052ab400052bb8003f2ab40005c000102ab4000db600402ab40005b90041010099011c2bb800423e1d02a00008014da700fabb0043591d0c04b700444d03360415041da200e62bb8003dc000133a052bb900450100360715071043a000922bb800423608150802a0000dbb0047591248b70049bf150804a000252bb8003dc0004a3a092bb8003dc0004b3a0abb004c591909190ab7004d3a06a7005115089a0014bb004c590103b8004eb7004d3a06a7003bbb004f591508b700503a0603360915091508a200262bb8003dc0004a3a0a2bb8003dc0004b3a0b1906190a190bb900510300840901a7ffd9a7003015071029a0000dbb0047591248b70049bfbb004759bb001b59b7001c1252b6001e1507b60053b60024b70049bf2c19051906b6005457840401a7ff1a2a2cb500062ab40005c000102ab40006b600552a2ab40005b900070100b500082a2ab40005b900090100b5000a2a2ab40005b9000b0100b50002b2000e2a09b6000fa700282bb8003d57bb001059b7003e2bb8003fb20056b90057010099000db200561258b900590200b1 -toData,90,2ab400162ab900330200c000104d2cc60013042bb800342cb600352bb80036a70026032bb80034bb003759b700382bb80036bb001059b20012bb001359b7001401b700154d2c2bb800392cb6003a99000b2cb600112bb8003bb1 +fromData,432 +toData,90 org/apache/geode/internal/cache/tier/sockets/InterestResultPolicyImpl,2 -fromData,8,bb000559b70006bf -toData,11,2b2ab60003b900040200b1 +fromData,8 +toData,11 org/apache/geode/internal/cache/tier/sockets/ObjectPartList,2 -fromData,130,2a2bb900330100b5000d2ab4000d99000e2abb001459b70015b500112bb9003401003d1c9e005d033e1d1ca200562ab4000d9900152bb800353a042ab400111904b900120200572bb900330100360415049900182bb800363a061906b800373a052bb8003857a700092bb800353a052ab400011905b90012020057840301a7ffabb1 -toData,180,2b2ab4000db9002902002ab40003c6009e2ab40001b9000201003d2b1cb9002a0200033e1d1ca200832ab400011db9002b02003a042ab400031d3336052ab4000d9900112ab400111db9002b02002bb8002c2b150505a0000704a7000403b900290200150504a0001c1904c1002d9900142b1904c0002dc0002db9002e0200a70024150505a000181904b8002f2bb800301904b600312bb80032a7000919042bb8002c840301a7ff7ea7000a2b03b9002a0200b1 +fromData,130 +toData,180 org/apache/geode/internal/cache/tier/sockets/ObjectPartList651,2 -fromData,145,2bb9001c01003d1c99000e2abb001d59b7001eb500062a1cb500052bb9001f01003e2a1dbc08b5000f1d9e006603360415041da2005d1c9900152bb800203a052ab400061905b9000e0200572bb90021010036052ab4000f1504150554150505a000182bb800223a071907b800233a062bb8002457a700092bb800203a062ab4000c1906b9000e020057840401a7ffa3b1 -toData,202,2b2ab40005b9001202002ab4000fc600b42ab4000cb9000b01003d2b1cb900130200033e1d1ca200992ab4000c1db9000d02003a042ab4000f1d3336052ab400059900112ab400061db9000d02002bb80014150506a0000d2b06b900150200a7001a150505a0000d2b05b900150200a7000a2b04b900150200150504a0001c1904c100169900142b1904c00016c00016b900170200a70024150505a000181904b800182bb800191904b6001a2bb8001ba7000919042bb80014840301a7ff68a7000a2b03b900130200b1 +fromData,145 +toData,202 org/apache/geode/internal/cache/tier/sockets/RemoveClientFromBlacklistMessage,2 -fromData,14,2a2bb700172a2bb80018b5000ab1 -toData,14,2a2bb700142ab4000a2bb80015b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/tier/sockets/SerializedObjectPartList,2 -fromData,145,2bb9001401003d1c99000e2abb001559b70016b5000a2a1cb500032bb9001701003e2a1dbc08b500051d9e006603360415041da2005d1c9900152bb800183a052ab4000a1905b900190200572bb9001a010036052ab400051504150554150505a000182bb8001b3a071907b8001c3a062bb8001d57a700092bb8001b3a062ab400061906b90019020057840401a7ffa3b1 -toData,209,2b2ab40003b9000402002ab40005c600bb2ab40006b9000701003d2b1cb900080200033e1d1ca200a02ab400061db9000902003a042ab400051d3336052ab400039900112ab4000a1db9000902002bb8000b150506a0000d2b06b9000d0200a70029150505a0000d2b05b9000d0200a7001915059a000d2b03b9000d0200a7000a2b04b9000d0200150505a000181904b8000e2bb8000f1904b600102bb80011a700201904c100129900121904c00012c000122bb8000fa7000919042bb80013840301a7ff61a7000a2b03b900080200b1 +fromData,145 +toData,209 org/apache/geode/internal/cache/tier/sockets/ServerInterestRegistrationMessage,2 -fromData,54,2a2bb7001f2a2bb900200100b5000b2abb002159b70022b500022ab400022bb800232abb002459b70025b500032ab400032bb80023b1 -toData,32,2a2bb7001c2b2ab4000bb9001d02002ab400022bb8001e2ab400032bb8001eb1 +fromData,54 +toData,32 org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,4 -fromData,542,b20002b20003b9000402003d2bb9005e01003e2a1d047e04a0000704a7000403b500291d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b5000e2a1d10107e1010a0000704a7000403b5001e1d10207e1020a0000704a700040336061c990014b20002b20003125f1db8004db9006004002ab4002999004b2bb800618836072abb001b591507b70021b5000c1c990015b20002b2000312621507b8004eb90060040003360815081507a200172ab4000c2bb80063b9000d020057840801a7ffe8150499004f2bb800618836071c990015b20002b2000312641507b8004eb9006004002abb001b591507b70021b500072a1507bc08b5003003360815081507a200102a15082bb70065840801a7ffefa7000e2abb001b59b7001cb5000715059900dd2bb800618836071c990015b20002b2000312661507b8004eb9006004002abb001b591507b70021b5000fbb001b591507b700213a0803360915091507a2009b2bb9005e0100360a150aaa00000000008800000000000000030000001f0000002b0000003c0000005e2ab4000f01b6001057a700602ab4000f15062bb80067b6001057a7004f15062bb800673a0b1908190bb60057b9000d0200572ab4000f190bb6001057a7002d15062bb800673a0b2bb8006188360c190b1908150cb900510200c00068b6005c2ab4000f190bb6001057840901a7ff64a7000e2abb001b59b7001cb5000fb1 -fromDataPre_GFE_8_0_0_0,6,2a2bb60045b1 -toDataPre_GFE_8_0_0_0,10,2ab700012a2bb60044b1 -toData,623,03360603360703360815049900102ab4002999000915060480360615059900182ab40007b9004a01009a000c1506058036060436072ab4000fb600159e00451506078036060436082ab4000fb600223a091909b9002301009900291909b900240100c000253a0a190ac60015190ac1004b99001015061020803606a70006a7ffd32ab4000e99000a150610088036062ab4001e99000a15061010803606b20002b20003b90004020099001eb20002b20003124c2a1506b8004d1cb8004e1db8004eb9001307002b1506b9004f0200150499005a2ab400299900531d360915091c602ab4000cb900080100a40014032ab4000cb9000801001c64b8003136091509852bb800501c360a03360b150b1509a2001b2ab4000c150ab9005102002bb80052840b01840a01a7ffe41505990061150799005c1d360915091c602ab40007b900080100a40014032ab40007b9000801001c64b8003136091509852bb8005003360a1c360b03360c150c1509a200212a2ab40007150bb900510200150a840a012bb70053840c01840b01a7ffde15089900df1d360915091c602ab4000fb60015a40012032ab4000fb600151c64b8003136091509852bb80050bb0054591509b700553a0a03360b1c360c03360d150d1509a2009d2ab4000f150cb60056c000253a0e190ec7000d2b03b9004f0200a70077190eb600573a0f190fc700132b04b9004f0200190e2bb80058a7005b190a190fb900590200c0005a3a101910c700292b05b9004f0200150b840b01b8004e3a10190a190f1910b9003c030057190e2bb80058a700222b06b9004f0200190e2b03b6005b190e190fb6005c1910b6005d852bb80050840d01840c01a7ff62b1 +fromData,542 +fromDataPre_GFE_8_0_0_0,6 +toDataPre_GFE_8_0_0_0,10 +toData,623 org/apache/geode/internal/cache/tier/sockets/VersionedObjectList$Chunker,3 -fromData,10,bb000959120ab7000bbf -toData,40,2ab400023d2a59b400022ab4000460b500022ab400032b1c2ab400042ab400052ab40006b60008b1 -toDataPre_GFE_8_0_0_0,20,2ab400029a000a2ab40003b8000c2a2bb6000db1 +fromData,10 +toData,40 +toDataPre_GFE_8_0_0_0,20 org/apache/geode/internal/cache/tx/DistTxEntryEvent,2 -fromData,100,2a2bb80019c0001ab500052a2bb8001bb500032a2bb9001c0100b8001db500092bb800194d2bb8001e4e2abb001f592c01012db70020b5000d2a2bb8001904b600212bb80022b6002336041504047e9900082a2bb700241504057e9900082a2bb70025b1 -toData,121,2ab400052bb800062ab40007b600082bb800062b2ab40009b4000ab9000b02002ab6000c2bb800062ab4000db6000eb8000f2bb800102ab600112bb80006033d2ab40012c600081c0480913d2ab40014c600081c0580913d1cb800152bb800162ab40012c600082a2bb700172ab40014c600082a2bb70018b1 +fromData,100 +toData,121 org/apache/geode/internal/cache/versions/RVVException,2 -fromData,1,b1 -toData,14,2ab4000d2bb800112a2bb60012b1 +fromData,1 +toData,14 org/apache/geode/internal/cache/versions/RVVExceptionB,2 -fromData,6,2a2bb70033b1 -toData,14,2ab400032bb800112a2bb60012b1 +fromData,6 +toData,14 org/apache/geode/internal/cache/versions/RVVExceptionT,2 -fromData,6,2a2bb70036b1 -toData,6,2a2bb7003bb1 +fromData,6 +toData,6 org/apache/geode/internal/cache/versions/RegionVersionHolder,2 -toData,93,2ab700132ab400042bb8005e2ab40012c7000703a7000c2ab40012b9001501003d1c852bb8005e2b2ab40019b9005f02001c9e002a2ab40012b9001c01004e2db9001d01009900172db9001e0100c0000f3a0419042bb80060a7ffe6b1 -fromData,71,2a2bb80061b500042bb80061883d2a2bb900620100b500191c9e002d2abb001a59b7001bb50012033e1d1ca2001b2bb800633a042ab400121904b90020020057840301a7ffe6b1 +toData,93 +fromData,71 org/apache/geode/internal/cache/versions/RegionVersionVector,2 -fromData,212,2a2a2bb600c1b500122bb900c201003d2a1c047e04a0000704a7000403b500162ab4000a2bb900c30100b600152ab4000b2bb900c30100b600152bb900c201003e03360415041da2002d2a2bb600c13a05bb0021592bb700c43a0619061905b5008c2ab4001319051906b6002e57840401a7ffd32bb900c20100360403360515051504a200442a2bb600c13a062ab400131906b6003cc000213a071907c6000d1907b4008cc0006c3a062bb900c3010037082ab4001419061608b80038b6002e57840501a7ffbb2abb0021592bb700c4b50017b1 -toData,239,2ab4001f99000dbb00b45912bcb700b6bf2a2ab400122bb600bd033d2ab400169900071c04803d2b1cb900be02002b2ab4000ab60031b900bf03002b2ab4000bb60031b900bf03002b2ab40013b6002fb900be02002ab40013b6009db9002701004e2db90028010099002b2db900290100c0002a3a042a1904b9002b0100c0006c2bb600bd1904b9002c01002bb800c0a7ffd22b2ab40014b6002fb900be02002ab40014b6009db9002701004e2db9002801009900332db900290100c0002a3a042a1904b9002b0100c0006c2bb600bd2b1904b9002c0100c0003ab6003bb900bf0300a7ffca2ab400172bb800c0b1 +fromData,212 +toData,239 org/apache/geode/internal/cache/versions/VersionTag,2 -fromData,187,2bb9002101003db20014b20015b900160200990018b20014b2001512222ab600181cb80019b9001a0500b200232a2bb900210100b600242a2bb900250100b500101c077e9900132a2bb900260100121d7eb50006a7000f2a2bb900270100027eb500061c10107e99000d2a2bb900260100b5000a2a2bb900270100b5000d2a2bb80028b500071c047e99000c2a2a2bb60029b5000e1c057e99001e1c10087e99000e2a2ab4000eb5000fa7000c2a2a2bb60029b5000f2ab6002ab1 -toData,259,033e0336042ab400061213a2000a0436041d07803e2ab4000a9900081d1010803e2ab4000ec6000b1c9900071d04803e2ab4000fc6001b1d05803e2ab4000f2ab4000ea6000c1c9900081d1008803eb20014b20015b900160200990018b20014b2001512172ab600181db80019b9001a05002b1db9001b02002b2ab40002b9001b02002b2ab40010b9001c020015049900132b2ab40006121d7eb9001b0200a7000d2b2ab40006b9001e02002ab4000a99000d2b2ab4000ab9001b02002b2ab4000db9001e02002ab400072bb8001f2ab4000ec600101c99000c2a2ab4000e2bb600202ab4000fc6001b2ab4000f2ab4000ea600071c9a000c2a2ab4000f2bb60020b1 +fromData,187 +toData,259 org/apache/geode/internal/cache/wan/GatewaySenderAdvisor$GatewaySenderProfile,4 -fromData,282,2a2bb700082a2bb80009b5000a2a2bb9000b0100b5000c2a2bb9000d0100b5000e2a2bb9000f0100b500102a2bb9000f0100b500112a2bb9000f0100b500122a2bb9000f0100b500132a2bb9000f0100b500142a2bb9000d0100b500152a2bb9000f0100b500162a2bb80017b500042a2bb80017b500052a2bb80017b500062a2bb9000f0100b500182a2bb9000d0100b500192bb8001ab2001bb6001c9c00552bb8001dc0001e4d2cc600412cb6001fb20020b60021b6002299000d2ab20020b50023a7002c2cb6001fb20024b60021b6002299000d2ab20024b50023a700122ab20025b50023a700082a01b50023a7000e2a2bb8001dc00026b500232bb800273d1c9900162abb002859b70029b5002a2ab4002a2bb8002bb1 -fromDataPre_GFE_8_0_0_0,187,2a2bb700082a2bb80009b5000a2a2bb9000b0100b5000c2a2bb9000d0100b5000e2a2bb9000f0100b500102a2bb9000f0100b500112a2bb9000f0100b500122a2bb9000f0100b500132a2bb9000f0100b500142a2bb9000d0100b500152a2bb9000f0100b500162a2bb80017b500042a2bb80017b500052a2bb80017b500062a2bb9000f0100b500182a2bb9000d0100b500192a2bb8001dc00026b500232bb800273d1c9900162abb002859b70029b5002a2ab4002a2bb8002bb1 -toData,270,2a2bb7002c2ab4000a2bb8002d2b2ab4000cb9002e03002b2ab4000eb9002f02002b2ab40010b9003002002b2ab40011b9003002002b2ab40012b9003002002b2ab40013b9003002002b2ab40014b9003002002b2ab40015b9002f02002b2ab40016b9003002002ab400042bb800312ab400052bb800312ab400062bb800312b2ab40018b9003002002b2ab40019b9002f02002bb80032b2001bb6001c9c004a2ab40023c600432ab40023b600214d2cb20033b6001fb6002299000db200332bb80034a700212cb20035b6001fb6002299000db200352bb80034a7000ab200362bb80034a7000b2ab400232bb800342ab4002ac6000704a70004033d1c2bb800371c99000b2ab4002a2bb80038b1 -toDataPre_GFE_8_0_0_0,235,2a2bb7002c2ab4000a2bb8002d2b2ab4000cb9002e03002b2ab4000eb9002f02002b2ab40010b9003002002b2ab40011b9003002002b2ab40012b9003002002b2ab40013b9003002002b2ab40014b9003002002b2ab40015b9002f02002b2ab40016b9003002002ab400042bb800312ab400052bb800312ab400062bb800312b2ab40018b9003002002ab4001299000d2b04b9002f0200a7001e2ab40023c7000d2b04b9002f0200a7000d2b2ab40019b9002f02002ab4001299000b012bb80034a7000b2ab400232bb800342ab4002ac6000704a70004033d1c2bb800371c99000b2ab4002a2bb80038b1 +fromData,282 +fromDataPre_GFE_8_0_0_0,187 +toData,270 +toDataPre_GFE_8_0_0_0,235 org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackArgument,2 -fromData,63,2a2bb700182a2bb80019b60017b500032abb00075905b7000ab500062bb9001a01003d033e1d1ca200172ab400062bb9001a0100b6001b57840301a7ffeab1 -toData,87,2a2bb700112ab40003b800122bb800132ab40006c6003b2b2ab40006b60014b9001502002ab40006b600164d2cb9000c010099001a2cb9000d0100c0000e4e2b2db60017b900150200a7ffe3a7000a2b03b900150200b1 +fromData,63 +toData,87 org/apache/geode/internal/cache/wan/GatewaySenderEventImpl,2 -fromData,183,2bb9007201003d1c10119f00032a04b5002b2a2bb900730100b500282a2bb900730100b500291c1011a200232bc1007499001c2bb80075b20076a60012bb0077592bc00074b20078b700794c2a2bb8007ac0007bb5002a2a2bb8007cb500102a2bb9007d0100b5002e2a2bb6007e2a2bb8007fb500302a2bb8007ac00020b500212a2bb900800100b500132a2bb900810100b500172a2bb900730100b500092a2bb900810100b80004b500052a2bb900810100b5001bb1 -toData,133,2ab600272b1011b9006702002b2ab40028b9006802002b2ab40029b9006802002ab4002a2bb800692ab400102bb8006a2b2ab4002eb9006b02002a2bb6006c2ab6002f2bb8006d2ab400212bb800692b2ab40013b9006e02002b2ab40017b9006f03002b2ab40009b9006802002b2ab40005b60070b9006f03002b2ab60071b9006f0300b1 +fromData,183 +toData,133 org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation$GatewaySenderQueueEntrySynchronizationEntry,2 -fromData,20,2a2bb80006b500022a2bb80006c00007b50001b1 -toData,17,2ab400022bb800052ab400012bb80005b1 +fromData,20 +toData,17 org/apache/geode/internal/cache/wan/GatewaySenderQueueEntrySynchronizationOperation$GatewaySenderQueueEntrySynchronizationMessage,2 -fromData,32,2a2bb7003d2a2bb9003e0100b500032a2bb8003fb500062a2bb80040b50008b1 -toData,35,2a2bb700392b2ab40003b9003a02002ab400062bb8003b2ab40008c0001e2bb8003cb1 +fromData,32 +toData,35 org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage,2 -fromData,17,2a2bb7003b2a2bb8003cc0003db50004b1 -toData,14,2a2bb700392ab400042bb8003ab1 +fromData,17 +toData,14 org/apache/geode/internal/cache/wan/parallel/ParallelQueueBatchRemovalMessage$BatchRemovalReplyMessage,2 -fromData,6,2a2bb7001fb1 -toData,6,2a2bb7001db1 +fromData,6 +toData,6 org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage,2 -fromData,14,2a2bb7005a2a2bb8005bb50002b1 -toData,14,2a2bb700582ab400022bb80059b1 +fromData,14 +toData,14 org/apache/geode/internal/cache/wan/serial/BatchDestroyOperation$DestroyMessage,2 -fromData,45,2a2bb700462a2bb80047c00048b500022a2bb80047b5000c2bb800494d2cb6004a99000b2a2bb8004bb50005b1 -toData,40,2a2bb7004c2ab400022bb8004d2ab4000c2bb8004db2004e2bb8004f2ab40003b600502bb80051b1 +fromData,45 +toData,40 org/apache/geode/internal/memcached/KeyWrapper,2 -fromData,9,2a2bb80006b50002b1 -toData,9,2ab400022bb80005b1 +fromData,9 +toData,9 org/apache/geode/internal/memcached/ValueWrapper,2 -fromData,29,2a2bb9000b0100b500032a2bb8000cb500022a2bb9000d0100b50004b1 -toData,29,2b2ab40003b9000e03002ab400022bb8000f2b2ab40004b900100200b1 +fromData,29 +toData,29 org/apache/geode/internal/modules/util/RegionConfiguration,2 -fromData,77,2a2bb80010b500072a2bb80010b500082a2bb80011b500032a2bb80012c00013b500092a2bb80014b60015b500042a2bb80014b60015b500052a2bb80014b60015b500062a2bb80010b5000fb1 -toData,74,2ab400072bb8000a2ab400082bb8000a2ab400032bb8000b2ab400092bb8000c2ab40004b8000d2bb8000e2ab40005b8000d2bb8000e2ab40006b8000d2bb8000e2ab4000f2bb8000ab1 +fromData,77 +toData,74 org/apache/geode/internal/security/ObjectWithAuthz,2 -fromData,17,2a2bb80004b500022a2bb80004b50003b1 -toData,17,2ab400022bb800052ab400032bb80005b1 +fromData,17 +toData,17 org/apache/geode/internal/util/VersionedArrayList,2 -fromData,85,bb000559b700064d2bb900280100422bb900290100360503360615061505a200162cbb0020592bb7002ab6000c57840601a7ffe92a593a06c22a21b500042a2cb80009b500071906c3a7000b3a071906c31907bfb1 -toData,88,140002412a593a05c22ab40004412ab400073a041905c3a7000b3a061905c31906bf2b20b9002503001904b9000f010036052b1505b90026020003360615061505a2001619041506b9001102002bb80027840601a7ffe9b1 +fromData,85 +toData,88 org/apache/geode/management/internal/FederationComponent,2 -fromData,33,2a2bb80046b5000e2a2bb80047b5000c2a2bb80048b500042a2bb80047b5000ab1 -toData,36,2ab4000e2bb800492ab4000c2bb8004a2ab40004c000022bb8004b2ab4000a2bb8004ab1 +fromData,33 +toData,36 org/apache/geode/management/internal/JmxManagerAdvisor$JmxManagerProfile,2 -fromData,46,2a2bb700182a2bb80019b500022a2bb8001ab500042a2bb8001bb500052a2bb80019b500062a2bb80019b50003b1 -toData,81,2a593a07c22ab400023d2ab400044e2ab4000536042ab4000636052ab4000336061907c3a7000b3a081907c31908bf2a2bb7001c1c2bb8001d2d2bb8001e15042bb8001f15052bb8001d15062bb8001db1 +fromData,46 +toData,81 org/apache/geode/management/internal/JmxManagerAdvisor$JmxManagerProfileMessage,2 -fromData,27,2a2bb7001b2a2bb9001c0100b500032a2bb8001dc0001eb50004b1 -toData,24,2a2bb7001f2b2ab40003b9002002002ab400042bb80021b1 +fromData,27 +toData,24 org/apache/geode/management/internal/JmxManagerLocatorRequest,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/management/internal/JmxManagerLocatorResponse,2 -fromData,36,2a2bb80006b500022a2bb80007b500032a2bb80008b500042a2bb80009c0000ab50005b1 -toData,33,2ab400022bb8000b2ab400032bb8000c2ab400042bb8000d2ab400052bb8000eb1 +fromData,36 +toData,33 org/apache/geode/management/internal/ManagerStartupMessage,2 -fromData,16,2a2bb7000e2a2bb9000f0100b50005b1 -toData,16,2a2bb7000c2b2ab40005b9000d0200b1 +fromData,16 +toData,16 org/apache/geode/management/internal/cli/domain/DataCommandResult,2 -fromData,133,2a2bb800a5b500232a2bb800a6b500112a2bb800a6b5000b2a2bb800a7b5001d2a2bb800a6c0004eb5001b2a2bb800a8b60054b5002f2a2bb800a6b500172a2bb800a6b500092a2bb800a6b500142a2bb800a6c000a9b5002c2a2bb800a5b5001e2a2bb800a5b5002e2a2bb800a5b500332a2bb800a5b500342a2bb800a8b60054b5002db1 -toData,140,2ab400232bb800a02b2ab40023b900a102002ab400112bb800a22ab4000b2bb800a22ab4001b2bb800a22ab4001dc0006b2bb800a32ab4002fb8003c2bb800a42ab400172bb800a22ab400092bb800a22ab400142bb800a22ab4002c2bb800a22ab4001e2bb800a02ab4002e2bb800a02ab400332bb800a02ab400342bb800a02ab4002db8003c2bb800a4b1 +fromData,133 +toData,140 org/apache/geode/management/internal/cli/domain/DataCommandResult$KeyInfo,2 -fromData,41,2a2bb80020b500062a2bb80020b500072a2bb80020b500082a2bb80021b500092a2bb80022b50002b1 -toData,41,2ab400062bb8001d2ab400072bb8001d2ab400082bb8001d2ab400092bb8001e2ab400022bb8001fb1 +fromData,41 +toData,41 org/apache/geode/management/internal/cli/functions/CliFunctionResult,4 -fromData,61,2a2bb8001cb500052a2bb8001db500062a2bb8001ec0001fb500072a2bb80020c00021c00021b500032a2bb8001ec00022b500082a2bb80023b50004b1 -fromDataPre_GFE_8_0_0_0,34,2a2bb8001cb500052a2bb8001ec00022b500082a2bb80020c00021c00021b50003b1 -toData,49,2ab400052bb800172ab400062bb800182ab400072bb800192ab400032bb8001a2ab400082bb800192ab400042bb8001bb1 -toDataPre_GFE_8_0_0_0,25,2ab400052bb800172ab400032bb8001a2ab400082bb80019b1 +fromData,61 +fromDataPre_GFE_8_0_0_0,34 +toData,49 +toDataPre_GFE_8_0_0_0,25 org/apache/geode/management/internal/configuration/domain/Configuration,2 -fromData,49,2a2bb80028b500022a2bb80028b500042a2bb80028b500032a2bb80028b500052a2bb80029b500082a2bb8002ab5000bb1 -toData,52,2ab400022bb800252ab400042bb800252ab400032bb800252ab400052bb800252ab400082bb800262ab4000bc0000a2bb80027b1 +fromData,49 +toData,52 org/apache/geode/management/internal/configuration/domain/ConfigurationChangeResult,2 -fromData,31,2a2bb80019b6001ab500022a2bb8001bb500032a2bb8001cc0001db50004b1 -toData,28,2ab40002b800152bb800162ab400032bb800172ab400042bb80018b1 +fromData,31 +toData,28 org/apache/geode/management/internal/configuration/domain/XmlEntity,4 -fromData,22,2a2bb6006a2a2bb8006bb500162a2bb8006bb50017b1 -fromDataPre_GEODE_1_1_1_0,59,2a2bb8006bb500062a2bb8006cc0006db500032a2bb8006bb500022a2bb8006bb5001e2a2bb8006bb500052a2bb8006bb500042ab80011b50012b1 -toData,22,2a2bb600672ab400162bb800682ab400172bb80068b1 -toDataPre_GEODE_1_1_1_0,49,2ab400062bb800682ab400032bb800692ab400022bb800682ab4001e2bb800682ab400052bb800682ab400042bb80068b1 +fromData,22 +fromDataPre_GEODE_1_1_1_0,59 +toData,22 +toDataPre_GEODE_1_1_1_0,49 org/apache/geode/management/internal/configuration/messages/ConfigurationResponse,2 -fromData,28,2a2bb8000bb500042a2bb8000bb500052a2bb8000cb6000db50006b1 -toData,28,2ab400042bb800082ab400052bb800082ab40006b800092bb8000ab1 +fromData,28 +toData,28 org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusRequest,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/management/internal/configuration/messages/SharedConfigurationStatusResponse,2 -fromData,22,2a12072bb80008c00007b500022a2bb80009b50003b1 -toData,20,2ab400022bb800042ab40003c000052bb80006b1 +fromData,22 +toData,20 org/apache/geode/management/internal/messages/CompactRequest,2 -fromData,14,2a2bb700262a2bb80027b5000bb1 -toData,14,2a2bb700282ab4000b2bb80029b1 +fromData,14 +toData,14 org/apache/geode/management/internal/messages/CompactResponse,2 -fromData,17,2a2bb700042a2bb80005c00006b50003b1 -toData,14,2a2bb700072ab400032bb80008b1 +fromData,17 +toData,14 org/apache/geode/pdx/internal/CheckTypeRegistryState,2 -fromData,16,2a2bb7002d2a2bb9002e0100b50002b1 -toData,16,2a2bb7002f2b2ab40002b900300200b1 +fromData,16 +toData,16 org/apache/geode/pdx/internal/EnumId,2 -fromData,11,2a2bb900050100b50002b1 -toData,11,2b2ab40002b900040200b1 +fromData,11 +toData,11 org/apache/geode/pdx/internal/EnumInfo,2 -fromData,25,2a2bb8000fb500032a2bb8000fb500022a2bb80010b50001b1 -toData,25,2ab400032bb8000d2ab400022bb8000d2ab400012bb8000eb1 +fromData,25 +toData,25 org/apache/geode/pdx/internal/PdxField,2 -fromData,99,2a2bb8000bb500022a2bb9000c0100b500032a2bb9000c0100b500042a120d2bb8000ec0000db500052a2bb9000c0100b500092a2bb9000c0100b5000a2bb9000f01003d2a1c047e99000704a7000403b500062a1c057e99000704a7000403b50007b1 -toData,105,2ab400022bb800112b2ab40003b9001202002b2ab40004b9001202002ab400052bb800132b2ab40009b9001202002b2ab4000ab900120200033d2ab400069900081c0480913d2bb800144e2db20015b600169b000f2ab400079900081c0580913d2b1cb900170200b1 +fromData,99 +toData,105 org/apache/geode/pdx/internal/PdxType,2 -fromData,109,2a2bb80018b5000c2ab7000e2bb9001901003d2a1c047e99000704a7000403b5000d2a1c057e99000704a7000403b5001b2a2bb9001c0100b5000f2a2bb9001c0100b500102bb8001d3d033e1d1ca2001ebb001459b7001e3a0419042bb6001f2a1904b60015840301a7ffe3b1 -toData,124,2ab4000c2bb80020033d2ab4000d9900081c0480913d2bb800214e2db20022b600239b000f2ab4001b9900081c0580913d2b1cb9002402002b2ab4000fb9002502002b2ab40010b9002502002ab40005b600262bb80027033d1c2ab40005b60026a2001a2ab400051cb60028c000144e2d2bb60029840201a7ffe1b1 +fromData,109 +toData,124 org/apache/geode/redis/internal/ByteArrayWrapper,2 -fromData,20,2a2bb80006b500022a2ab40002b80003b50004b1 -toData,9,2ab400022bb80005b1 +fromData,20 +toData,9 org/apache/geode/redis/internal/DoubleWrapper,2 -fromData,9,2a2bb80004b50002b1 -toData,9,2ab400022bb80003b1 +fromData,9 +toData,9 org/apache/geode/internal/cache/RemoveCacheServerProfileMessage,2 -fromData,16,2a2bb700322a2bb900330100b50008b1 -toData,16,2a2bb700302b2ab40008b900310200b1 +fromData,16 +toData,16 diff --git a/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt index 8d9e3de528f1..faea2279d8fa 100644 --- a/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt +++ b/geode-cq/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt @@ -1,4 +1,4 @@ org/apache/geode/cache/query/internal/cq/ServerCQImpl,2 -fromData,64,2ab40046594dc22ab400462bb80099b6009ab6007f2cc3a700084e2cc32dbf2a2bb8009bb6009cb5009d2a2bb8009eb5005d2a2bb9009f0100b800a0b50008b1 -toData,47,2ab40046b60047b800a12bb800a22ab4009db8007c2bb800a32ab4005d2bb800a42b2ab40008b600a5b900a60300b1 +fromData,64 +toData,47 diff --git a/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt index b3712bbca5fb..1a3205e4371e 100644 --- a/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt +++ b/geode-lucene/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt @@ -1,44 +1,44 @@ org/apache/geode/cache/lucene/internal/DestroyLuceneIndexMessage,2 -fromData,32,2a2bb700262a2bb900270100b500032a2bb80028b500042a2bb80028b50005b1 -toData,32,2a2bb700232b2ab40003b9002402002ab400042bb800252ab400052bb80025b1 +fromData,32 +toData,32 org/apache/geode/cache/lucene/internal/LuceneIndexCreationProfile,4 -fromData,14,2a2bb600372a2bb80038b50004b1 -fromDataPre_GEODE_1_4_0_0,41,2a2bb80038b500052a2bb80038b500062a2bb80039b500072a2bb80038b500092a2bb8003ab5000bb1 -toData,14,2a2bb600332ab400042bb80034b1 -toDataPre_GEODE_1_4_0_0,41,2ab400052bb800342ab400062bb800342ab400072bb800352ab400092bb800342ab4000b2bb80036b1 +fromData,14 +fromDataPre_GEODE_1_4_0_0,41 +toData,14 +toDataPre_GEODE_1_4_0_0,41 org/apache/geode/cache/lucene/internal/LuceneResultStructImpl,2 -fromData,27,2a2bb80017b500022a2bb80017b500032a2bb900180100b50004b1 -toData,27,2ab400022bb800152ab400032bb800152b2ab40004b900160200b1 +fromData,27 +toData,27 org/apache/geode/cache/lucene/internal/StringQueryProvider,2 -fromData,17,2a2bb80024b500032a2bb80024b50004b1 -toData,17,2ab400032bb800232ab400042bb80023b1 +fromData,17 +toData,17 org/apache/geode/cache/lucene/internal/distributed/EntryScore,2 -fromData,19,2a2bb8000fb500022a2bb900100100b50003b1 -toData,19,2ab400022bb8000d2b2ab40003b9000e0200b1 +fromData,19 +toData,19 org/apache/geode/cache/lucene/internal/distributed/LuceneFunctionContext,2 -fromData,41,2a2bb9000d0100b500082a2bb8000ec0000fb500052a2bb8000ec00010b500072a2bb80011b50006b1 -toData,35,2b2ab40008b9000a02002ab400052bb8000b2ab400072bb8000b2ab400062bb8000cb1 +fromData,41 +toData,35 org/apache/geode/cache/lucene/internal/distributed/TopEntries,2 -fromData,22,2a2bb900150100b5000c2a2bb80016c00017b50006b1 -toData,19,2b2ab4000cb9001302002ab400062bb80014b1 +fromData,22 +toData,19 org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollector,2 -fromData,20,2a2bb80012b500052a2bb80013c00006b50008b1 -toData,17,2ab400052bb800102ab400082bb80011b1 +fromData,20 +toData,17 org/apache/geode/cache/lucene/internal/distributed/TopEntriesCollectorManager,2 -fromData,19,2a2bb80033b500072a2bb900340100b50004b1 -toData,19,2ab400072bb800312b2ab40004b900320200b1 +fromData,19 +toData,19 org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunctionContext,2 -fromData,32,2a2bb8000bb500042a2bb9000c0100b500052a120d2bb8000ec0000db50006b1 -toData,27,2ab400042bb800082b2ab40005b9000903002ab400062bb8000ab1 +fromData,32 +toData,27 org/apache/geode/cache/lucene/internal/filesystem/ChunkKey,2 -fromData,40,2a2bb9000c0100b500032bb9000d0100412bb9000d010037042abb000e59201604b7000fb50002b1 -toData,37,2b2ab40003b9000802002b2ab40002b60009b9000a03002b2ab40002b6000bb9000a0300b1 +fromData,40 +toData,37 org/apache/geode/cache/lucene/internal/filesystem/File,2 -fromData,88,2a2bb8001bb5000b2a2bb9001c0100b500022a2bb9001d0100b500032a2bb9001c0100b500052a2bb9001c0100b500062bb9001c0100412bb9001c010037042abb001e59201604b7001fb500082a2bb900200100b50009b1 -toData,85,2ab4000b2bb800152b2ab40002b9001603002b2ab40003b9001702002b2ab40005b9001603002b2ab40006b9001603002b2ab40008b60018b9001603002b2ab40008b60019b9001603002b2ab40009b9001a0200b1 +fromData,88 +toData,85 org/apache/geode/cache/lucene/internal/results/PageEntry,2 -fromData,17,2a2bb8000cb500022a2bb8000cb50003b1 -toData,94,2ab400022bb800062ab40003c100079900112ab40003c000072bb900080200b12ab40003c1000499002e2a2ab40003c00004b900090100b500032ab40003c1000a9900142b2ab40003c0000ac0000ab9000b0200b12ab400032bb80006b1 +fromData,17 +toData,94 org/apache/geode/cache/lucene/internal/results/PageResults,2 -fromData,43,2bb9000b01003d033e1d1ca2001fbb000959b7000c3a0419042bb6000d2a1904b6000e57840301a7ffe2b1 -toData,43,2b2ab60004b9000502002ab600064d2cb9000701009900152cb900080100c000094e2d2bb6000aa7ffe8b1 +fromData,43 +toData,43 diff --git a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt index 087551246115..4357f2134f8c 100644 --- a/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt +++ b/geode-wan/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt @@ -1,28 +1,28 @@ org/apache/geode/cache/client/internal/locator/wan/LocatorJoinMessage,2 -fromData,38,2a2bb700062a2bb80007c00008b500032a2bb900090100b500042a2bb80007c00008b50005b1 -toData,32,2a2bb7000a2ab400032bb8000b2b2ab40004b9000c02002ab400052bb8000bb1 +fromData,38 +toData,32 org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinRequest,2 -fromData,22,2a2bb80004c00005b500022a2bb900060100b50003b1 -toData,19,2ab400022bb800072b2ab40003b900080200b1 +fromData,22 +toData,19 org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorJoinResponse,2 -fromData,9,2a2bb80010b50004b1 -toData,9,2ab400042bb80011b1 +fromData,9 +toData,9 org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingRequest,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorPingResponse,2 -fromData,1,b1 -toData,1,b1 +fromData,1 +toData,1 org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorRequest,2 -fromData,11,2a2bb900030100b50002b1 -toData,11,2b2ab40002b900040200b1 +fromData,11 +toData,11 org/apache/geode/cache/client/internal/locator/wan/RemoteLocatorResponse,2 -fromData,12,2a2bb80003c00004b50002b1 -toData,9,2ab400022bb80005b1 +fromData,12 +toData,9 From 6446d1782f1577204d6063baf04b5128642df6f6 Mon Sep 17 00:00:00 2001 From: "Michael \"Sarge\" Dodge" Date: Fri, 23 Mar 2018 09:33:33 -0700 Subject: [PATCH 12/15] GEODE-4910: Modify method description to mention exception. (#1657) --- geode-core/src/main/java/org/apache/geode/cache/Region.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/geode-core/src/main/java/org/apache/geode/cache/Region.java b/geode-core/src/main/java/org/apache/geode/cache/Region.java index 2a6036f3f3da..b7d55ccb4dea 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/Region.java +++ b/geode-core/src/main/java/org/apache/geode/cache/Region.java @@ -699,7 +699,9 @@ Region createSubregion(String subregionName, V put(K key, V value, Object aCallbackArgument) throws TimeoutException, CacheWriterException; /** - * Creates a new entry in this region with the specified key and value. + * Creates a new entry in this region with the specified key and value if and only if an entry + * does not already exist for the specified key. If an entry already exists for the specified + * key, throws {@link EntryExistsException}. * *

* Updates the {@link CacheStatistics#getLastAccessedTime} and From 405559d6cd7693eec400997be06c10a53e4827fb Mon Sep 17 00:00:00 2001 From: Nick Reich Date: Fri, 23 Mar 2018 09:35:01 -0700 Subject: [PATCH 13/15] GEODE-4882: Prevent intermittent test failure from CacheClosedException (#1670) --- .../codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java | 2 +- .../geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java index 82513e3d8ffa..096e276e7255 100644 --- a/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java @@ -19,7 +19,7 @@ import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.categories.IntegrationTest; -@Category({IntegrationTest.class, FlakyTest.class}) +@Category(IntegrationTest.class) public class AnalyzeConnectorsSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest { @Override diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java index 3adcf711379e..4b1eac583186 100644 --- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java @@ -71,6 +71,7 @@ import org.apache.geode.internal.HeapDataOutputStream; import org.apache.geode.internal.InternalDataSerializer; import org.apache.geode.internal.Version; +import org.apache.geode.pdx.internal.TypeRegistry; import org.apache.geode.test.junit.categories.IntegrationTest; @Category(IntegrationTest.class) @@ -132,6 +133,7 @@ public void setUp() throws Exception { assumeThat( "AnalyzeSerializables requires Java 8 but tests are running with v" + getJavaVersion(), isJavaVersionAtLeast("1.8"), is(true)); + TypeRegistry.init(); } private List initializeServices() { From 78dcf4b8fa86543e882365e78f1c8e2a623bffde Mon Sep 17 00:00:00 2001 From: Sai Boorlagadda Date: Fri, 23 Mar 2018 09:48:47 -0700 Subject: [PATCH 14/15] GEODE-4859: Create a public version of GfshCommand (#1662) * Added public GfshCommand abstract class * InternalGfshCommand extends the public class * CommandManager sets cache to GfshCommand Signed-off-by: Jens Deppe --- .gitignore | 2 + .../internal/cli/AlterConnectionCommand.java | 8 +- .../internal/cli/AlterMappingCommand.java | 8 +- .../internal/cli/CreateConnectionCommand.java | 8 +- .../internal/cli/CreateMappingCommand.java | 8 +- .../cli/DescribeConnectionCommand.java | 4 +- .../internal/cli/DescribeMappingCommand.java | 4 +- .../cli/DestroyConnectionCommand.java | 8 +- .../internal/cli/DestroyMappingCommand.java | 8 +- .../internal/cli/ListConnectionCommand.java | 4 +- .../jdbc/internal/cli/ListMappingCommand.java | 4 +- .../cli/commands => cli}/GfshCommand.java | 84 ++++--------------- .../internal/cli/CommandManager.java | 5 +- .../commands/AlterAsyncEventQueueCommand.java | 5 +- .../AlterOfflineDiskStoreCommand.java | 2 +- .../cli/commands/AlterRegionCommand.java | 6 +- .../commands/AlterRuntimeConfigCommand.java | 6 +- .../cli/commands/BackupDiskStoreCommand.java | 2 +- .../cli/commands/ChangeLogLevelCommand.java | 2 +- .../commands/ClearDefinedIndexesCommand.java | 2 +- .../cli/commands/CloseDurableCQsCommand.java | 2 +- .../commands/CloseDurableClientCommand.java | 2 +- .../cli/commands/CompactDiskStoreCommand.java | 2 +- .../CompactOfflineDiskStoreCommand.java | 2 +- .../cli/commands/ConfigurePDXCommand.java | 6 +- .../internal/cli/commands/ConnectCommand.java | 2 +- .../commands/CountDurableCQEventsCommand.java | 2 +- .../CreateAsyncEventQueueCommand.java | 6 +- .../commands/CreateDefinedIndexesCommand.java | 6 +- .../cli/commands/CreateDiskStoreCommand.java | 6 +- .../CreateGatewayReceiverCommand.java | 6 +- .../commands/CreateGatewaySenderCommand.java | 6 +- .../cli/commands/CreateIndexCommand.java | 6 +- .../commands/CreateJndiBindingCommand.java | 5 +- .../cli/commands/CreateRegionCommand.java | 6 +- .../internal/cli/commands/DebugCommand.java | 2 +- .../cli/commands/DefineIndexCommand.java | 2 +- .../internal/cli/commands/DeployCommand.java | 5 +- .../cli/commands/DescribeClientCommand.java | 2 +- .../cli/commands/DescribeConfigCommand.java | 2 +- .../commands/DescribeConnectionCommand.java | 2 +- .../commands/DescribeDiskStoreCommand.java | 2 +- .../commands/DescribeJndiBindingCommand.java | 5 +- .../cli/commands/DescribeMemberCommand.java | 2 +- .../DescribeOfflineDiskStoreCommand.java | 2 +- .../cli/commands/DescribeRegionCommand.java | 2 +- .../DestroyAsyncEventQueueCommand.java | 6 +- .../cli/commands/DestroyDiskStoreCommand.java | 6 +- .../cli/commands/DestroyFunctionCommand.java | 2 +- .../commands/DestroyGatewaySenderCommand.java | 6 +- .../cli/commands/DestroyIndexCommand.java | 6 +- .../commands/DestroyJndiBindingCommand.java | 5 +- .../cli/commands/DestroyRegionCommand.java | 6 +- .../cli/commands/DisconnectCommand.java | 2 +- .../internal/cli/commands/EchoCommand.java | 2 +- .../cli/commands/ExecuteFunctionCommand.java | 2 +- .../cli/commands/ExecuteScriptCommand.java | 2 +- .../internal/cli/commands/ExitCommand.java | 2 +- .../cli/commands/ExportConfigCommand.java | 2 +- .../cli/commands/ExportDataCommand.java | 2 +- ...ortImportClusterConfigurationCommands.java | 2 +- .../cli/commands/ExportLogsCommand.java | 2 +- .../ExportOfflineDiskStoreCommand.java | 2 +- .../cli/commands/ExportStackTraceCommand.java | 2 +- .../internal/cli/commands/GCCommand.java | 3 +- .../internal/cli/commands/GetCommand.java | 2 +- .../cli/commands/GfshHelpCommand.java | 2 +- .../cli/commands/GfshHintCommand.java | 2 +- .../internal/cli/commands/HistoryCommand.java | 2 +- .../cli/commands/ImportDataCommand.java | 2 +- .../cli/commands/InternalGfshCommand.java | 76 +++++++++++++++++ .../commands/ListAsyncEventQueuesCommand.java | 2 +- .../cli/commands/ListClientCommand.java | 2 +- .../cli/commands/ListDeployedCommand.java | 2 +- .../cli/commands/ListDiskStoresCommand.java | 2 +- .../commands/ListDurableClientCQsCommand.java | 2 +- .../cli/commands/ListFunctionCommand.java | 2 +- .../cli/commands/ListGatewayCommand.java | 2 +- .../cli/commands/ListIndexCommand.java | 2 +- .../cli/commands/ListJndiBindingCommand.java | 5 +- .../cli/commands/ListMembersCommand.java | 2 +- .../cli/commands/ListRegionCommand.java | 2 +- .../LoadBalanceGatewaySenderCommand.java | 2 +- .../cli/commands/LocateEntryCommand.java | 2 +- .../internal/cli/commands/NetstatCommand.java | 2 +- .../cli/commands/PDXRenameCommand.java | 2 +- .../commands/PauseGatewaySenderCommand.java | 2 +- .../internal/cli/commands/PutCommand.java | 2 +- .../internal/cli/commands/QueryCommand.java | 2 +- .../cli/commands/RebalanceCommand.java | 2 +- .../internal/cli/commands/RemoveCommand.java | 2 +- .../commands/ResumeGatewaySenderCommand.java | 2 +- .../RevokeMissingDiskStoreCommand.java | 2 +- .../cli/commands/SetVariableCommand.java | 2 +- .../internal/cli/commands/ShCommand.java | 2 +- .../cli/commands/ShowDeadlockCommand.java | 2 +- .../internal/cli/commands/ShowLogCommand.java | 3 +- .../cli/commands/ShowMetricsCommand.java | 2 +- .../commands/ShowMissingDiskStoreCommand.java | 2 +- .../cli/commands/ShutdownCommand.java | 2 +- .../internal/cli/commands/SleepCommand.java | 2 +- .../commands/StartGatewayReceiverCommand.java | 2 +- .../commands/StartGatewaySenderCommand.java | 2 +- .../cli/commands/StartLocatorCommand.java | 2 +- .../cli/commands/StartMemberUtils.java | 4 +- .../cli/commands/StartServerCommand.java | 2 +- .../StatusClusterConfigServiceCommand.java | 2 +- .../StatusGatewayReceiverCommand.java | 2 +- .../commands/StatusGatewaySenderCommand.java | 2 +- .../commands/StopGatewayReceiverCommand.java | 2 +- .../commands/StopGatewaySenderCommand.java | 3 +- .../cli/commands/UndeployCommand.java | 6 +- .../UpgradeOfflineDiskStoreCommand.java | 2 +- .../commands/ValidateDiskStoreCommand.java | 2 +- .../internal/cli/commands/VersionCommand.java | 2 +- .../lifecycle/StartJConsoleCommand.java | 4 +- .../lifecycle/StartJVisualVMCommand.java | 4 +- .../commands/lifecycle/StartPulseCommand.java | 4 +- .../commands/lifecycle/StartVsdCommand.java | 4 +- .../lifecycle/StatusLocatorCommand.java | 4 +- .../lifecycle/StatusServerCommand.java | 4 +- .../lifecycle/StopLocatorCommand.java | 4 +- .../commands/lifecycle/StopServerCommand.java | 4 +- .../cli/commands/AlterDiskStoreJUnitTest.java | 1 + .../CommandAvailabilityIndicatorTest.java | 2 +- ...ribeConnectionCommandIntegrationTest.java} | 15 +--- .../cli/commands/GfshCommandJUnitTest.java | 4 +- .../internal/cli/LuceneIndexCommands.java | 13 +-- 128 files changed, 326 insertions(+), 261 deletions(-) rename geode-core/src/main/java/org/apache/geode/management/{internal/cli/commands => cli}/GfshCommand.java (76%) create mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/InternalGfshCommand.java rename geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/{DescribeConnectionCommandJUnitTest.java => DescribeConnectionCommandIntegrationTest.java} (81%) diff --git a/.gitignore b/.gitignore index af317b8687e7..ddb360b8f4a0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ out/ *.orig geode-pulse/screenshots/ /jpf.properties + +.git-together diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java index f4713cf89cb0..9a8655c99f75 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommand.java @@ -25,9 +25,10 @@ import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder; import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -37,7 +38,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class AlterConnectionCommand extends GfshCommand { +public class AlterConnectionCommand extends InternalGfshCommand { static final String ALTER_JDBC_CONNECTION = "alter jdbc-connection"; static final String ALTER_JDBC_CONNECTION__HELP = EXPERIMENTAL + "Alter properties for an existing jdbc connection."; @@ -136,7 +137,8 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java index 8735c928c0c9..b2d21c5130c9 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java @@ -25,9 +25,10 @@ import org.apache.geode.connectors.jdbc.internal.RegionMapping; import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -37,7 +38,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class AlterMappingCommand extends GfshCommand { +public class AlterMappingCommand extends InternalGfshCommand { static final String ALTER_MAPPING = "alter jdbc-mapping"; static final String ALTER_MAPPING__HELP = EXPERIMENTAL + "Alter properties for an existing jdbc mapping."; @@ -145,7 +146,8 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java index 032606aedaab..af95486d8282 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java @@ -27,12 +27,13 @@ import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder; import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -42,7 +43,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class CreateConnectionCommand extends GfshCommand { +public class CreateConnectionCommand extends InternalGfshCommand { private static final Logger logger = LogService.getLogger(); static final String CREATE_CONNECTION = "create jdbc-connection"; @@ -143,7 +144,8 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, null)); } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java index 6ea3c982c7bb..570deaafaa0e 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java @@ -25,9 +25,10 @@ import org.apache.geode.connectors.jdbc.internal.RegionMapping; import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -37,7 +38,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class CreateMappingCommand extends GfshCommand { +public class CreateMappingCommand extends InternalGfshCommand { static final String CREATE_MAPPING = "create jdbc-mapping"; static final String CREATE_MAPPING__HELP = EXPERIMENTAL + "Create a mapping for a region for use with a JDBC database connection."; @@ -146,7 +147,8 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java index a33651271e7d..a99e35eb8350 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java @@ -32,7 +32,7 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CompositeResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -41,7 +41,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class DescribeConnectionCommand extends GfshCommand { +public class DescribeConnectionCommand extends InternalGfshCommand { static final String DESCRIBE_CONNECTION = "describe jdbc-connection"; static final String DESCRIBE_CONNECTION__HELP = EXPERIMENTAL + "Describe the specified jdbc connection."; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java index 58d5a18feba4..7bb243a75469 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java @@ -32,7 +32,7 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CompositeResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -41,7 +41,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class DescribeMappingCommand extends GfshCommand { +public class DescribeMappingCommand extends InternalGfshCommand { static final String DESCRIBE_MAPPING = "describe jdbc-mapping"; static final String DESCRIBE_MAPPING__HELP = EXPERIMENTAL + "Describe the specified jdbc mapping."; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java index b96214e8cfbd..92e240116890 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommand.java @@ -23,9 +23,10 @@ import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -35,7 +36,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class DestroyConnectionCommand extends GfshCommand { +public class DestroyConnectionCommand extends InternalGfshCommand { static final String DESTROY_CONNECTION = "destroy jdbc-connection"; static final String DESTROY_CONNECTION__HELP = EXPERIMENTAL + "Destroy/Remove the specified jdbc connection."; @@ -107,7 +108,8 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java index f3b1e99fc897..6bcc970664c8 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java @@ -23,9 +23,10 @@ import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -35,7 +36,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class DestroyMappingCommand extends GfshCommand { +public class DestroyMappingCommand extends InternalGfshCommand { static final String DESTROY_MAPPING = "destroy jdbc-mapping"; static final String DESTROY_MAPPING__HELP = EXPERIMENTAL + "Destroy the specified mapping."; static final String DESTROY_MAPPING__REGION_NAME = "region"; @@ -104,7 +105,8 @@ private void addErrorToResults(TabularResultData tabularResultData, CliFunctionR private void updateClusterConfiguration(final Result result, final XmlEntity xmlEntity) { if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, null)); } } } diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java index 177034d4cf87..b71ee78c5596 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java @@ -27,7 +27,7 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.result.TabularResultData; @@ -35,7 +35,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class ListConnectionCommand extends GfshCommand { +public class ListConnectionCommand extends InternalGfshCommand { static final String LIST_JDBC_CONNECTION = "list jdbc-connections"; static final String LIST_JDBC_CONNECTION__HELP = EXPERIMENTAL + "Display jdbc connections for all members."; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java index 3d92b4e6637b..ad92ad8ad6d1 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java @@ -27,7 +27,7 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.result.TabularResultData; @@ -35,7 +35,7 @@ import org.apache.geode.security.ResourcePermission; @Experimental -public class ListMappingCommand extends GfshCommand { +public class ListMappingCommand extends InternalGfshCommand { static final String LIST_MAPPING = "list jdbc-mappings"; static final String LIST_MAPPING__HELP = EXPERIMENTAL + "Display jdbc mappings for all members."; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java b/geode-core/src/main/java/org/apache/geode/management/cli/GfshCommand.java similarity index 76% rename from geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java rename to geode-core/src/main/java/org/apache/geode/management/cli/GfshCommand.java index 91fa157c9385..fe286220b6af 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/cli/GfshCommand.java @@ -12,16 +12,16 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ -package org.apache.geode.management.internal.cli.commands; +package org.apache.geode.management.cli; import java.util.Collections; import java.util.List; -import java.util.Objects; import java.util.Set; import org.apache.shiro.subject.Subject; import org.springframework.shell.core.CommandMarker; +import org.apache.geode.annotations.Experimental; import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; @@ -29,75 +29,18 @@ import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.ClusterConfigurationService; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.distributed.internal.InternalLocator; import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.management.ManagementService; -import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.internal.cli.shell.Gfsh; -import org.apache.geode.management.internal.configuration.domain.XmlEntity; import org.apache.geode.security.ResourcePermission; -/** - * Encapsulates common functionality for implementing command classes for the Geode shell (gfsh). - * this provides wrapper around the static methods in CliUtils for easy mock of the commands - * - * this class should not have much implementation of its own other then those tested in - * GfshCommandJUnitTest - */ -@SuppressWarnings("unused") +@Experimental public abstract class GfshCommand implements CommandMarker { private InternalCache cache; - public void setCache(Cache cache) { - this.cache = (InternalCache) cache; - } - - public Cache getCache() { - return cache; - } - - public static final String EXPERIMENTAL = "(Experimental) "; - - public boolean isConnectedAndReady() { - return getGfsh() != null && getGfsh().isConnectedAndReady(); - } - - public InternalClusterConfigurationService getConfigurationService() { - InternalLocator locator = InternalLocator.getLocator(); - return locator == null ? null : locator.getSharedConfiguration(); - } - - public void persistClusterConfiguration(Result result, Runnable runnable) { - if (result == null) { - throw new IllegalArgumentException("Result should not be null"); - } - InternalClusterConfigurationService sc = getConfigurationService(); - if (sc == null) { - result.setCommandPersisted(false); - } else { - runnable.run(); - result.setCommandPersisted(true); - } - } - - public XmlEntity findXmlEntity(List functionResults) { - return functionResults.stream().filter(CliFunctionResult::isSuccessful) - .map(CliFunctionResult::getXmlEntity).filter(Objects::nonNull).findFirst().orElse(null); - } - - public boolean isDebugging() { - return getGfsh() != null && getGfsh().getDebug(); - } - - public boolean isLogging() { - return getGfsh() != null; - } - public void authorize(ResourcePermission.Resource resource, ResourcePermission.Operation operation, ResourcePermission.Target target) { cache.getSecurityService().authorize(resource, operation, target); @@ -113,12 +56,21 @@ public void authorize(ResourcePermission.Resource resource, cache.getSecurityService().authorize(resource, operation, target, key); } - public Subject getSubject() { - return cache.getSecurityService().getSubject(); + public Cache getCache() { + return cache; } - public Gfsh getGfsh() { - return Gfsh.getCurrentInstance(); + public ClusterConfigurationService getConfigurationService() { + InternalLocator locator = InternalLocator.getLocator(); + return locator == null ? null : locator.getSharedConfiguration(); + } + + public void setCache(Cache cache) { + this.cache = (InternalCache) cache; + } + + public Subject getSubject() { + return cache.getSecurityService().getSubject(); } /** @@ -195,10 +147,6 @@ public Set getMembersIncludingLocators(String[] groups, Strin return matchingMembers; } - public ManagementService getManagementService() { - return ManagementService.getExistingManagementService(getCache()); - } - public Set findMembersForRegion(String regionPath) { return CliUtil.getRegionAssociatedMembers(regionPath, cache, true); } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java index b8d284669f62..387ff0306ed7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java @@ -37,7 +37,8 @@ import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.internal.ClassPathLoader; import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.cli.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.help.Helper; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper; @@ -220,7 +221,7 @@ private void loadGeodeCommands() { try { // geode's commands foundClasses = ClasspathScanLoadHelper.scanPackageForClassesImplementing( - GfshCommand.class.getPackage().getName(), CommandMarker.class); + InternalGfshCommand.class.getPackage().getName(), CommandMarker.class); for (Class klass : foundClasses) { try { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java index 5a4af4bc165f..d23fec2f003e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java @@ -51,7 +51,7 @@ * this command currently only updates the cluster configuration. Requires server restart to pick up * the changes. */ -public class AlterAsyncEventQueueCommand extends GfshCommand { +public class AlterAsyncEventQueueCommand extends InternalGfshCommand { static final String COMMAND_NAME = "alter async-event-queue"; static final String ID = "id"; @@ -85,7 +85,8 @@ public Result execute(@CliOption(key = ID, mandatory = true, help = ID_HELP) Str // need not check if any running servers has this async-event-queue. A server with this queue id // may be shutdown, but we still need to update Cluster Configuration. - InternalClusterConfigurationService service = getConfigurationService(); + InternalClusterConfigurationService service = + (InternalClusterConfigurationService) getConfigurationService(); if (service == null) { return ResultBuilder.createUserErrorResult("Cluster Configuration Service is not available. " diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java index 3cf56e77b0a7..7819f00ec7bb 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java @@ -29,7 +29,7 @@ import org.apache.geode.management.internal.cli.result.ErrorResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class AlterOfflineDiskStoreCommand extends GfshCommand { +public class AlterOfflineDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.ALTER_DISK_STORE, help = CliStrings.ALTER_DISK_STORE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) public Result alterOfflineDiskStore( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java index 1cc4e30cd07f..008b21adbec6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java @@ -26,6 +26,7 @@ import org.apache.geode.cache.CustomExpiry; import org.apache.geode.cache.ExpirationAction; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; @@ -40,7 +41,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class AlterRegionCommand extends GfshCommand { +public class AlterRegionCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.ALTER_REGION, help = CliStrings.ALTER_REGION__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_REGION) public Result alterRegion( @@ -137,7 +138,8 @@ public Result alterRegion( XmlEntity xmlEntity = findXmlEntity(regionAlterResults); if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, groups)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java index 372cbdb39552..bc682c9f7682 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java @@ -30,6 +30,7 @@ import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.cache.xmlcache.CacheXml; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.logging.log4j.LogLevel; @@ -47,7 +48,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class AlterRuntimeConfigCommand extends GfshCommand { +public class AlterRuntimeConfigCommand extends InternalGfshCommand { private final AlterRuntimeConfigFunction alterRunTimeConfigFunction = new AlterRuntimeConfigFunction(); private static Logger logger = LogService.getLogger(); @@ -216,7 +217,8 @@ public Result alterRuntimeConfig( final XmlEntity xmlEntity = XmlEntity.builder().withType(CacheXml.CACHE) .withAttributes(rumTimeCacheAttributes).build(); persistClusterConfiguration(result, - () -> getConfigurationService().modifyXmlAndProperties(properties, xmlEntity, group)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .modifyXmlAndProperties(properties, xmlEntity, group)); return result; } else { StringBuilder errorMessageBuilder = new StringBuilder(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java index b5bd50fe147a..68e874d146cb 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java @@ -36,7 +36,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class BackupDiskStoreCommand extends GfshCommand { +public class BackupDiskStoreCommand extends InternalGfshCommand { /** * Internally, we also verify the resource operation permissions CLUSTER:WRITE:DISK if the region * is persistent diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java index 7efec84e04c6..ad03ec6b7ddb 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java @@ -45,7 +45,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ChangeLogLevelCommand extends GfshCommand { +public class ChangeLogLevelCommand extends InternalGfshCommand { private static Logger logger = LogService.getLogger(); @CliCommand(value = CliStrings.CHANGE_LOGLEVEL, help = CliStrings.CHANGE_LOGLEVEL__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java index 47d8cc1b0de2..d36bceace5e8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java @@ -25,7 +25,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ClearDefinedIndexesCommand extends GfshCommand { +public class ClearDefinedIndexesCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.CLEAR_DEFINED_INDEXES, help = CliStrings.CLEAR_DEFINED__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java index e4930c60be85..c4b591655b4d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java @@ -34,7 +34,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CloseDurableCQsCommand extends GfshCommand { +public class CloseDurableCQsCommand extends InternalGfshCommand { DurableClientCommandsResultBuilder builder = new DurableClientCommandsResultBuilder(); @CliCommand(value = CliStrings.CLOSE_DURABLE_CQS, help = CliStrings.CLOSE_DURABLE_CQS__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java index d9312aef2f00..4174fa501586 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java @@ -34,7 +34,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CloseDurableClientCommand extends GfshCommand { +public class CloseDurableClientCommand extends InternalGfshCommand { DurableClientCommandsResultBuilder builder = new DurableClientCommandsResultBuilder(); @CliCommand(value = CliStrings.CLOSE_DURABLE_CLIENTS, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java index f9425179e5e5..18fff7f4e03d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java @@ -45,7 +45,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CompactDiskStoreCommand extends GfshCommand { +public class CompactDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.COMPACT_DISK_STORE, help = CliStrings.COMPACT_DISK_STORE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java index 1a0fd2877416..fbcce915ca61 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java @@ -38,7 +38,7 @@ import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.util.DiskStoreCompacter; -public class CompactOfflineDiskStoreCommand extends GfshCommand { +public class CompactOfflineDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.COMPACT_OFFLINE_DISK_STORE, help = CliStrings.COMPACT_OFFLINE_DISK_STORE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java index 2c534a909753..b5d575249de5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java @@ -22,6 +22,7 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.cache.CacheConfig; import org.apache.geode.internal.cache.xmlcache.CacheCreation; import org.apache.geode.internal.cache.xmlcache.CacheXml; @@ -38,7 +39,7 @@ import org.apache.geode.pdx.ReflectionBasedAutoSerializer; import org.apache.geode.security.ResourcePermission; -public class ConfigurePDXCommand extends GfshCommand { +public class ConfigurePDXCommand extends InternalGfshCommand { /** * @@ -151,7 +152,8 @@ public Result configurePDX( XmlEntity xmlEntity = createXmlEntity(cache); result = ResultBuilder.buildResult(ird); persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, null)); return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java index c04d9018cb87..e5e834a243a4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java @@ -70,7 +70,7 @@ import org.apache.geode.management.internal.web.shell.HttpOperationInvoker; import org.apache.geode.security.AuthenticationFailedException; -public class ConnectCommand extends GfshCommand { +public class ConnectCommand extends InternalGfshCommand { // millis that connect --locator will wait for a response from the locator. static final int CONNECT_LOCATOR_TIMEOUT_MS = 60000; // see bug 45971 diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java index a3d66587a0a6..420b2567aba1 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java @@ -34,7 +34,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CountDurableCQEventsCommand extends GfshCommand { +public class CountDurableCQEventsCommand extends InternalGfshCommand { DurableClientCommandsResultBuilder builder = new DurableClientCommandsResultBuilder(); @CliCommand(value = CliStrings.COUNT_DURABLE_CQ_EVENTS, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java index a7dc2f004700..ecb3a0b476ab 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java @@ -24,6 +24,7 @@ import org.apache.geode.cache.asyncqueue.internal.AsyncEventQueueFactoryImpl; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.functions.AsyncEventQueueFunctionArgs; @@ -36,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateAsyncEventQueueCommand extends GfshCommand { +public class CreateAsyncEventQueueCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.CREATE_ASYNC_EVENT_QUEUE, help = CliStrings.CREATE_ASYNC_EVENT_QUEUE__HELP) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, @@ -124,7 +125,8 @@ public Result createAsyncEventQueue( XmlEntity xmlEntity = findXmlEntity(results); if (xmlEntity != null) { persistClusterConfiguration(commandResult, - () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, groups)); } return commandResult; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java index 5aa829bda5d2..7001d0b350ca 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java @@ -27,6 +27,7 @@ import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -40,7 +41,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateDefinedIndexesCommand extends GfshCommand { +public class CreateDefinedIndexesCommand extends InternalGfshCommand { private static final CreateDefinedIndexesFunction createDefinedIndexesFunction = new CreateDefinedIndexesFunction(); @@ -153,7 +154,8 @@ public Result createDefinedIndexes( for (XmlEntity xmlEntity : xmlEntities) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, group)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, group)); } return result; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java index cdd87798ddb0..faa5bb8fafdb 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java @@ -23,6 +23,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.cache.DiskStoreAttributes; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; @@ -36,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateDiskStoreCommand extends GfshCommand { +public class CreateDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.CREATE_DISK_STORE, help = CliStrings.CREATE_DISK_STORE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, @@ -119,7 +120,8 @@ public Result createDiskStore( if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, groups)); } return result; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java index 239dac3b49e5..9be9ef35902b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java @@ -23,6 +23,7 @@ import org.apache.geode.cache.wan.GatewayReceiver; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -38,7 +39,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateGatewayReceiverCommand extends GfshCommand { +public class CreateGatewayReceiverCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.CREATE_GATEWAYRECEIVER, help = CliStrings.CREATE_GATEWAYRECEIVER__HELP) @@ -102,7 +103,8 @@ public Result createGatewayReceiver(@CliOption(key = {CliStrings.GROUP, CliStrin } // update cluster config - getConfigurationService().addXmlEntity(xmlEntity, onGroups); + ((InternalClusterConfigurationService) getConfigurationService()).addXmlEntity(xmlEntity, + onGroups); return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java index 175f78282473..b47c7457c4a4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java @@ -23,6 +23,7 @@ import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.Version; import org.apache.geode.management.cli.CliMetaData; @@ -40,7 +41,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateGatewaySenderCommand extends GfshCommand { +public class CreateGatewaySenderCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.CREATE_GATEWAYSENDER, help = CliStrings.CREATE_GATEWAYSENDER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN, interceptor = "org.apache.geode.management.internal.cli.commands.CreateGatewaySenderCommand$Interceptor") @@ -143,7 +144,8 @@ public Result createGatewaySender(@CliOption(key = {CliStrings.GROUP, CliStrings } // update cluster config - getConfigurationService().addXmlEntity(xmlEntity, onGroups); + ((InternalClusterConfigurationService) getConfigurationService()).addXmlEntity(xmlEntity, + onGroups); return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java index 112aed6b2169..d9b27c179764 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java @@ -23,6 +23,7 @@ import org.apache.geode.cache.query.IndexType; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -35,7 +36,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateIndexCommand extends GfshCommand { +public class CreateIndexCommand extends InternalGfshCommand { private static final CreateIndexFunction createIndexFunction = new CreateIndexFunction(); @CliCommand(value = CliStrings.CREATE_INDEX, help = CliStrings.CREATE_INDEX__HELP) @@ -80,7 +81,8 @@ public Result createIndex(@CliOption(key = CliStrings.CREATE_INDEX__NAME, mandat if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, group)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, group)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java index b525a70b3f1c..2c4549ceb98b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java @@ -40,7 +40,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateJndiBindingCommand extends GfshCommand { +public class CreateJndiBindingCommand extends InternalGfshCommand { private static final Logger logger = LogService.getLogger(); static final String CREATE_JNDIBINDING = "create jndi-binding"; @@ -147,7 +147,8 @@ public Result createJDNIBinding( Result result; boolean persisted = false; - InternalClusterConfigurationService service = getConfigurationService(); + InternalClusterConfigurationService service = + (InternalClusterConfigurationService) getConfigurationService(); if (service != null) { CacheConfig cacheConfig = service.getCacheConfig("cluster"); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java index b88b389c0b17..e2e002193331 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java @@ -41,6 +41,7 @@ import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.management.DistributedRegionMXBean; @@ -69,7 +70,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class CreateRegionCommand extends GfshCommand { +public class CreateRegionCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.CREATE_REGION, help = CliStrings.CREATE_REGION__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_REGION, interceptor = "org.apache.geode.management.internal.cli.commands.CreateRegionCommand$Interceptor") @@ -441,7 +442,8 @@ public Result createRegion( if (xmlEntity != null) { verifyDistributedRegionMbean(cache, regionPath); persistClusterConfiguration(result, - () -> getConfigurationService().addXmlEntity(xmlEntity, groups)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .addXmlEntity(xmlEntity, groups)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java index 13f31ab0175a..1f025a0195d5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java @@ -25,7 +25,7 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class DebugCommand extends GfshCommand { +public class DebugCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.DEBUG}, help = CliStrings.DEBUG__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_DEBUG_UTIL}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java index 63986f3ca790..9437278d5855 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java @@ -29,7 +29,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DefineIndexCommand extends GfshCommand { +public class DefineIndexCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.DEFINE_INDEX, help = CliStrings.DEFINE_INDEX__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) // TODO : Add optionContext for indexName diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java index bd27aa8be873..f514c47d9748 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java @@ -55,7 +55,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DeployCommand extends GfshCommand { +public class DeployCommand extends InternalGfshCommand { private final DeployFunction deployFunction = new DeployFunction(); /** @@ -136,7 +136,8 @@ public Result deploy( } Result result = ResultBuilder.buildResult(tabularData); - InternalClusterConfigurationService sc = getConfigurationService(); + InternalClusterConfigurationService sc = + (InternalClusterConfigurationService) getConfigurationService(); if (sc == null) { result.setCommandPersisted(false); } else { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java index 71752a7dc357..f14a992b2295 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java @@ -43,7 +43,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DescribeClientCommand extends GfshCommand { +public class DescribeClientCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.DESCRIBE_CLIENT, help = CliStrings.DESCRIBE_CLIENT__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_CLIENT}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java index 3da1750940e5..100fdfba56bf 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java @@ -40,7 +40,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DescribeConfigCommand extends GfshCommand { +public class DescribeConfigCommand extends InternalGfshCommand { private final GetMemberConfigInformationFunction getMemberConfigFunction = new GetMemberConfigInformationFunction(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java index bc9938f8af71..32bfc947cc9a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java @@ -26,7 +26,7 @@ import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.OperationInvoker; -public class DescribeConnectionCommand extends GfshCommand { +public class DescribeConnectionCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.DESCRIBE_CONNECTION}, help = CliStrings.DESCRIBE_CONNECTION__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX}) public Result describeConnection() { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java index 8fb4b0cde719..c4b780f05b11 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java @@ -37,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DescribeDiskStoreCommand extends GfshCommand { +public class DescribeDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.DESCRIBE_DISK_STORE, help = CliStrings.DESCRIBE_DISK_STORE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java index 787d23e8aea3..963845cef503 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeJndiBindingCommand.java @@ -33,7 +33,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DescribeJndiBindingCommand extends GfshCommand { +public class DescribeJndiBindingCommand extends InternalGfshCommand { private static final Logger logger = LogService.getLogger(); private static final String DESCRIBE_JNDI_BINDING = "describe jndi-binding"; @@ -49,7 +49,8 @@ public Result describeJndiBinding(@CliOption(key = "name", mandatory = true, Result result = null; TabularResultData tabularData = ResultBuilder.createTabularResultData(); - InternalClusterConfigurationService ccService = getConfigurationService(); + InternalClusterConfigurationService ccService = + (InternalClusterConfigurationService) getConfigurationService(); if (ccService != null) { CacheConfig cacheConfig = ccService.getCacheConfig("cluster"); List jndiBindings = cacheConfig.getJndiBindings(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java index 64eaa0933f67..9d3fa043046a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java @@ -38,7 +38,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DescribeMemberCommand extends GfshCommand { +public class DescribeMemberCommand extends InternalGfshCommand { private static final GetMemberInformationFunction getMemberInformation = new GetMemberInformationFunction(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java index f1a96e57b17b..abaf367539e7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java @@ -30,7 +30,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class DescribeOfflineDiskStoreCommand extends GfshCommand { +public class DescribeOfflineDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.DESCRIBE_OFFLINE_DISK_STORE, help = CliStrings.DESCRIBE_OFFLINE_DISK_STORE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java index 8111843ea284..96dd2fdd5ad4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeRegionCommand.java @@ -44,7 +44,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DescribeRegionCommand extends GfshCommand { +public class DescribeRegionCommand extends InternalGfshCommand { public static final Logger logger = LogService.getLogger(); private static final GetRegionDescriptionFunction getRegionDescription = diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java index dcd6a0fdfbf3..331405eb17b5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java @@ -24,6 +24,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; @@ -35,7 +36,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DestroyAsyncEventQueueCommand extends GfshCommand { +public class DestroyAsyncEventQueueCommand extends InternalGfshCommand { public static final String DESTROY_ASYNC_EVENT_QUEUE = "destroy async-event-queue"; public static final String DESTROY_ASYNC_EVENT_QUEUE__HELP = "destroy an Async Event Queue"; public static final String DESTROY_ASYNC_EVENT_QUEUE__ID = "id"; @@ -72,7 +73,8 @@ public Result destroyAsyncEventQueue( XmlEntity xmlEntity = findXmlEntity(functionResults); if (xmlEntity != null) { persistClusterConfiguration(commandResult, - () -> getConfigurationService().deleteXmlEntity(xmlEntity, onGroups)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .deleteXmlEntity(xmlEntity, onGroups)); } return commandResult; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java index f2a2b0709749..d2e7885466e0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java @@ -22,6 +22,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -34,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DestroyDiskStoreCommand extends GfshCommand { +public class DestroyDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.DESTROY_DISK_STORE, help = CliStrings.DESTROY_DISK_STORE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, @@ -64,7 +65,8 @@ public Result destroyDiskStore( if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().deleteXmlEntity(xmlEntity, groups)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .deleteXmlEntity(xmlEntity, groups)); } return result; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java index 3b612b0afc67..2cdad4b8ddb3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java @@ -41,7 +41,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DestroyFunctionCommand extends GfshCommand { +public class DestroyFunctionCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.DESTROY_FUNCTION, help = CliStrings.DESTROY_FUNCTION__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_FUNCTION}, interceptor = "org.apache.geode.management.internal.cli.commands.DestroyFunctionCommand$Interceptor") diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java index 4f984cdb7be5..fc95c8c9cccb 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java @@ -23,6 +23,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; @@ -37,7 +38,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DestroyGatewaySenderCommand extends GfshCommand { +public class DestroyGatewaySenderCommand extends InternalGfshCommand { private static final Logger logger = LogService.getLogger(); @CliCommand(value = CliStrings.DESTROY_GATEWAYSENDER, @@ -81,7 +82,8 @@ public Result destroyGatewaySender( } // update cluster config - getConfigurationService().deleteXmlEntity(xmlEntity, onGroups); + ((InternalClusterConfigurationService) getConfigurationService()).deleteXmlEntity(xmlEntity, + onGroups); return result; } } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java index 3fbee0f74192..9d0c6139a3a2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java @@ -23,6 +23,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; @@ -36,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DestroyIndexCommand extends GfshCommand { +public class DestroyIndexCommand extends InternalGfshCommand { private static final DestroyIndexFunction destroyIndexFunction = new DestroyIndexFunction(); @CliCommand(value = CliStrings.DESTROY_INDEX, help = CliStrings.DESTROY_INDEX__HELP) @@ -82,7 +83,8 @@ public Result destroyIndex( if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().deleteXmlEntity(xmlEntity, group)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .deleteXmlEntity(xmlEntity, group)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java index b65b0ef475c4..fdb60a1f4337 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DestroyJndiBindingCommand extends GfshCommand { +public class DestroyJndiBindingCommand extends InternalGfshCommand { static final String DESTROY_JNDIBINDING = "destroy jndi-binding"; static final String DESTROY_JNDIBINDING__HELP = "Destroy a jndi binding that holds the configuration for the XA datasource."; @@ -55,7 +55,8 @@ public Result destroyJDNIBinding( Result result; boolean persisted = false; - InternalClusterConfigurationService service = getConfigurationService(); + InternalClusterConfigurationService service = + (InternalClusterConfigurationService) getConfigurationService(); if (service != null) { service.updateCacheConfig("cluster", cc -> { List bindings = cc.getJndiBindings(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java index 868ffaab92c7..f11725b1cdbf 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java @@ -21,6 +21,7 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -34,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class DestroyRegionCommand extends GfshCommand { +public class DestroyRegionCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.DESTROY_REGION}, help = CliStrings.DESTROY_REGION__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_REGION) @ResourceOperation(resource = ResourcePermission.Resource.DATA, @@ -70,7 +71,8 @@ public Result destroyRegion( // if at least one member returns with successful deletion, we will need to update cc if (xmlEntity != null) { persistClusterConfiguration(result, - () -> getConfigurationService().deleteXmlEntity(xmlEntity, null)); + () -> ((InternalClusterConfigurationService) getConfigurationService()) + .deleteXmlEntity(xmlEntity, null)); } return result; } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java index 874c63af176c..ea0299297fc8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java @@ -26,7 +26,7 @@ import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.OperationInvoker; -public class DisconnectCommand extends GfshCommand { +public class DisconnectCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.DISCONNECT}, help = CliStrings.DISCONNECT__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_MANAGER}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java index 6e916b5608de..a53abf1e3056 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java @@ -28,7 +28,7 @@ import org.apache.geode.management.internal.cli.result.TabularResultData; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class EchoCommand extends GfshCommand { +public class EchoCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.ECHO}, help = CliStrings.ECHO__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result echo(@CliOption(key = {CliStrings.ECHO__STR, ""}, specifiedDefaultValue = "", diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java index ec720305acf6..909e05383f98 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java @@ -39,7 +39,7 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.result.TabularResultData; -public class ExecuteFunctionCommand extends GfshCommand { +public class ExecuteFunctionCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.EXECUTE_FUNCTION, help = CliStrings.EXECUTE_FUNCTION__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_FUNCTION}, interceptor = "org.apache.geode.management.internal.cli.commands.ExecuteFunctionCommand$ExecuteFunctionCommandInterceptor") diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java index 434fd78d5740..4d7993471709 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java @@ -27,7 +27,7 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class ExecuteScriptCommand extends GfshCommand { +public class ExecuteScriptCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.RUN}, help = CliStrings.RUN__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result executeScript( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExitCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExitCommand.java index 0ddf7c41e4c0..785554db8ddb 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExitCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExitCommand.java @@ -22,7 +22,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class ExitCommand extends GfshCommand { +public class ExitCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.EXIT, "quit"}, help = CliStrings.EXIT__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public ExitShellRequest exit() { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java index bdd9659eac20..81fc924c5f97 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java @@ -41,7 +41,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ExportConfigCommand extends GfshCommand { +public class ExportConfigCommand extends InternalGfshCommand { private final ExportConfigFunction exportConfigFunction = new ExportConfigFunction(); /** diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java index 651120694936..e77d1a93e4e1 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java @@ -36,7 +36,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class ExportDataCommand extends GfshCommand { +public class ExportDataCommand extends InternalGfshCommand { private final ExportDataFunction exportDataFunction = new ExportDataFunction(); @CliCommand(value = CliStrings.EXPORT_DATA, help = CliStrings.EXPORT_DATA__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java index 9179c5cb546b..61118ba8fe2c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportImportClusterConfigurationCommands.java @@ -64,7 +64,7 @@ * Commands for the cluster configuration */ @SuppressWarnings("unused") -public class ExportImportClusterConfigurationCommands extends GfshCommand { +public class ExportImportClusterConfigurationCommands extends InternalGfshCommand { @CliCommand(value = {CliStrings.EXPORT_SHARED_CONFIG}, help = CliStrings.EXPORT_SHARED_CONFIG__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java index 5634d3630757..72ff3ee11f29 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java @@ -49,7 +49,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ExportLogsCommand extends GfshCommand { +public class ExportLogsCommand extends InternalGfshCommand { private static final Logger logger = LogService.getLogger(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java index 919465b3b5b2..7d14cc7eb3b0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java @@ -28,7 +28,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class ExportOfflineDiskStoreCommand extends GfshCommand { +public class ExportOfflineDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.EXPORT_OFFLINE_DISK_STORE, help = CliStrings.EXPORT_OFFLINE_DISK_STORE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java index 88c63dada216..7800c7abdcad 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java @@ -46,7 +46,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ExportStackTraceCommand extends GfshCommand { +public class ExportStackTraceCommand extends InternalGfshCommand { public static final String STACK_TRACE_FOR_MEMBER = "*** Stack-trace for member "; private final GetStackTracesFunction getStackTracesFunction = new GetStackTracesFunction(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java index af392e0eca2e..9ba4607b4139 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java @@ -26,7 +26,6 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.execute.Function; import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -40,7 +39,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class GCCommand extends GfshCommand { +public class GCCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.GC, help = CliStrings.GC__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java index 16b3c2fcd6f3..cf347154bdb5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java @@ -39,7 +39,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class GetCommand extends GfshCommand { +public class GetCommand extends InternalGfshCommand { @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION}) @CliCommand(value = {CliStrings.GET}, help = CliStrings.GET__HELP) public Result get( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java index 6edb6286984b..e1966387439f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java @@ -26,7 +26,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class GfshHelpCommand extends GfshCommand implements CommandManagerAware { +public class GfshHelpCommand extends InternalGfshCommand implements CommandManagerAware { private CommandManager commandManager = null; public void setCommandManager(CommandManager commandManager) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java index cd880597f4c2..59ff7789132b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java @@ -26,7 +26,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class GfshHintCommand extends GfshCommand implements CommandManagerAware { +public class GfshHintCommand extends InternalGfshCommand implements CommandManagerAware { private CommandManager commandManager = null; public void setCommandManager(CommandManager commandManager) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/HistoryCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/HistoryCommand.java index 0a6dee003eba..0925ef2afbda 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/HistoryCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/HistoryCommand.java @@ -34,7 +34,7 @@ import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.jline.GfshHistory; -public class HistoryCommand extends GfshCommand { +public class HistoryCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.HISTORY, help = CliStrings.HISTORY__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result history( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java index 31e5c4dc79b3..caece6897623 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java @@ -34,7 +34,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class ImportDataCommand extends GfshCommand { +public class ImportDataCommand extends InternalGfshCommand { private final ImportDataFunction importDataFunction = new ImportDataFunction(); @CliCommand(value = CliStrings.IMPORT_DATA, help = CliStrings.IMPORT_DATA__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/InternalGfshCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/InternalGfshCommand.java new file mode 100644 index 000000000000..e05b5516d9c9 --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/InternalGfshCommand.java @@ -0,0 +1,76 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.geode.management.internal.cli.commands; + +import java.util.List; +import java.util.Objects; + +import org.springframework.shell.core.CommandMarker; + +import org.apache.geode.management.ManagementService; +import org.apache.geode.management.cli.GfshCommand; +import org.apache.geode.management.cli.Result; +import org.apache.geode.management.internal.cli.functions.CliFunctionResult; +import org.apache.geode.management.internal.cli.shell.Gfsh; +import org.apache.geode.management.internal.configuration.domain.XmlEntity; + +/** + * Encapsulates common functionality for implementing command classes for the Geode shell (gfsh). + * this provides wrapper around the static methods in CliUtils for easy mock of the commands + * + * this class should not have much implementation of its own other then those tested in + * GfshCommandJUnitTest + */ +@SuppressWarnings("unused") +public abstract class InternalGfshCommand extends GfshCommand implements CommandMarker { + public static final String EXPERIMENTAL = "(Experimental) "; + + public boolean isConnectedAndReady() { + return getGfsh() != null && getGfsh().isConnectedAndReady(); + } + + public void persistClusterConfiguration(Result result, Runnable runnable) { + if (result == null) { + throw new IllegalArgumentException("Result should not be null"); + } + if (getConfigurationService() == null) { + result.setCommandPersisted(false); + } else { + runnable.run(); + result.setCommandPersisted(true); + } + } + + public XmlEntity findXmlEntity(List functionResults) { + return functionResults.stream().filter(CliFunctionResult::isSuccessful) + .map(CliFunctionResult::getXmlEntity).filter(Objects::nonNull).findFirst().orElse(null); + } + + public boolean isDebugging() { + return getGfsh() != null && getGfsh().getDebug(); + } + + public boolean isLogging() { + return getGfsh() != null; + } + + public Gfsh getGfsh() { + return Gfsh.getCurrentInstance(); + } + + public ManagementService getManagementService() { + return ManagementService.getExistingManagementService(getCache()); + } +} diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java index f61a06678e74..55fe663f2b2d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java @@ -36,7 +36,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListAsyncEventQueuesCommand extends GfshCommand { +public class ListAsyncEventQueuesCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.LIST_ASYNC_EVENT_QUEUES, help = CliStrings.LIST_ASYNC_EVENT_QUEUES__HELP) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java index b413aecc90a8..811c552911b6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java @@ -36,7 +36,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListClientCommand extends GfshCommand { +public class ListClientCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.LIST_CLIENTS, help = CliStrings.LIST_CLIENT__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_CLIENT}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java index 88a6afd2d350..c8651dc7c581 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListDeployedCommand extends GfshCommand { +public class ListDeployedCommand extends InternalGfshCommand { private final ListDeployedFunction listDeployedFunction = new ListDeployedFunction(); /** diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java index ca0bbba1bbd7..ac4e59bd77f8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java @@ -38,7 +38,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListDiskStoresCommand extends GfshCommand { +public class ListDiskStoresCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.LIST_DISK_STORE, help = CliStrings.LIST_DISK_STORE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java index dc058672cff2..66c748dfbe46 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java @@ -38,7 +38,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListDurableClientCQsCommand extends GfshCommand { +public class ListDurableClientCQsCommand extends InternalGfshCommand { DurableClientCommandsResultBuilder builder = new DurableClientCommandsResultBuilder(); @CliCommand(value = CliStrings.LIST_DURABLE_CQS, help = CliStrings.LIST_DURABLE_CQS__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java index 291c97879033..7491f0bf38e4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java @@ -37,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListFunctionCommand extends GfshCommand { +public class ListFunctionCommand extends InternalGfshCommand { private final ListFunctionFunction listFunctionFunction = new ListFunctionFunction(); @CliCommand(value = CliStrings.LIST_FUNCTION, help = CliStrings.LIST_FUNCTION__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java index 293746e43c02..1e5bd2339755 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java @@ -40,7 +40,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListGatewayCommand extends GfshCommand { +public class ListGatewayCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.LIST_GATEWAY, help = CliStrings.LIST_GATEWAY__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListIndexCommand.java index 647e1da03294..e3b598d1d731 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListIndexCommand.java @@ -38,7 +38,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListIndexCommand extends GfshCommand { +public class ListIndexCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.LIST_INDEX, help = CliStrings.LIST_INDEX__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java index ba4afd6b10c9..cc27b3e32925 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java @@ -37,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListJndiBindingCommand extends GfshCommand { +public class ListJndiBindingCommand extends InternalGfshCommand { private static final Logger logger = LogService.getLogger(); private static final String LIST_JNDIBINDING = "list jndi-binding"; @@ -54,7 +54,8 @@ public Result listJndiBinding() { TabularResultData configTable = null; TabularResultData memberTable = null; - InternalClusterConfigurationService ccService = getConfigurationService(); + InternalClusterConfigurationService ccService = + (InternalClusterConfigurationService) getConfigurationService(); if (ccService != null) { configTable = resultSection.addTable(); configTable.setHeader("Configured JNDI bindings: "); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java index e327a1d1ff19..b68c9628ec82 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java @@ -33,7 +33,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListMembersCommand extends GfshCommand { +public class ListMembersCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.LIST_MEMBER}, help = CliStrings.LIST_MEMBER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_SERVER) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java index edc155aa6f5b..17ebeac74784 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java @@ -41,7 +41,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ListRegionCommand extends GfshCommand { +public class ListRegionCommand extends InternalGfshCommand { private static final GetRegionsFunction getRegionsFunction = new GetRegionsFunction(); @CliCommand(value = {CliStrings.LIST_REGION}, help = CliStrings.LIST_REGION__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java index ed7b00038192..647fac691b56 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class LoadBalanceGatewaySenderCommand extends GfshCommand { +public class LoadBalanceGatewaySenderCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.LOAD_BALANCE_GATEWAYSENDER, help = CliStrings.LOAD_BALANCE_GATEWAYSENDER__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java index c1fe34300195..07dd4d127ce6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class LocateEntryCommand extends GfshCommand { +public class LocateEntryCommand extends InternalGfshCommand { @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION}) @CliCommand(value = {CliStrings.LOCATE_ENTRY}, help = CliStrings.LOCATE_ENTRY__HELP) public Result locateEntry( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java index 1d8e66cfc119..98e0fa04345d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java @@ -47,7 +47,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class NetstatCommand extends GfshCommand { +public class NetstatCommand extends InternalGfshCommand { private static final String NETSTAT_FILE_REQUIRED_EXTENSION = ".txt"; @CliCommand(value = CliStrings.NETSTAT, help = CliStrings.NETSTAT__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PDXRenameCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PDXRenameCommand.java index a60f2c7f08e4..e5024af94583 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PDXRenameCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PDXRenameCommand.java @@ -31,7 +31,7 @@ import org.apache.geode.pdx.internal.EnumInfo; import org.apache.geode.pdx.internal.PdxType; -public class PDXRenameCommand extends GfshCommand { +public class PDXRenameCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.PDX_RENAME, help = CliStrings.PDX_RENAME__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) public Result pdxRename(@CliOption(key = CliStrings.PDX_RENAME_OLD, mandatory = true, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java index e3a28d0f01f9..80e1f8686d24 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class PauseGatewaySenderCommand extends GfshCommand { +public class PauseGatewaySenderCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.PAUSE_GATEWAYSENDER, help = CliStrings.PAUSE_GATEWAYSENDER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java index 1340618e5c53..feb005685b8a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java @@ -38,7 +38,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class PutCommand extends GfshCommand { +public class PutCommand extends InternalGfshCommand { @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION}) @CliCommand(value = {CliStrings.PUT}, help = CliStrings.PUT__HELP) public Result put( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java index c57174d7327c..9d92c45a7a34 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java @@ -50,7 +50,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class QueryCommand extends GfshCommand { +public class QueryCommand extends InternalGfshCommand { private static final Logger logger = LogService.getLogger(); @CliCommand(value = "query", help = CliStrings.QUERY__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java index 7b643ca390b7..4746394a72a5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RebalanceCommand.java @@ -60,7 +60,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class RebalanceCommand extends GfshCommand { +public class RebalanceCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.REBALANCE, help = CliStrings.REBALANCE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION}) @ResourceOperation(resource = ResourcePermission.Resource.DATA, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java index f7b972469b47..a6612d872404 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java @@ -39,7 +39,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class RemoveCommand extends GfshCommand { +public class RemoveCommand extends InternalGfshCommand { public static final String REGION_NOT_FOUND = "Region <%s> not found in any of the members"; @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DATA, CliStrings.TOPIC_GEODE_REGION}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java index 991f77f85fae..3203eab86eca 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ResumeGatewaySenderCommand extends GfshCommand { +public class ResumeGatewaySenderCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.RESUME_GATEWAYSENDER, help = CliStrings.RESUME_GATEWAYSENDER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java index b6785cf5cf08..ebb2a1c1b315 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java @@ -28,7 +28,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class RevokeMissingDiskStoreCommand extends GfshCommand { +public class RevokeMissingDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.REVOKE_MISSING_DISK_STORE, help = CliStrings.REVOKE_MISSING_DISK_STORE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SetVariableCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SetVariableCommand.java index b6dfe01f4752..f26a7c267473 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SetVariableCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SetVariableCommand.java @@ -24,7 +24,7 @@ import org.apache.geode.management.internal.cli.result.ErrorResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class SetVariableCommand extends GfshCommand { +public class SetVariableCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.SET_VARIABLE}, help = CliStrings.SET_VARIABLE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result setVariable( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShCommand.java index 4e0a7080efd7..aece9ddb976e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShCommand.java @@ -31,7 +31,7 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class ShCommand extends GfshCommand { +public class ShCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.SH}, help = CliStrings.SH__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result sh( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java index 7d4a4643f587..74e130d1e1b0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ShowDeadlockCommand extends GfshCommand { +public class ShowDeadlockCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.SHOW_DEADLOCK, help = CliStrings.SHOW_DEADLOCK__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java index b42b3871d104..0cce71c260f9 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java @@ -20,7 +20,6 @@ import org.springframework.shell.core.annotation.CliCommand; import org.springframework.shell.core.annotation.CliOption; -import org.apache.geode.cache.Cache; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.MemberMXBean; import org.apache.geode.management.cli.CliMetaData; @@ -35,7 +34,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ShowLogCommand extends GfshCommand { +public class ShowLogCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.SHOW_LOG, help = CliStrings.SHOW_LOG_HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL}) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java index 1322b75bc12f..272df9c1cdb3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java @@ -52,7 +52,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ShowMetricsCommand extends GfshCommand { +public class ShowMetricsCommand extends InternalGfshCommand { enum Category { cache, cacheserver, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java index 472cb41dd321..9c8918417b8a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java @@ -41,7 +41,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ShowMissingDiskStoreCommand extends GfshCommand { +public class ShowMissingDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.SHOW_MISSING_DISK_STORE, help = CliStrings.SHOW_MISSING_DISK_STORE__HELP) @CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java index 2f874d3426e5..121d615159ed 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShutdownCommand.java @@ -46,7 +46,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class ShutdownCommand extends GfshCommand { +public class ShutdownCommand extends InternalGfshCommand { private static final String DEFAULT_TIME_OUT = "10"; private static final Logger logger = LogService.getLogger(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java index d9ae25a63c72..dc290b391332 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java @@ -24,7 +24,7 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class SleepCommand extends GfshCommand { +public class SleepCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.SLEEP}, help = CliStrings.SLEEP__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result sleep(@CliOption(key = {CliStrings.SLEEP__TIME}, unspecifiedDefaultValue = "3", diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java index 8cbdc73fbfd4..abf6e04123f2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class StartGatewayReceiverCommand extends GfshCommand { +public class StartGatewayReceiverCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.START_GATEWAYRECEIVER, help = CliStrings.START_GATEWAYRECEIVER__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java index e7ab86c3dec2..7dd482f5a9e0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java @@ -45,7 +45,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class StartGatewaySenderCommand extends GfshCommand { +public class StartGatewaySenderCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.START_GATEWAYSENDER, help = CliStrings.START_GATEWAYSENDER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java index 4a827362291f..ecdd5d8f8e0e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java @@ -55,7 +55,7 @@ import org.apache.geode.management.internal.configuration.utils.ClusterConfigurationStatusRetriever; import org.apache.geode.security.AuthenticationFailedException; -public class StartLocatorCommand extends GfshCommand { +public class StartLocatorCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.START_LOCATOR, help = CliStrings.START_LOCATOR__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_LOCATOR, CliStrings.TOPIC_GEODE_LIFECYCLE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java index c2defa5ac1c0..9ace69a8b60d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java @@ -139,7 +139,7 @@ static void addMaxHeap(final List commandLine, final String maxHeap) { } } - static void addCurrentLocators(GfshCommand gfshCommand, final List commandLine, + static void addCurrentLocators(InternalGfshCommand gfshCommand, final List commandLine, final Properties gemfireProperties) throws MalformedObjectNameException { if (StringUtils.isBlank(gemfireProperties.getProperty(LOCATORS))) { String currentLocators = getCurrentLocators(gfshCommand); @@ -150,7 +150,7 @@ static void addCurrentLocators(GfshCommand gfshCommand, final List comma } } - private static String getCurrentLocators(GfshCommand gfshCommand) + private static String getCurrentLocators(InternalGfshCommand gfshCommand) throws MalformedObjectNameException { String delimitedLocators = ""; try { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java index e12ca15dab4d..125d30c08cc1 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java @@ -46,7 +46,7 @@ import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.security.ResourceConstants; -public class StartServerCommand extends GfshCommand { +public class StartServerCommand extends InternalGfshCommand { private static final String SERVER_TERM_NAME = "Server"; @CliCommand(value = CliStrings.START_SERVER, help = CliStrings.START_SERVER__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java index e9940b767368..fa47b6c9cde0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java @@ -37,7 +37,7 @@ import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; -public class StatusClusterConfigServiceCommand extends GfshCommand { +public class StatusClusterConfigServiceCommand extends InternalGfshCommand { private static final FetchSharedConfigurationStatusFunction fetchSharedConfigStatusFunction = new FetchSharedConfigurationStatusFunction(); diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java index c4fa0e2b55fa..892b1212155c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java @@ -36,7 +36,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class StatusGatewayReceiverCommand extends GfshCommand { +public class StatusGatewayReceiverCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.STATUS_GATEWAYRECEIVER, help = CliStrings.STATUS_GATEWAYRECEIVER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java index 38546444985b..650bbe636885 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java @@ -36,7 +36,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class StatusGatewaySenderCommand extends GfshCommand { +public class StatusGatewaySenderCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.STATUS_GATEWAYSENDER, help = CliStrings.STATUS_GATEWAYSENDER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java index ee63419fb9bd..7fb20aa4b10e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java @@ -35,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class StopGatewayReceiverCommand extends GfshCommand { +public class StopGatewayReceiverCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.STOP_GATEWAYRECEIVER, help = CliStrings.STOP_GATEWAYRECEIVER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java index 3652391a3885..f340e4ef5a8a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java @@ -25,7 +25,6 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.GatewaySenderMXBean; -import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -36,7 +35,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class StopGatewaySenderCommand extends GfshCommand { +public class StopGatewaySenderCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.STOP_GATEWAYSENDER, help = CliStrings.STOP_GATEWAYSENDER__HELP) @CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java index 929645ed25af..f2cb729a21bd 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java @@ -24,6 +24,7 @@ import org.apache.geode.SystemFailure; import org.apache.geode.cache.execute.ResultCollector; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; @@ -36,7 +37,7 @@ import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; -public class UndeployCommand extends GfshCommand { +public class UndeployCommand extends InternalGfshCommand { private final UndeployFunction undeployFunction = new UndeployFunction(); /** @@ -99,7 +100,8 @@ public Result undeploy( Result result = ResultBuilder.buildResult(tabularData); if (tabularData.getStatus().equals(Result.Status.OK)) { persistClusterConfiguration(result, - () -> getConfigurationService().removeJars(jars, groups)); + () -> ((InternalClusterConfigurationService) getConfigurationService()).removeJars(jars, + groups)); } return result; } catch (VirtualMachineError e) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java index 49fea60d5389..3579dcc73fd4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java @@ -38,7 +38,7 @@ import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.util.DiskStoreUpgrader; -public class UpgradeOfflineDiskStoreCommand extends GfshCommand { +public class UpgradeOfflineDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.UPGRADE_OFFLINE_DISK_STORE, help = CliStrings.UPGRADE_OFFLINE_DISK_STORE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java index 446e43e5a1d1..c7b2044f3ad3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java @@ -34,7 +34,7 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.util.DiskStoreValidater; -public class ValidateDiskStoreCommand extends GfshCommand { +public class ValidateDiskStoreCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.VALIDATE_DISK_STORE, help = CliStrings.VALIDATE_DISK_STORE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_DISKSTORE}) public Result validateDiskStore( diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java index aa6eb7f1b7c2..9b82e970bffa 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java @@ -24,7 +24,7 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class VersionCommand extends GfshCommand { +public class VersionCommand extends InternalGfshCommand { @CliCommand(value = {CliStrings.VERSION}, help = CliStrings.VERSION__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result version(@CliOption(key = {CliStrings.VERSION__FULL}, specifiedDefaultValue = "true", diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java index 9ffeb6a9e04b..bc7b23cdddc3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java @@ -34,7 +34,7 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.GfshParser; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.converters.ConnectionEndpointConverter; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; @@ -42,7 +42,7 @@ import org.apache.geode.management.internal.cli.util.ConnectionEndpoint; import org.apache.geode.management.internal.cli.util.JdkTool; -public class StartJConsoleCommand extends GfshCommand { +public class StartJConsoleCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.START_JCONSOLE, help = CliStrings.START_JCONSOLE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_MANAGER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java index f6bc448f1e41..8bc523f4cae3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java @@ -29,13 +29,13 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.GfshParser; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.InfoResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.util.JdkTool; -public class StartJVisualVMCommand extends GfshCommand { +public class StartJVisualVMCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.START_JVISUALVM, help = CliStrings.START_JVISUALVM__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_MANAGER, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_M_AND_M}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartPulseCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartPulseCommand.java index 40155b331084..6b499da09169 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartPulseCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartPulseCommand.java @@ -30,12 +30,12 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.ManagementConstants; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.OperationInvoker; -public class StartPulseCommand extends GfshCommand { +public class StartPulseCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.START_PULSE, help = CliStrings.START_PULSE__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_MANAGER, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java index 53eb4a693008..e53182176343 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartVsdCommand.java @@ -36,12 +36,12 @@ import org.apache.geode.internal.util.IOUtils; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.InfoResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class StartVsdCommand extends GfshCommand { +public class StartVsdCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.START_VSD, help = CliStrings.START_VSD__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_M_AND_M, CliStrings.TOPIC_GEODE_STATISTICS}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java index bd7b69be5a84..cd7c6ac86bb3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java @@ -29,13 +29,13 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.InfoResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.configuration.utils.ClusterConfigurationStatusRetriever; -public class StatusLocatorCommand extends GfshCommand { +public class StatusLocatorCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.STATUS_LOCATOR, help = CliStrings.STATUS_LOCATOR__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_LOCATOR, CliStrings.TOPIC_GEODE_LIFECYCLE}) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java index 7d81df38860d..cd4e6dc6cad9 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java @@ -28,11 +28,11 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -public class StatusServerCommand extends GfshCommand { +public class StatusServerCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.STATUS_SERVER, help = CliStrings.STATUS_SERVER__HELP) @CliMetaData(shellOnly = true, diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java index 8cfee3c67aa5..cef82934a07a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java @@ -30,12 +30,12 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class StopLocatorCommand extends GfshCommand { +public class StopLocatorCommand extends InternalGfshCommand { private static final long WAITING_FOR_STOP_TO_MAKE_PID_GO_AWAY_TIMEOUT_MILLIS = 30 * 1000; @CliCommand(value = CliStrings.STOP_LOCATOR, help = CliStrings.STOP_LOCATOR__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java index 6b2da1258ed0..ee1fd7759b8c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java @@ -29,12 +29,12 @@ import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.Gfsh; -public class StopServerCommand extends GfshCommand { +public class StopServerCommand extends InternalGfshCommand { private static final long WAITING_FOR_STOP_TO_MAKE_PID_GO_AWAY_TIMEOUT_MILLIS = 30 * 1000; @CliCommand(value = CliStrings.STOP_SERVER, help = CliStrings.STOP_SERVER__HELP) diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java index 0059458aea6a..2ff6bd2c94f5 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AlterDiskStoreJUnitTest.java @@ -22,6 +22,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; +import org.apache.geode.management.cli.GfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.junit.categories.UnitTest; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java index f94a94f7274c..83d183e9b422 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CommandAvailabilityIndicatorTest.java @@ -26,6 +26,7 @@ import org.springframework.shell.core.annotation.CliCommand; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.GfshCommand; import org.apache.geode.management.internal.cli.CommandManager; import org.apache.geode.test.junit.categories.UnitTest; @@ -44,7 +45,6 @@ public void allOnlineCommandsHaveAvailabilityIndicator() throws Exception { continue; } - GfshCommand gfshCommand = (GfshCommand) commandMarker; for (Method method : commandMarker.getClass().getMethods()) { CliCommand cliCommand = method.getAnnotation(CliCommand.class); CliMetaData cliMetaData = method.getAnnotation(CliMetaData.class); diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandIntegrationTest.java similarity index 81% rename from geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandJUnitTest.java rename to geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandIntegrationTest.java index 7db73af5c9f5..78ff417833f4 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommandIntegrationTest.java @@ -26,21 +26,8 @@ import org.apache.geode.test.junit.rules.GfshCommandRule.PortType; import org.apache.geode.test.junit.rules.LocatorStarterRule; -/** - * The GfshCommandJUnitTest class is a test suite of test cases testing the contract and - * functionality of the GfshCommand class for implementing GemFire shell (Gfsh) commands. - * - * @see org.apache.geode.management.internal.cli.commands.GfshCommand - * @see org.jmock.Expectations - * @see org.jmock.Mockery - * @see org.jmock.lib.legacy.ClassImposteriser - * @see org.junit.Assert - * @see org.junit.Test - * @since GemFire 7.0 - */ - @Category(IntegrationTest.class) -public class DescribeConnectionCommandJUnitTest { +public class DescribeConnectionCommandIntegrationTest { public static Logger logger = LogService.getLogger(); @ClassRule diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java index 619414777ae6..55288e9f0f6a 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java @@ -37,13 +37,13 @@ @Category(UnitTest.class) public class GfshCommandJUnitTest { - private GfshCommand command; + private InternalGfshCommand command; private Gfsh gfsh; private InternalClusterConfigurationService clusterConfigurationService; @Before public void before() throws Exception { - command = spy(GfshCommand.class); + command = spy(InternalGfshCommand.class); gfsh = mock(Gfsh.class); clusterConfigurationService = mock(InternalClusterConfigurationService.class); } diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java index 56cecbb1f112..5d8a4f050dd1 100755 --- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java +++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java @@ -39,13 +39,14 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneSearchIndexFunction; import org.apache.geode.cache.lucene.internal.security.LucenePermission; import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalClusterConfigurationService; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.execute.AbstractExecution; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.CliUtil; -import org.apache.geode.management.internal.cli.commands.GfshCommand; +import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.exceptions.UserErrorException; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; @@ -62,12 +63,12 @@ * The LuceneIndexCommands class encapsulates all Geode shell (Gfsh) commands related to Lucene * indexes defined in Geode. * - * @see GfshCommand + * @see InternalGfshCommand * @see LuceneIndexDetails * @see LuceneListIndexFunction */ @SuppressWarnings("unused") -public class LuceneIndexCommands extends GfshCommand { +public class LuceneIndexCommands extends InternalGfshCommand { private static final LuceneCreateIndexFunction createIndexFunction = new LuceneCreateIndexFunction(); private static final LuceneDescribeIndexFunction describeIndexFunction = @@ -199,7 +200,8 @@ public Result createIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, result = ResultBuilder.buildResult(tabularResult); if (xmlEntity != null) { persistClusterConfiguration(result, () -> { - getConfigurationService().addXmlEntity(xmlEntity, null); + ((InternalClusterConfigurationService) getConfigurationService()).addXmlEntity(xmlEntity, + null); }); } return result; @@ -292,7 +294,8 @@ public Result destroyIndex(@CliOption(key = LuceneCliStrings.LUCENE__INDEX_NAME, if (xmlEntity != null) { persistClusterConfiguration(result, () -> { // Delete the xml entity to remove the index(es) in all groups - getConfigurationService().deleteXmlEntity(xmlEntity, null); + ((InternalClusterConfigurationService) getConfigurationService()).deleteXmlEntity(xmlEntity, + null); }); } From 636792506ae6bcf869ebfee9f43ec048f426baad Mon Sep 17 00:00:00 2001 From: Jacob Barrett Date: Fri, 23 Mar 2018 10:29:36 -0700 Subject: [PATCH 15/15] GEODE-4924: Fixes JAVA_ARGS environemnt parameter. (#1673) - Fixes formatting - Removes extra @ (echo suppression) --- geode-assembly/src/main/dist/bin/gfsh.bat | 51 +++++++++++------------ 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat index b55ffd730ff8..6708524221ca 100755 --- a/geode-assembly/src/main/dist/bin/gfsh.bat +++ b/geode-assembly/src/main/dist/bin/gfsh.bat @@ -25,54 +25,51 @@ REM GEODE_HOME - Geode product Directory REM REM -@setlocal enableextensions -@set scriptdir=%~dp0 -@set gf=%scriptdir:\bin\=% +setlocal enableextensions +set scriptdir=%~dp0 +set gf=%scriptdir:\bin\=% REM echo %gf% REM echo %scriptdir% -@if exist "%gf%\lib\geode-dependencies.jar" @goto gfok -@echo Could not determine GEODE_HOME location -@verify other 2>nul -@goto done +if exist "%gf%\lib\geode-dependencies.jar" goto gfok +echo Could not determine GEODE_HOME location +verify other 2>nul +goto done :gfok -@set GEODE_HOME=%gf% +set GEODE_HOME=%gf% -@set GFSH_JARS=%GEODE_HOME%\lib\gfsh-dependencies.jar +set GFSH_JARS=%GEODE_HOME%\lib\gfsh-dependencies.jar REM if a system level classpath is set, append it to the classes gfsh will need -@if defined CLASSPATH ( - @set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH% +if defined CLASSPATH ( + set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH% ) else ( - @set DEPENDENCIES=%GFSH_JARS% + set DEPENDENCIES=%GFSH_JARS% ) -@if not defined GF_JAVA ( +if not defined GF_JAVA ( REM %GF_JAVA% is not defined, assume it is on the PATH - @if defined JAVA_HOME ( - @set GF_JAVA=%JAVA_HOME%\bin\java.exe -) else ( - @set GF_JAVA=java - ) + if defined JAVA_HOME ( + set GF_JAVA=%JAVA_HOME%\bin\java.exe + ) else ( + set GF_JAVA=java + ) ) REM REM Copy default .gfshrc to the home directory. Uncomment if needed. REM -REM @if not exist "%USERPROFILE%\.gemfire\.gfsh2rc" ( -REM @xcopy /q "%GEODE_HOME%\defaultConfigs\.gfsh2rc" "%USERPROFILE%\.gemfire" +REM if not exist "%USERPROFILE%\.gemfire\.gfsh2rc" ( +REM xcopy /q "%GEODE_HOME%\defaultConfigs\.gfsh2rc" "%USERPROFILE%\.gemfire" REM ) REM REM Make dir if .gemfire does not exist. Uncomment if needed. REM -REM @if not exist "%USERPROFILE%\.gemfire" ( -REM @mkdir "%USERPROFILE%\.gemfire" +REM if not exist "%USERPROFILE%\.gemfire" ( +REM mkdir "%USERPROFILE%\.gemfire" REM ) -@set LAUNCHER=org.apache.geode.management.internal.cli.Launcher -@if defined JAVA_ARGS ( - @set JAVA_ARGS="%JAVA_ARGS%" -) +set LAUNCHER=org.apache.geode.management.internal.cli.Launcher REM Call java with our classpath -@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %* +"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %* :done