You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2018/04/16 21:02:23 UTC
[geode] branch feature/GEODE-4647 updated (059cb70 -> 613aae4)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-4647
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit 059cb70 GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue
add 634cd85 GEODE-4858: pulling JaxbService out of InternalClusterConfigurationSe… (#1754)
add a9c4a0a GEODE-4909: Additional lucene reindex tests with security
add 8ca39e9 GEODE-3237: Loading cluster configuration from a dir that does not ha… (#1746)
add bdbc0e3 GEODE-4919: Update the PRConfig (#1666)
add c62846d GEODE-5039: Change AbstractRegion to correctly construct EvictionAttributesMutator (#1766)
add 51660e6 GEODE-4385 Add documentation of gfsh list jndi-binding command (#1772)
add 2203273 GEODE-5046: Handle RegionDestroyedException in RemotePutMessage to re… (#1773)
add 65b52f2 GEODE-4957: fix race in concurrent create on region (#1750)
add cd74f9f GEODE-5056: set testParallelPropagationSenderStartAfterStop_Scenario2 to be flaky
add 3f503ce GEODE-4874: Inconsistency in gfsh help for create jndi-binding (doc update)
add b71b79f GEODE-3926: handle new lucene indexing exception
add 3468fb5 GEODE-4962: Fix typo and output format from 'list gateways' gfsh command (#1778)
add 34fdc32 GEODE-4874: Inconsistency in gfsh help for create jndi-binding (#1777)
add cfcae6b Updated version to 1.7
add 46ee1c8 GEODE-5065: Add awaitability to testServerUpFirstClientLater (#1792)
add 3b930b4 GEODE-4952: Remove usused imports from non-geode-core files. (#1724)
add a442283 GEODE-4952: Remove unused imports from geode-core:internal. (#1725)
add 5307968 GEODE-4952: Remove unused imports from geode-core, excluding geode-core:internal. (#1726)
add b94bf44 GEODE-4952: Remove unused imports from test files. (#1723)
add e6c7126 GEODE-5051: Improve gfsh destroy jndi-binding help prose (#1775)
add 757e8f9 GEODE-5044: Correctly log stack trace on the protobuf server
add 865a7c7 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core tests (#1782)
add e27691f GEODE-4952: Spotless will now remove unused imports. (#1727)
add d4a3689 GEODE-4990: Cluster Config StartUp Race Condition (#1730)
add f7bb77c GEODE-5056: when found the dropped events at primary sender, send (#1794)
add f984c95 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:internal.cache
add 130ed6e GEODE-5035: Explicitly pass java.io.tmpdir to JVMs invoked by Gradle. (#1779)
add 6097e3d GEODE-5064: Removed unused code in LocalRegion (#1790)
add ad45baa GEODE-4856: Public API for retrieving/persisting Cluster Configuration (#1791)
add 2ecb372 GEODE-4863: refactor jdbc commands to use this public cluster configuration api (#1776)
add f280247 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core:internal (#1784)
add ca98d86 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: non geode-core modules (#1787)
add 83c667b GEODE-3926: Catching exception from lucene query computing thread (#1774)
add ac7db5b GEODE-4384 Add docs for gfsh destroy jndi-binding command (#1780)
add 5707de5 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: non geode-core module tests (#1788)
add 5057348 GEODE-4954, GEODE-4955: Remove trivial javadoc stubs and empty blocks: geode-core (#1786)
add 1a2a438 GEODE_3926: applying spotless due to spotless changes occuring after PR
add 82092e8 GEODE-5068: bump Jackson version. (#1796)
add 4bc6c5a GEODE-4863: refactor jdbc commands to use this public cluster configuration api (#1802)
add b52492c GEODE-5069: Reduce direct exposure of GfJsonObject from CommandResult (#1795)
add 4e249f7 GEODE-5057: Removed experimental tag from Jdbc connector code base (#1789)
new 613aae4 GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary gateway sender queue
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (059cb70)
\
N -- N -- N refs/heads/feature/GEODE-4647 (613aae4)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../internal/common/ClientServerSessionCache.java | 2 -
.../internal/common/PeerToPeerSessionCache.java | 3 -
.../internal/filter/GemfireHttpSession.java | 1 -
.../internal/filter/GemfireSessionManager.java | 3 -
.../attributes/AbstractSessionAttributes.java | 2 -
.../filter/attributes/SessionAttributes.java | 1 -
.../session/internal/filter/util/TypeAwareMap.java | 3 -
.../session/filter/SessionCachingFilter.java | 2 -
.../modules/session/filter/SessionListener.java | 1 -
.../geode/modules/session/installer/Installer.java | 3 -
.../modules/session/installer/args/Argument.java | 1 -
.../session/internal/filter/AbstractListener.java | 2 -
.../session/internal/filter/BasicServlet.java | 3 -
.../session/internal/filter/CommonTests.java | 1 -
.../filter/HttpSessionAttributeListenerImpl.java | 3 -
.../session/internal/filter/RendezvousManager.java | 3 -
.../ServletRequestAttributeListenerImpl.java | 2 -
.../geode/modules/session/EmbeddedTomcat8.java | 6 -
.../modules/session/TestSessionsTomcat8Base.java | 2 -
.../Tomcat8SessionsClientServerDUnitTest.java | 4 -
.../modules/session/Tomcat8SessionsDUnitTest.java | 3 -
.../gatewaydelta/GatewayDeltaCreateEvent.java | 2 -
.../gatewaydelta/GatewayDeltaDestroyEvent.java | 2 -
.../session/catalina/DeltaSessionInterface.java | 1 -
.../internal/DeltaSessionAttributeEventBatch.java | 1 -
.../DeltaSessionDestroyAttributeEvent.java | 3 -
.../internal/DeltaSessionUpdateAttributeEvent.java | 1 -
.../java/org/apache/geode/modules/util/Banner.java | 3 -
.../apache/geode/modules/util/ContextMapper.java | 1 -
.../geode/modules/session/CommandServlet.java | 7 -
.../geode/modules/session/EmbeddedTomcat.java | 3 -
.../modules/session/Tomcat6SessionsJUnitTest.java | 1 -
.../util/ClassLoaderObjectInputStreamTest.java | 1 -
.../geode/modules/session/CommandServlet.java | 7 -
.../session/functions/GetMaxInactiveInterval.java | 1 -
geode-assembly/src/main/dist/NOTICE | 2 +-
.../cli/commands/DestroyIndexIfExistsTest.java | 5 -
.../LauncherLifecycleCommandsDUnitTest.java | 1 -
.../shell/StatusLocatorExitCodeAcceptanceTest.java | 6 -
.../shell/StatusServerExitCodeAcceptanceTest.java | 5 -
.../geode/rest/internal/web/controllers/Item.java | 1 -
.../geode/rest/internal/web/controllers/Order.java | 1 -
.../rest/internal/web/controllers/Person.java | 1 -
.../apache/geode/session/tests/CargoTestBase.java | 1 -
.../tests/GenericAppServerClientServerTest.java | 2 -
.../tests/Jetty9CachingClientServerTest.java | 3 -
.../geode/session/tests/ServerContainer.java | 1 -
.../session/tests/Tomcat7ClientServerTest.java | 1 -
geode-book/config.yml | 6 +-
.../source/subnavs/geode-subnav.erb | 6 +
.../test/concurrency/ConcurrentTestRunner.java | 3 -
geode-connectors/build.gradle | 3 +-
.../geode/connectors/jdbc/JdbcAsyncWriter.java | 6 +-
.../connectors/jdbc/JdbcConnectorException.java | 8 +-
.../apache/geode/connectors/jdbc/JdbcLoader.java | 3 +-
.../apache/geode/connectors/jdbc/JdbcWriter.java | 3 +-
.../jdbc/internal/AbstractJdbcCallback.java | 3 +-
.../jdbc/internal/ConnectionConfigBuilder.java | 82 --
.../internal/ConnectionConfigExistsException.java | 3 -
.../ConnectionConfigNotFoundException.java | 3 -
.../jdbc/internal/ConnectionConfiguration.java | 110 ---
.../jdbc/internal/DataSourceManager.java | 4 +-
.../jdbc/internal/HikariJdbcDataSource.java | 4 +-
.../jdbc/internal/HikariJdbcDataSourceFactory.java | 4 +-
.../jdbc/internal/JdbcConnectorService.java | 26 +-
.../jdbc/internal/JdbcConnectorServiceImpl.java | 77 +-
.../jdbc/internal/JdbcDataSourceFactory.java | 4 +-
.../connectors/jdbc/internal/RegionMapping.java | 291 -------
.../jdbc/internal/RegionMappingBuilder.java | 99 ---
.../internal/RegionMappingExistsException.java | 3 -
.../internal/RegionMappingNotFoundException.java | 3 -
.../geode/connectors/jdbc/internal/SqlHandler.java | 27 +-
.../jdbc/internal/SqlToPdxInstanceCreator.java | 8 +-
.../jdbc/internal/cli/AlterConnectionCommand.java | 118 ++-
.../jdbc/internal/cli/AlterConnectionFunction.java | 40 +-
.../jdbc/internal/cli/AlterMappingCommand.java | 120 ++-
.../jdbc/internal/cli/AlterMappingFunction.java | 50 +-
.../jdbc/internal/cli/CreateConnectionCommand.java | 92 +--
.../internal/cli/CreateConnectionFunction.java | 13 +-
.../jdbc/internal/cli/CreateMappingCommand.java | 91 +--
.../jdbc/internal/cli/CreateMappingFunction.java | 27 +-
.../internal/cli/DescribeConnectionCommand.java | 62 +-
.../internal/cli/DescribeConnectionFunction.java | 34 -
.../jdbc/internal/cli/DescribeMappingCommand.java | 62 +-
.../jdbc/internal/cli/DescribeMappingFunction.java | 33 -
.../internal/cli/DestroyConnectionCommand.java | 82 +-
.../internal/cli/DestroyConnectionFunction.java | 7 +-
.../jdbc/internal/cli/DestroyMappingCommand.java | 73 +-
.../jdbc/internal/cli/DestroyMappingFunction.java | 7 +-
.../jdbc/internal/cli/ExceptionHandler.java | 2 -
.../cli/FunctionContextArgumentProvider.java | 11 +-
.../jdbc/internal/cli/JdbcCliFunction.java | 7 +-
.../jdbc/internal/cli/ListConnectionCommand.java | 60 +-
.../jdbc/internal/cli/ListConnectionFunction.java | 45 --
.../jdbc/internal/cli/ListMappingCommand.java | 59 +-
.../jdbc/internal/cli/ListMappingFunction.java | 44 --
.../internal/configuration/ConnectorService.java | 850 +++++++++++++++++++++
.../jdbc/internal/configuration/package-info.java | 24 +
.../connectors/jdbc/internal/xml/ElementType.java | 50 +-
.../xml/JdbcConnectorServiceXmlGenerator.java | 165 ----
.../internal/xml/JdbcServiceConfiguration.java | 18 +-
.../ConnectorsDistributedSystemService.java | 2 -
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 5 -
.../sanctioned-geode-connectors-serializables.txt | 10 +-
.../AnalyzeConnectorsSerializablesJUnitTest.java | 1 -
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 11 +-
.../jdbc/JdbcConnectorExceptionTest.java | 2 +-
.../jdbc/internal/ConnectionConfigBuilderTest.java | 92 ---
.../jdbc/internal/ConnectionConfigurationTest.java | 96 ---
.../jdbc/internal/DataSourceManagerUnitTest.java | 11 +-
.../jdbc/internal/JdbcConnectorServiceTest.java | 24 +-
.../jdbc/internal/RegionMappingBuilderTest.java | 121 ---
.../jdbc/internal/RegionMappingTest.java | 237 +++---
.../connectors/jdbc/internal/SqlHandlerTest.java | 13 +-
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 5 +-
.../jdbc/internal/TestConfigService.java | 15 +-
.../cli/AlterConnectionCommandDUnitTest.java | 19 +-
.../cli/AlterConnectionCommandIntegrationTest.java | 4 +-
.../internal/cli/AlterConnectionCommandTest.java | 147 ++++
.../internal/cli/AlterConnectionFunctionTest.java | 106 ++-
.../internal/cli/AlterMappingCommandDUnitTest.java | 19 +-
.../cli/AlterMappingCommandIntegrationTest.java | 8 +-
.../jdbc/internal/cli/AlterMappingCommandTest.java | 154 ++++
.../internal/cli/AlterMappingFunctionTest.java | 151 ++--
.../cli/CreateConnectionCommandDUnitTest.java | 4 +-
.../CreateConnectionCommandIntegrationTest.java | 22 +-
.../internal/cli/CreateConnectionFunctionTest.java | 10 +-
.../cli/CreateMappingCommandDUnitTest.java | 24 +-
.../cli/CreateMappingCommandIntegrationTest.java | 25 +-
.../internal/cli/CreateMappingFunctionTest.java | 9 +-
.../cli/DescribeConnectionCommandDUnitTest.java | 44 +-
.../DescribeConnectionCommandIntegrationTest.java | 150 ----
.../cli/DescribeConnectionCommandTest.java | 92 +++
.../cli/DescribeConnectionFunctionTest.java | 138 ----
.../cli/DescribeMappingCommandDUnitTest.java | 44 +-
.../cli/DescribeMappingCommandIntegrationTest.java | 145 ----
.../internal/cli/DescribeMappingCommandTest.java | 98 +++
.../internal/cli/DescribeMappingFunctionTest.java | 138 ----
.../cli/DestroyConnectionCommandDUnitTest.java | 32 +-
.../DestroyConnectionCommandIntegrationTest.java | 9 +-
.../cli/DestroyConnectionFunctionTest.java | 7 +-
.../cli/DestroyMappingCommandDunitTest.java | 35 +-
.../cli/DestroyMappingCommandFunctionTest.java | 7 +-
.../cli/DestroyMappingCommandIntegrationTest.java | 7 +-
.../cli/JDBCConnectorFunctionsSecurityTest.java | 4 -
.../jdbc/internal/cli/JdbcCliFunctionTest.java | 1 -
.../cli/JdbcClusterConfigDistributedTest.java | 4 +-
.../cli/ListConnectionCommandDUnitTest.java | 49 +-
.../cli/ListConnectionCommandIntegrationTest.java | 110 ---
.../internal/cli/ListConnectionCommandTest.java | 92 +++
.../internal/cli/ListConnectionFunctionTest.java | 167 ----
.../internal/cli/ListMappingCommandDUnitTest.java | 55 +-
.../cli/ListMappingCommandIntegrationTest.java | 110 ---
.../jdbc/internal/cli/ListMappingCommandTest.java | 93 +++
.../jdbc/internal/cli/ListMappingFunctionTest.java | 166 ----
.../configuration/ConnectorServiceTest.java | 102 +++
.../jdbc/internal/xml/ElementTypeTest.java | 40 +-
...onnectorServiceXmlGeneratorIntegrationTest.java | 334 --------
.../xml/JdbcConnectorServiceXmlGeneratorTest.java | 34 -
.../JdbcConnectorServiceXmlIntegrationTest.java | 127 ---
.../internal/xml/JdbcServiceConfigurationTest.java | 68 +-
.../geode/internal/ra/GFConnectionFactoryImpl.java | 4 -
.../apache/geode/internal/ra/GFConnectionImpl.java | 4 -
.../ra/spi/JCAManagedConnectionFactory.java | 4 -
.../ra/spi/JCAManagedConnectionMetaData.java | 4 -
.../java/org/apache/geode/CancelException.java | 3 -
.../main/java/org/apache/geode/DataSerializer.java | 1 -
.../src/main/java/org/apache/geode/Delta.java | 3 -
.../apache/geode/DeltaSerializationException.java | 13 -
.../java/org/apache/geode/GemFireRethrowable.java | 1 -
.../org/apache/geode/InternalGemFireError.java | 16 -
.../src/main/java/org/apache/geode/LogWriter.java | 1 -
.../org/apache/geode/SerializationException.java | 1 -
.../main/java/org/apache/geode/SystemFailure.java | 1 -
.../apache/geode/admin/AdminDistributedSystem.java | 2 -
.../admin/internal/AdminDistributedSystemImpl.java | 3 -
.../internal/AdminDistributedSystemJmxImpl.java | 1 -
.../apache/geode/admin/jmx/internal/AgentImpl.java | 1 -
.../internal/ConfigurationParameterJmxImpl.java | 1 -
.../jmx/internal/MemberInfoWithStatsMBean.java | 7 -
.../admin/jmx/internal/StatAlertsAggregator.java | 2 -
.../jmx/internal/StatisticResourceJmxImpl.java | 1 -
.../jmx/internal/SystemMemberCacheJmxImpl.java | 1 -
.../apache/geode/cache/CacheClosedException.java | 2 -
.../org/apache/geode/cache/LowMemoryException.java | 1 -
.../client/internal/ClientSideHandshakeImpl.java | 3 -
.../geode/cache/client/internal/ProxyCache.java | 2 -
.../geode/cache/client/internal/ProxyRegion.java | 1 -
.../geode/cache/client/internal/ServerProxy.java | 1 -
.../internal/locator/GetAllServersResponse.java | 3 -
.../internal/locator/LocatorListResponse.java | 1 -
.../geode/cache/configuration/CacheConfig.java | 6 +
.../geode/cache/configuration/package-info.java | 25 +
.../execute/EmptyRegionFunctionException.java | 1 -
.../org/apache/geode/cache/execute/Function.java | 1 -
.../ConflictingPersistentDataException.java | 1 -
.../cache/query/MultiIndexCreationException.java | 1 -
.../org/apache/geode/cache/query/internal/Bag.java | 4 -
.../cache/query/internal/CompiledArithmetic.java | 1 -
.../geode/cache/query/internal/CompiledSelect.java | 1 -
.../query/internal/CompiledSortCriterion.java | 1 -
.../internal/CumulativeNonDistinctResults.java | 2 -
.../cache/query/internal/LinkedResultSet.java | 2 -
.../cache/query/internal/ProxyQueryService.java | 1 -
.../internal/QueryExecutionCanceledException.java | 1 -
.../cache/query/internal/cq/CqAttributesImpl.java | 1 -
.../query/internal/index/IndexCreationData.java | 1 -
.../query/internal/index/MemoryIndexStore.java | 1 -
.../query/internal/index/PartitionedIndex.java | 1 -
.../query/internal/parse/ASTArithmeticOp.java | 1 -
.../cache/query/internal/parse/ASTSelect.java | 1 -
.../query/internal/types/CollectionTypeImpl.java | 1 -
.../cache/query/internal/types/ObjectTypeImpl.java | 1 -
.../org/apache/geode/compression/Compressor.java | 2 -
.../distributed/ClusterConfigurationService.java | 49 +-
.../geode/distributed/DistributedSystem.java | 1 -
.../internal/AtomicLongWithTerminalState.java | 2 -
.../internal/ClusterDistributionManager.java | 3 -
.../internal/ConfigAttributeChecker.java | 2 -
.../apache/geode/distributed/internal/DMStats.java | 1 -
.../distributed/internal/DirectReplyProcessor.java | 6 -
.../distributed/internal/DistributionAdvisor.java | 4 -
.../distributed/internal/DistributionConfig.java | 1 -
.../internal/DistributionConfigImpl.java | 2 -
.../distributed/internal/DistributionManager.java | 1 -
.../internal/HighPriorityDistributionMessage.java | 3 -
.../InternalClusterConfigurationService.java | 109 +--
.../internal/InternalDistributedSystem.java | 2 -
.../distributed/internal/InternalLocator.java | 2 +-
.../internal/ReliableReplyException.java | 3 -
.../internal/ReliableReplyProcessor21.java | 4 -
.../geode/distributed/internal/ReplyMessage.java | 4 -
.../geode/distributed/internal/ServerLocator.java | 6 -
.../geode/distributed/internal/StartupMessage.java | 1 -
.../distributed/internal/StartupMessageData.java | 4 -
.../ThrottlingMemLinkedQueueWithDMStats.java | 1 -
.../internal/WaitForViewInstallation.java | 6 -
.../internal/deadlock/DependencyGraph.java | 2 -
.../internal/deadlock/UnsafeThreadLocal.java | 1 -
.../distributed/internal/direct/DirectChannel.java | 8 -
.../distributed/internal/locks/DLockGrantor.java | 1 -
.../membership/InternalDistributedMember.java | 1 -
.../internal/membership/MembershipManager.java | 1 -
.../internal/membership/MembershipTestHook.java | 3 -
.../distributed/internal/membership/NetMember.java | 1 -
.../internal/membership/gms/GMSUtil.java | 2 -
.../internal/membership/gms/NetLocator.java | 1 -
.../internal/membership/gms/ServiceConfig.java | 1 -
.../membership/gms/interfaces/HealthMonitor.java | 4 -
.../membership/gms/interfaces/Manager.java | 4 -
.../membership/gms/interfaces/Messenger.java | 4 -
.../membership/gms/membership/GMSJoinLeave.java | 7 -
.../membership/gms/membership/HostAddress.java | 1 -
.../membership/gms/messenger/AddressManager.java | 1 -
.../membership/gms/messenger/GMSEncrypt.java | 1 -
.../internal/streaming/StreamingOperation.java | 3 -
.../distributed/internal/tcpserver/TcpClient.java | 6 -
.../distributed/internal/tcpserver/TcpHandler.java | 2 -
.../java/org/apache/geode/i18n/LogWriterI18n.java | 1 -
.../org/apache/geode/internal/AvailablePort.java | 1 -
.../apache/geode/internal/ByteArrayDataInput.java | 6 +-
.../apache/geode/internal/CopyOnWriteHashSet.java | 1 -
.../geode/internal/HeapDataOutputStream.java | 2 -
.../org/apache/geode/internal/HistogramStats.java | 2 -
.../geode/internal/InternalInstantiator.java | 4 -
.../java/org/apache/geode/internal/ObjIdMap.java | 1 -
.../ScheduledThreadPoolExecutorWithKeepAlive.java | 4 -
.../java/org/apache/geode/internal/Sendable.java | 1 -
.../org/apache/geode/internal/SystemAdmin.java | 1 -
.../java/org/apache/geode/internal/Version.java | 1 -
.../apache/geode/internal/admin/ListenerIdMap.java | 1 -
.../geode/internal/admin/StatAlertsManager.java | 1 -
.../admin/remote/AddStatListenerRequest.java | 1 -
.../geode/internal/admin/remote/AdminRegion.java | 1 -
.../geode/internal/admin/remote/AdminWaiters.java | 3 -
.../internal/admin/remote/CacheInfoRequest.java | 1 -
.../internal/admin/remote/ClientHealthStats.java | 1 -
.../internal/admin/remote/CompactResponse.java | 3 -
.../admin/remote/DistributionLocatorId.java | 1 -
.../admin/remote/DurableClientInfoRequest.java | 1 -
.../admin/remote/FetchDistLockInfoRequest.java | 1 -
.../internal/admin/remote/LicenseInfoRequest.java | 1 -
.../admin/remote/ObjectDetailsRequest.java | 1 -
.../internal/admin/remote/ObjectNamesRequest.java | 1 -
.../admin/remote/RegionAttributesRequest.java | 1 -
.../geode/internal/admin/remote/RegionRequest.java | 1 -
.../internal/admin/remote/RegionSizeRequest.java | 1 -
.../admin/remote/RemoteTransportConfig.java | 1 -
.../admin/remote/ResetHealthStatusRequest.java | 1 -
.../admin/remote/RevokePersistentIDResponse.java | 3 -
.../internal/admin/remote/ShutdownAllResponse.java | 3 -
.../internal/admin/remote/StatListenerMessage.java | 1 -
.../internal/admin/remote/SubRegionRequest.java | 1 -
.../internal/admin/remote/VersionInfoRequest.java | 1 -
.../admin/statalerts/BaseDecoratorImpl.java | 3 -
.../admin/statalerts/DummyStatisticInfoImpl.java | 4 -
.../statalerts/GaugeThresholdDecoratorImpl.java | 3 -
.../admin/statalerts/MultiAttrDefinitionImpl.java | 3 -
.../admin/statalerts/SingleAttrDefinitionImpl.java | 3 -
.../admin/statalerts/StatisticInfoImpl.java | 4 -
.../internal/cache/AbstractBucketRegionQueue.java | 7 -
.../geode/internal/cache/AbstractDiskRegion.java | 2 -
.../geode/internal/cache/AbstractRegion.java | 212 +++--
.../geode/internal/cache/AbstractRegionMap.java | 576 +++++++-------
.../apache/geode/internal/cache/BucketAdvisor.java | 3 -
.../internal/cache/BucketNotFoundException.java | 6 -
.../internal/cache/BucketPersistenceAdvisor.java | 4 -
.../geode/internal/cache/BucketRegionQueue.java | 14 -
.../internal/cache/CacheDistributionAdvisor.java | 1 -
.../apache/geode/internal/cache/CacheObserver.java | 2 -
.../geode/internal/cache/CacheServerImpl.java | 1 -
.../geode/internal/cache/CacheStatisticsImpl.java | 4 -
.../geode/internal/cache/CachedDeserializable.java | 1 -
.../internal/cache/ClientRegionEventImpl.java | 5 -
.../geode/internal/cache/ClientServerObserver.java | 3 -
.../cache/ClientServerObserverAdapter.java | 3 -
.../cache/ClientSubscriptionConfigImpl.java | 4 -
.../geode/internal/cache/CloseCacheMessage.java | 5 -
.../internal/cache/ClusterConfigurationLoader.java | 2 +-
.../geode/internal/cache/ColocationLogger.java | 2 -
.../internal/cache/DestroyRegionOperation.java | 3 -
.../apache/geode/internal/cache/DiskRegion.java | 1 -
.../geode/internal/cache/DiskStoreAttributes.java | 3 -
.../geode/internal/cache/DiskStoreObserver.java | 1 -
.../apache/geode/internal/cache/DiskStoreTask.java | 3 -
.../internal/cache/DiskWriteAttributesImpl.java | 9 -
.../internal/cache/DistTXPrecommitMessage.java | 6 -
.../internal/cache/DistTXRollbackMessage.java | 3 -
.../internal/cache/DistributedClearOperation.java | 6 -
.../internal/cache/DistributedPutAllOperation.java | 10 -
.../cache/DistributedRemoveAllOperation.java | 9 -
.../cache/DistributedTombstoneOperation.java | 3 -
.../geode/internal/cache/ExportDiskRegion.java | 1 -
.../cache/FixedPartitionAttributesImpl.java | 3 -
.../FunctionStreamingOrderedReplyMessage.java | 4 -
.../geode/internal/cache/GatewayEventFilter.java | 4 -
.../geode/internal/cache/GemFireCacheImpl.java | 1 -
.../geode/internal/cache/GemfireCacheHelper.java | 1 -
.../org/apache/geode/internal/cache/HARegion.java | 10 -
.../cache/InMemoryPersistentMemberView.java | 3 -
.../internal/cache/InitialImageOperation.java | 5 -
.../geode/internal/cache/InternalCacheEvent.java | 1 -
.../geode/internal/cache/InternalDataView.java | 73 --
.../internal/cache/InternalRegionArguments.java | 10 -
.../cache/InvalidatePartitionedRegionMessage.java | 9 -
.../internal/cache/InvalidateRegionOperation.java | 4 -
.../org/apache/geode/internal/cache/KeyInfo.java | 6 -
.../apache/geode/internal/cache/LocalDataSet.java | 4 -
.../apache/geode/internal/cache/LocalRegion.java | 17 -
.../java/org/apache/geode/internal/cache/Node.java | 1 -
.../cache/NonLocalRegionEntryWithStats.java | 3 -
.../internal/cache/PRContainsValueFunction.java | 3 -
.../internal/cache/PRHARedundancyProvider.java | 11 -
.../internal/cache/PartitionRegionConfig.java | 4 +
.../cache/PartitionRegionConfigValidator.java | 7 -
.../geode/internal/cache/PartitionedRegion.java | 61 +-
.../cache/PartitionedRegionBucketMgmtHelper.java | 1 -
.../internal/cache/PartitionedRegionDataStore.java | 24 -
.../internal/cache/PartitionedRegionException.java | 1 -
.../internal/cache/PartitionedRegionHelper.java | 1 -
.../cache/PartitionedRegionQueryEvaluator.java | 3 -
.../internal/cache/PartitionedRegionStats.java | 5 -
.../geode/internal/cache/PersistentOplogSet.java | 1 -
.../geode/internal/cache/PoolManagerImpl.java | 3 -
.../internal/cache/ProfileExchangeProcessor.java | 1 -
.../geode/internal/cache/RegionEventImpl.java | 13 -
.../geode/internal/cache/RegionExpiryTask.java | 1 -
.../geode/internal/cache/RegionIdleExpiryTask.java | 3 -
.../apache/geode/internal/cache/RegionQueue.java | 14 -
.../geode/internal/cache/RegionTTLExpiryTask.java | 3 -
.../cache/SearchLoadAndWriteProcessor.java | 1 -
.../cache/StoreAllCachedDeserializable.java | 3 -
.../geode/internal/cache/TXBucketRegionState.java | 3 -
.../org/apache/geode/internal/cache/TXEntry.java | 3 -
.../geode/internal/cache/TXEntryStateFactory.java | 4 -
.../geode/internal/cache/TXStateInterface.java | 6 -
.../apache/geode/internal/cache/TXStateProxy.java | 2 -
.../geode/internal/cache/TXStateProxyImpl.java | 2 -
.../geode/internal/cache/TransactionMessage.java | 3 -
.../geode/internal/cache/TxEntryFactory.java | 4 -
.../cache/UpdateEntryVersionOperation.java | 3 -
.../internal/cache/VMCachedDeserializable.java | 2 -
.../geode/internal/cache/VersionTimestamp.java | 3 -
.../protocol/ClientProtocolServiceLoader.java | 1 -
.../geode/internal/cache/control/FilterByPath.java | 3 -
.../cache/control/InternalResourceManager.java | 6 -
.../geode/internal/cache/control/MemoryEvent.java | 2 -
.../internal/cache/control/MemoryThresholds.java | 2 -
.../geode/internal/cache/control/RegionFilter.java | 3 -
.../internal/cache/control/ResourceEvent.java | 3 -
.../cache/entries/AbstractDiskRegionEntry.java | 2 -
.../internal/cache/entries/OffHeapRegionEntry.java | 1 -
.../entries/VMStatsDiskRegionEntryHeapIntKey.java | 1 -
.../entries/VMStatsDiskRegionEntryHeapLongKey.java | 1 -
.../VMStatsDiskRegionEntryHeapObjectKey.java | 1 -
.../VMStatsDiskRegionEntryHeapStringKey1.java | 1 -
.../VMStatsDiskRegionEntryHeapStringKey2.java | 1 -
.../entries/VMStatsDiskRegionEntryHeapUUIDKey.java | 1 -
.../VMStatsDiskRegionEntryOffHeapIntKey.java | 1 -
.../VMStatsDiskRegionEntryOffHeapLongKey.java | 1 -
.../VMStatsDiskRegionEntryOffHeapObjectKey.java | 1 -
.../VMStatsDiskRegionEntryOffHeapStringKey1.java | 1 -
.../VMStatsDiskRegionEntryOffHeapStringKey2.java | 1 -
.../VMStatsDiskRegionEntryOffHeapUUIDKey.java | 1 -
.../entries/VMStatsLRURegionEntryHeapIntKey.java | 1 -
.../entries/VMStatsLRURegionEntryHeapLongKey.java | 1 -
.../VMStatsLRURegionEntryHeapObjectKey.java | 1 -
.../VMStatsLRURegionEntryHeapStringKey1.java | 1 -
.../VMStatsLRURegionEntryHeapStringKey2.java | 1 -
.../entries/VMStatsLRURegionEntryHeapUUIDKey.java | 1 -
.../VMStatsLRURegionEntryOffHeapIntKey.java | 1 -
.../VMStatsLRURegionEntryOffHeapLongKey.java | 1 -
.../VMStatsLRURegionEntryOffHeapObjectKey.java | 1 -
.../VMStatsLRURegionEntryOffHeapStringKey1.java | 1 -
.../VMStatsLRURegionEntryOffHeapStringKey2.java | 1 -
.../VMStatsLRURegionEntryOffHeapUUIDKey.java | 1 -
.../VMThinDiskLRURegionEntryHeapIntKey.java | 1 -
.../VMThinDiskLRURegionEntryHeapLongKey.java | 1 -
.../VMThinDiskLRURegionEntryHeapObjectKey.java | 1 -
.../VMThinDiskLRURegionEntryHeapStringKey1.java | 1 -
.../VMThinDiskLRURegionEntryHeapStringKey2.java | 1 -
.../VMThinDiskLRURegionEntryHeapUUIDKey.java | 1 -
.../VMThinDiskLRURegionEntryOffHeapIntKey.java | 1 -
.../VMThinDiskLRURegionEntryOffHeapLongKey.java | 1 -
.../VMThinDiskLRURegionEntryOffHeapObjectKey.java | 1 -
.../VMThinDiskLRURegionEntryOffHeapStringKey1.java | 1 -
.../VMThinDiskLRURegionEntryOffHeapStringKey2.java | 1 -
.../VMThinDiskLRURegionEntryOffHeapUUIDKey.java | 1 -
.../entries/VMThinDiskRegionEntryHeapIntKey.java | 1 -
.../entries/VMThinDiskRegionEntryHeapLongKey.java | 1 -
.../VMThinDiskRegionEntryHeapObjectKey.java | 1 -
.../VMThinDiskRegionEntryHeapStringKey1.java | 1 -
.../VMThinDiskRegionEntryHeapStringKey2.java | 1 -
.../entries/VMThinDiskRegionEntryHeapUUIDKey.java | 1 -
.../VMThinDiskRegionEntryOffHeapIntKey.java | 1 -
.../VMThinDiskRegionEntryOffHeapLongKey.java | 1 -
.../VMThinDiskRegionEntryOffHeapObjectKey.java | 1 -
.../VMThinDiskRegionEntryOffHeapStringKey1.java | 1 -
.../VMThinDiskRegionEntryOffHeapStringKey2.java | 1 -
.../VMThinDiskRegionEntryOffHeapUUIDKey.java | 1 -
.../entries/VMThinLRURegionEntryHeapIntKey.java | 2 -
.../entries/VMThinLRURegionEntryHeapLongKey.java | 2 -
.../entries/VMThinLRURegionEntryHeapObjectKey.java | 2 -
.../VMThinLRURegionEntryHeapStringKey1.java | 2 -
.../VMThinLRURegionEntryHeapStringKey2.java | 2 -
.../entries/VMThinLRURegionEntryHeapUUIDKey.java | 2 -
.../entries/VMThinLRURegionEntryOffHeapIntKey.java | 2 -
.../VMThinLRURegionEntryOffHeapLongKey.java | 2 -
.../VMThinLRURegionEntryOffHeapObjectKey.java | 2 -
.../VMThinLRURegionEntryOffHeapStringKey1.java | 2 -
.../VMThinLRURegionEntryOffHeapStringKey2.java | 2 -
.../VMThinLRURegionEntryOffHeapUUIDKey.java | 2 -
.../entries/VersionedStatsDiskLRURegionEntry.java | 3 -
.../entries/VersionedStatsDiskRegionEntry.java | 3 -
.../VersionedStatsDiskRegionEntryHeapIntKey.java | 1 -
.../VersionedStatsDiskRegionEntryHeapLongKey.java | 1 -
...VersionedStatsDiskRegionEntryHeapObjectKey.java | 1 -
...ersionedStatsDiskRegionEntryHeapStringKey1.java | 1 -
...ersionedStatsDiskRegionEntryHeapStringKey2.java | 1 -
.../VersionedStatsDiskRegionEntryHeapUUIDKey.java | 1 -
...VersionedStatsDiskRegionEntryOffHeapIntKey.java | 1 -
...ersionedStatsDiskRegionEntryOffHeapLongKey.java | 1 -
...sionedStatsDiskRegionEntryOffHeapObjectKey.java | 1 -
...ionedStatsDiskRegionEntryOffHeapStringKey1.java | 1 -
...ionedStatsDiskRegionEntryOffHeapStringKey2.java | 1 -
...ersionedStatsDiskRegionEntryOffHeapUUIDKey.java | 1 -
.../entries/VersionedStatsLRURegionEntry.java | 3 -
.../entries/VersionedThinDiskLRURegionEntry.java | 3 -
.../VersionedThinDiskLRURegionEntryHeapIntKey.java | 1 -
...VersionedThinDiskLRURegionEntryHeapLongKey.java | 1 -
...rsionedThinDiskLRURegionEntryHeapObjectKey.java | 1 -
...sionedThinDiskLRURegionEntryHeapStringKey1.java | 1 -
...sionedThinDiskLRURegionEntryHeapStringKey2.java | 1 -
...VersionedThinDiskLRURegionEntryHeapUUIDKey.java | 1 -
...rsionedThinDiskLRURegionEntryOffHeapIntKey.java | 1 -
...sionedThinDiskLRURegionEntryOffHeapLongKey.java | 1 -
...onedThinDiskLRURegionEntryOffHeapObjectKey.java | 1 -
...nedThinDiskLRURegionEntryOffHeapStringKey1.java | 1 -
...nedThinDiskLRURegionEntryOffHeapStringKey2.java | 1 -
...sionedThinDiskLRURegionEntryOffHeapUUIDKey.java | 1 -
.../VersionedThinDiskRegionEntryHeapIntKey.java | 1 -
.../VersionedThinDiskRegionEntryHeapLongKey.java | 1 -
.../VersionedThinDiskRegionEntryHeapObjectKey.java | 1 -
...VersionedThinDiskRegionEntryHeapStringKey1.java | 1 -
...VersionedThinDiskRegionEntryHeapStringKey2.java | 1 -
.../VersionedThinDiskRegionEntryHeapUUIDKey.java | 1 -
.../VersionedThinDiskRegionEntryOffHeapIntKey.java | 1 -
...VersionedThinDiskRegionEntryOffHeapLongKey.java | 1 -
...rsionedThinDiskRegionEntryOffHeapObjectKey.java | 1 -
...sionedThinDiskRegionEntryOffHeapStringKey1.java | 1 -
...sionedThinDiskRegionEntryOffHeapStringKey2.java | 1 -
...VersionedThinDiskRegionEntryOffHeapUUIDKey.java | 1 -
.../VersionedThinLRURegionEntryHeapIntKey.java | 1 -
.../VersionedThinLRURegionEntryHeapLongKey.java | 1 -
.../VersionedThinLRURegionEntryHeapObjectKey.java | 1 -
.../VersionedThinLRURegionEntryHeapStringKey1.java | 1 -
.../VersionedThinLRURegionEntryHeapStringKey2.java | 1 -
.../VersionedThinLRURegionEntryHeapUUIDKey.java | 1 -
.../VersionedThinLRURegionEntryOffHeapIntKey.java | 1 -
.../VersionedThinLRURegionEntryOffHeapLongKey.java | 1 -
...ersionedThinLRURegionEntryOffHeapObjectKey.java | 1 -
...rsionedThinLRURegionEntryOffHeapStringKey1.java | 1 -
...rsionedThinLRURegionEntryOffHeapStringKey2.java | 1 -
.../VersionedThinLRURegionEntryOffHeapUUIDKey.java | 1 -
.../cache/entries/VersionedThinRegionEntry.java | 3 -
.../cache/eviction/AbstractEvictionController.java | 1 -
.../internal/cache/eviction/CountLRUEviction.java | 1 -
.../geode/internal/cache/eviction/LIFOList.java | 1 -
.../cache/eviction/MemoryLRUController.java | 1 -
.../internal/cache/execute/AbstractExecution.java | 1 -
.../cache/execute/BucketMovedException.java | 4 -
.../cache/execute/DefaultResultCollector.java | 2 -
.../DistributedRegionFunctionResultSender.java | 2 -
.../DistributedRegionFunctionResultWaiter.java | 4 -
.../cache/execute/FunctionExecutionNodePruner.java | 4 -
.../cache/execute/FunctionServiceStats.java | 1 -
.../internal/cache/execute/FunctionStats.java | 1 -
.../execute/FunctionStreamingResultCollector.java | 4 -
.../internal/cache/execute/InternalExecution.java | 1 -
.../cache/execute/InternalFunctionException.java | 5 -
.../cache/execute/InternalFunctionService.java | 7 -
.../cache/execute/InternalResultSender.java | 4 -
.../cache/execute/MemberFunctionResultSender.java | 8 -
.../cache/execute/MemberFunctionResultWaiter.java | 4 -
.../execute/MultiRegionFunctionResultWaiter.java | 4 -
.../PartitionedRegionFunctionResultSender.java | 8 -
.../cache/execute/ServerFunctionExecutor.java | 5 -
.../execute/ServerRegionFunctionExecutor.java | 1 -
.../ServerToClientFunctionResultSender.java | 2 -
.../cache/execute/StreamingFunctionOperation.java | 2 -
.../util/FindRestEnabledServersFunction.java | 1 -
.../geode/internal/cache/ha/HAContainerMap.java | 8 -
.../geode/internal/cache/ha/HAContainerRegion.java | 2 -
.../geode/internal/cache/ha/HARegionQueue.java | 3 -
.../internal/cache/ha/HARegionQueueAttributes.java | 6 -
.../geode/internal/cache/ha/ThreadIdentifier.java | 6 -
.../internal/cache/map/RegionMapPutContext.java | 194 +++++
.../cache/partitioned/ColocatedRegionDetails.java | 4 -
.../cache/partitioned/CreateBucketMessage.java | 1 -
.../internal/cache/partitioned/DestroyMessage.java | 1 -
.../partitioned/EndBucketCreationMessage.java | 1 -
.../cache/partitioned/FetchBulkEntriesMessage.java | 1 -
.../cache/partitioned/FetchKeysMessage.java | 5 -
.../partitioned/FetchPartitionDetailsMessage.java | 2 -
.../internal/cache/partitioned/FlushMessage.java | 3 -
.../internal/cache/partitioned/GetMessage.java | 3 -
.../cache/partitioned/IdentityRequestMessage.java | 1 -
.../cache/partitioned/IndexCreationMsg.java | 1 -
.../cache/partitioned/InvalidateMessage.java | 2 -
.../partitioned/ManageBackupBucketMessage.java | 2 -
.../cache/partitioned/ManageBucketMessage.java | 1 -
.../cache/partitioned/OfflineMemberDetails.java | 3 -
.../partitioned/OfflineMemberDetailsImpl.java | 3 -
.../partitioned/PRUpdateEntryVersionMessage.java | 12 -
.../PartitionMessageWithDirectReply.java | 3 -
.../PartitionedRegionObserverAdapter.java | 1 -
.../partitioned/PartitionedRegionRebalanceOp.java | 2 -
.../internal/cache/partitioned/PutMessage.java | 2 -
.../cache/partitioned/RecoveryRunnable.java | 3 -
.../partitioned/RedundancyAlreadyMetException.java | 3 -
.../cache/partitioned/RedundancyLogger.java | 1 -
.../internal/cache/partitioned/RegionAdvisor.java | 6 -
.../cache/partitioned/RemoveIndexesMessage.java | 1 -
.../partitioned/StreamingPartitionOperation.java | 3 -
.../cache/partitioned/rebalance/model/Member.java | 1 -
.../model/PartitionedRegionLoadModel.java | 2 -
.../cache/persistence/CanonicalIdHolder.java | 1 -
.../cache/persistence/DiskInitFileInterpreter.java | 59 --
.../cache/persistence/DiskInitFileParser.java | 3 -
.../internal/cache/persistence/DiskStoreID.java | 4 -
.../cache/persistence/MembershipFlushRequest.java | 3 -
.../cache/persistence/MembershipViewRequest.java | 3 -
.../cache/persistence/PRPersistentConfig.java | 3 -
.../cache/persistence/PersistenceAdvisor.java | 5 -
.../cache/persistence/PersistenceAdvisorImpl.java | 3 -
.../cache/persistence/PersistentMemberID.java | 4 -
.../cache/persistence/PersistentMemberManager.java | 3 -
.../cache/persistence/PersistentMemberState.java | 3 -
.../cache/persistence/PersistentMemberView.java | 1 -
.../persistence/PersistentStateQueryMessage.java | 3 -
.../persistence/PersistentStateQueryResults.java | 1 -
.../PrepareNewPersistentMemberMessage.java | 3 -
.../persistence/RemovePersistentMemberMessage.java | 3 -
.../geode/internal/cache/snapshot/GFSnapshot.java | 2 -
.../cache/snapshot/ParallelSnapshotFileMapper.java | 2 -
.../cache/snapshot/RegionSnapshotServiceImpl.java | 1 -
.../cache/snapshot/SnapshotFileMapper.java | 2 -
.../internal/cache/snapshot/SnapshotPacket.java | 2 -
.../apache/geode/internal/cache/tier/Acceptor.java | 1 -
.../cache/tier/sockets/CacheClientNotifier.java | 1 -
.../cache/tier/sockets/CacheClientProxy.java | 4 -
.../cache/tier/sockets/CacheServerHelper.java | 4 -
.../cache/tier/sockets/CacheServerStats.java | 3 -
.../tier/sockets/ClientDataSerializerMessage.java | 5 -
.../cache/tier/sockets/ClientHealthMonitor.java | 1 -
.../tier/sockets/ClientInterestMessageImpl.java | 1 -
.../internal/cache/tier/sockets/ClientMessage.java | 1 -
.../cache/tier/sockets/ClientTombstoneMessage.java | 5 -
.../tier/sockets/ClientUpdateMessageImpl.java | 6 -
.../cache/tier/sockets/HAEventWrapper.java | 4 -
.../geode/internal/cache/tier/sockets/Message.java | 1 -
.../cache/tier/sockets/MessageIdExtractor.java | 1 -
.../cache/tier/sockets/ObjectPartList651.java | 7 -
.../tier/sockets/OldClientSupportService.java | 1 -
.../tier/sockets/OriginalServerConnection.java | 10 -
.../tier/sockets/ProtobufServerConnection.java | 1 -
.../tier/sockets/SerializedObjectPartList.java | 3 -
.../cache/tier/sockets/ServerConnection.java | 1 -
.../tier/sockets/ServerSideHandshakeFactory.java | 1 -
.../cache/tier/sockets/VersionedObjectList.java | 5 -
.../cache/tier/sockets/command/AddPdxType.java | 1 -
.../cache/tier/sockets/command/ClearRegion.java | 3 -
.../cache/tier/sockets/command/ClientReady.java | 3 -
.../tier/sockets/command/CloseConnection.java | 3 -
.../cache/tier/sockets/command/CommitCommand.java | 3 -
.../cache/tier/sockets/command/Default.java | 3 -
.../cache/tier/sockets/command/Destroy70.java | 6 -
.../tier/sockets/command/ExecuteFunction70.java | 3 -
.../sockets/command/GatewayReceiverCommand.java | 1 -
.../tier/sockets/command/GetPDXIdForType.java | 1 -
.../cache/tier/sockets/command/Invalid.java | 3 -
.../cache/tier/sockets/command/Invalidate70.java | 3 -
.../cache/tier/sockets/command/KeySet.java | 3 -
.../cache/tier/sockets/command/MakePrimary.java | 3 -
.../cache/tier/sockets/command/PeriodicAck.java | 3 -
.../internal/cache/tier/sockets/command/Ping.java | 3 -
.../internal/cache/tier/sockets/command/Put70.java | 7 -
.../cache/tier/sockets/command/QueryGeode10.java | 5 -
.../command/QueryWithParametersGeode10.java | 3 -
.../sockets/command/RegisterInstantiators.java | 3 -
.../tier/sockets/command/RegisterInterest.java | 3 -
.../sockets/command/UnregisterInterestList.java | 3 -
.../cache/tx/AbstractPeerTXRegionStub.java | 1 -
.../geode/internal/cache/tx/DistTxEntryEvent.java | 18 -
.../internal/cache/tx/PartitionedTXRegionStub.java | 1 -
.../internal/cache/tx/RemoteFetchKeysMessage.java | 6 -
.../cache/tx/RemoteFetchVersionMessage.java | 3 -
.../geode/internal/cache/tx/RemoteGetMessage.java | 1 -
.../geode/internal/cache/tx/RemotePutMessage.java | 6 +-
.../internal/cache/tx/TransactionalOperation.java | 4 -
.../ConcurrentCacheModificationException.java | 3 -
.../cache/versions/RegionVersionHolder.java | 2 -
.../cache/versions/RegionVersionVector.java | 13 -
.../geode/internal/cache/versions/VersionTag.java | 4 -
.../internal/cache/wan/AbstractGatewaySender.java | 6 -
.../wan/AbstractGatewaySenderEventProcessor.java | 7 +-
.../geode/internal/cache/wan/BatchException70.java | 1 -
.../internal/cache/wan/GatewayEventFilterImpl.java | 1 -
.../wan/GatewaySenderConfigurationException.java | 3 -
.../wan/GatewaySenderEventCallbackArgument.java | 2 -
.../wan/GatewaySenderEventCallbackDispatcher.java | 1 -
.../internal/cache/wan/GatewaySenderEventImpl.java | 3 -
.../internal/cache/wan/TransportFilterSocket.java | 1 -
.../cache/wan/TransportFilterSocketFactory.java | 1 -
.../ConcurrentParallelGatewaySenderQueue.java | 20 +-
.../ParallelGatewaySenderEventProcessor.java | 1 -
.../wan/parallel/ParallelGatewaySenderQueue.java | 17 +-
...oncurrentSerialGatewaySenderEventProcessor.java | 10 -
.../cache/wan/serial/SerialGatewaySenderQueue.java | 9 -
.../internal/cache/xmlcache/BindingCreation.java | 2 -
.../cache/xmlcache/CacheServerCreation.java | 3 -
.../geode/internal/cache/xmlcache/CacheXml.java | 27 -
.../internal/cache/xmlcache/CacheXmlGenerator.java | 4 -
.../internal/cache/xmlcache/CacheXmlParser.java | 12 -
.../cache/xmlcache/CacheXmlPropertyResolver.java | 9 -
.../xmlcache/CacheXmlPropertyResolverHelper.java | 9 -
.../cache/xmlcache/ClientCacheCreation.java | 1 -
.../xmlcache/DiskStoreAttributesCreation.java | 5 -
.../cache/xmlcache/GatewayReceiverCreation.java | 4 -
.../internal/cache/xmlcache/PropertyResolver.java | 5 -
.../cache/xmlcache/RegionAttributesCreation.java | 5 -
.../internal/cache/xmlcache/RegionCreation.java | 11 -
.../cache/xmlcache/SerializerCreation.java | 10 -
.../internal/cache/xmlcache/XmlGenerator.java | 1 -
.../org/apache/geode/internal/concurrent/AL.java | 1 -
.../apache/geode/internal/config/JAXBService.java | 138 ++++
.../internal/datasource/AbstractDataSource.java | 20 -
.../internal/datasource/AbstractPoolCache.java | 9 +-
.../datasource/ConfiguredDataSourceProperties.java | 15 -
.../internal/datasource/ConnectionPoolCache.java | 1 -
.../datasource/ConnectionPoolCacheImpl.java | 3 -
.../datasource/ConnectionProviderException.java | 3 -
.../datasource/DataSourceCreateException.java | 3 -
.../internal/datasource/DataSourceFactory.java | 7 -
.../internal/datasource/DataSourceResources.java | 2 -
.../datasource/FacetsJCAConnectionManagerImpl.java | 1 -
.../datasource/GemFireBasicDataSource.java | 8 -
.../datasource/GemFireConnPooledDataSource.java | 7 -
.../datasource/GemFireConnectionPoolManager.java | 4 -
.../datasource/GemFireTransactionDataSource.java | 12 -
.../datasource/JCAConnectionManagerImpl.java | 1 -
.../internal/datasource/ManagedPoolCacheImpl.java | 3 -
.../geode/internal/datasource/PoolException.java | 3 -
.../internal/datasource/TranxPoolCacheImpl.java | 5 -
.../apache/geode/internal/hll/HyperLogLogPlus.java | 4 -
.../apache/geode/internal/hll/ICardinality.java | 1 -
.../internal/jndi/InitialContextFactoryImpl.java | 1 -
.../apache/geode/internal/jndi/JNDIInvoker.java | 2 -
.../geode/internal/jta/GlobalTransaction.java | 2 -
.../geode/internal/jta/TransactionUtils.java | 2 -
.../geode/internal/logging/LoggingThreadGroup.java | 1 -
.../geode/internal/memcached/CommandProcessor.java | 6 -
.../geode/internal/memcached/ValueWrapper.java | 1 -
.../internal/memcached/commands/AddQCommand.java | 4 -
.../memcached/commands/AppendQCommand.java | 3 -
.../memcached/commands/DecrementCommand.java | 1 -
.../memcached/commands/DecrementQCommand.java | 3 -
.../memcached/commands/DeleteQCommand.java | 3 -
.../memcached/commands/FlushAllQCommand.java | 3 -
.../internal/memcached/commands/GATCommand.java | 3 -
.../internal/memcached/commands/GATQCommand.java | 3 -
.../internal/memcached/commands/GetKCommand.java | 3 -
.../internal/memcached/commands/GetKQCommand.java | 4 -
.../internal/memcached/commands/GetQCommand.java | 6 -
.../memcached/commands/IncrementQCommand.java | 3 -
.../internal/memcached/commands/NoOpCommand.java | 3 -
.../memcached/commands/NotSupportedCommand.java | 3 -
.../memcached/commands/PrependQCommand.java | 3 -
.../internal/memcached/commands/QuitQCommand.java | 3 -
.../memcached/commands/ReplaceQCommand.java | 3 -
.../internal/memcached/commands/SetQCommand.java | 4 -
.../memcached/commands/StorageCommand.java | 6 -
.../internal/memcached/commands/TouchCommand.java | 3 -
.../apache/geode/internal/net/SocketCreator.java | 11 -
.../geode/internal/net/SocketCreatorFactory.java | 5 -
.../geode/internal/offheap/OffHeapHelper.java | 1 -
.../geode/internal/offheap/RefCountChangeInfo.java | 1 -
.../geode/internal/offheap/StoredObject.java | 2 -
.../geode/internal/sequencelog/GraphType.java | 3 -
.../internal/sequencelog/MembershipLogger.java | 3 -
.../geode/internal/sequencelog/MessageLogger.java | 3 -
.../geode/internal/sequencelog/RegionLogger.java | 2 -
.../internal/sequencelog/SequenceLoggerImpl.java | 3 -
.../geode/internal/sequencelog/Transition.java | 3 -
.../geode/internal/sequencelog/io/Filter.java | 3 -
.../sequencelog/io/GemfireLogConverter.java | 7 -
.../geode/internal/sequencelog/io/GraphReader.java | 3 -
.../internal/sequencelog/io/InputStreamReader.java | 4 -
.../geode/internal/sequencelog/model/Graph.java | 5 -
.../geode/internal/sequencelog/model/GraphID.java | 3 -
.../sequencelog/model/GraphReaderCallback.java | 3 -
.../geode/internal/sequencelog/model/GraphSet.java | 3 -
.../geode/internal/sequencelog/model/Vertex.java | 3 -
.../visualization/text/TextDisplay.java | 7 -
.../apache/geode/internal/shared/NativeCalls.java | 1 -
.../geode/internal/shared/NativeCallsJNAImpl.java | 1 -
.../internal/size/CachingSingleObjectSizer.java | 4 -
.../geode/internal/size/ObjectTraverser.java | 2 -
.../geode/internal/size/SingleObjectSizer.java | 1 -
.../internal/statistics/LocalStatisticsImpl.java | 3 -
.../internal/statistics/StatArchiveHandler.java | 7 -
.../statistics/platform/LinuxProcessStats.java | 1 -
.../statistics/platform/SolarisProcessStats.java | 1 -
.../statistics/platform/WindowsProcessStats.java | 1 -
.../org/apache/geode/internal/tcp/Buffers.java | 3 -
.../apache/geode/internal/tcp/ConnectionTable.java | 5 -
.../org/apache/geode/internal/tcp/MsgReader.java | 3 -
.../org/apache/geode/internal/tcp/MsgStreamer.java | 3 -
.../apache/geode/internal/util/LogFileUtils.java | 3 -
.../apache/geode/internal/util/PluckStacks.java | 2 -
.../geode/internal/util/VersionedArrayList.java | 9 -
.../util/concurrent/ReentrantSemaphore.java | 3 -
.../util/concurrent/StoppableCondition.java | 2 -
.../util/concurrent/StoppableCountDownLatch.java | 3 -
.../util/concurrent/StoppableReentrantLock.java | 4 -
.../StoppableReentrantReadWriteLock.java | 11 -
.../geode/management/AsyncEventQueueMXBean.java | 1 -
.../apache/geode/management/CacheServerMXBean.java | 3 -
.../geode/management/DistributedSystemMXBean.java | 1 -
.../org/apache/geode/management/JVMMetrics.java | 1 -
.../apache/geode/management/NetworkMetrics.java | 1 -
.../apache/geode/management/cli/GfshCommand.java | 1 +
.../management/internal/FederationComponent.java | 6 -
.../management/internal/JmxManagerAdvisor.java | 4 -
.../geode/management/internal/MBeanJMXAdapter.java | 15 -
.../internal/MBeanProxyInfoRepository.java | 4 -
.../internal/MBeanProxyInvocationHandler.java | 9 -
.../internal/MXBeanProxyInvocationHandler.java | 1 -
.../management/internal/ManagementFunction.java | 1 -
.../internal/NotificationBroadCasterProxy.java | 1 -
.../internal/NotificationCacheListener.java | 1 -
.../geode/management/internal/NotificationHub.java | 2 -
.../management/internal/NotificationHubClient.java | 1 -
.../geode/management/internal/OpenMethod.java | 1 -
.../geode/management/internal/ProxyInfo.java | 4 -
.../geode/management/internal/ProxyInterface.java | 1 -
.../geode/management/internal/ProxyListener.java | 1 -
.../management/internal/StringBasedFilter.java | 7 -
.../internal/beans/AsyncEventQueueMBean.java | 1 -
.../internal/beans/CacheServerBridge.java | 4 -
.../internal/beans/DiskRegionBridge.java | 4 -
.../management/internal/beans/FileUploader.java | 6 -
.../internal/beans/GatewayReceiverMBean.java | 4 -
.../internal/beans/GatewayReceiverMBeanBridge.java | 4 -
.../management/internal/beans/LocatorMBean.java | 4 -
.../internal/beans/LocatorMBeanBridge.java | 1 -
.../management/internal/beans/MBeanAggregator.java | 1 -
.../internal/beans/ManagementAdapter.java | 10 -
.../management/internal/beans/ManagerMBean.java | 4 -
.../internal/beans/MetricsCalculator.java | 1 -
.../internal/beans/PartitionedRegionBridge.java | 4 -
.../internal/beans/RegionMBeanBridge.java | 11 -
.../beans/stats/AggregateRegionStatsMonitor.java | 5 -
.../internal/beans/stats/GCStatsMonitor.java | 5 -
.../stats/GatewayReceiverClusterStatsMonitor.java | 4 -
.../stats/GatewaySenderClusterStatsMonitor.java | 4 -
.../beans/stats/MemberClusterStatsMonitor.java | 4 -
.../beans/stats/MemberLevelDiskMonitor.java | 6 -
.../beans/stats/ServerClusterStatsMonitor.java | 4 -
.../management/internal/beans/stats/StatType.java | 4 -
.../internal/beans/stats/StatsAggregator.java | 4 -
.../internal/beans/stats/StatsAverageLatency.java | 4 -
.../internal/beans/stats/StatsLatency.java | 4 -
.../management/internal/beans/stats/StatsRate.java | 5 -
.../geode/management/internal/cli/CliUtil.java | 1 -
.../geode/management/internal/cli/GfshParser.java | 2 -
.../internal/cli/commands/ConfigurePDXCommand.java | 5 -
.../cli/commands/CreateJndiBindingCommand.java | 20 +-
.../cli/commands/DescribeJndiBindingCommand.java | 4 +
.../cli/commands/DestroyJndiBindingCommand.java | 6 +-
.../ExportImportClusterConfigurationCommands.java | 18 +-
.../cli/commands/ExportStackTraceCommand.java | 1 -
.../internal/cli/commands/InternalGfshCommand.java | 1 -
.../internal/cli/commands/ListGatewayCommand.java | 7 +-
.../cli/commands/ShowMetricsInterceptor.java | 2 -
.../internal/cli/commands/StartLocatorCommand.java | 6 +
.../converters/ConnectionEndpointConverter.java | 6 -
.../cli/converters/DiskStoreNameConverter.java | 5 -
.../cli/converters/GatewaySenderIdConverter.java | 5 -
.../cli/converters/LocatorIdNameConverter.java | 5 -
.../internal/cli/domain/DataCommandRequest.java | 4 -
.../cli/domain/EvictionAttributesInfo.java | 4 -
.../cli/domain/FixedPartitionAttributesInfo.java | 4 -
.../management/internal/cli/domain/IndexInfo.java | 2 -
.../internal/cli/domain/MemberInformation.java | 3 -
.../cli/domain/PartitionAttributesInfo.java | 4 -
.../internal/cli/functions/CliFunctionResult.java | 60 +-
.../cli/functions/DestroyIndexFunction.java | 2 -
.../functions/GatewayReceiverCreateFunction.java | 3 -
.../cli/functions/GatewaySenderCreateFunction.java | 3 -
.../GetMemberConfigInformationFunction.java | 6 -
.../functions/GetMemberInformationFunction.java | 3 -
.../cli/functions/RegionAlterFunction.java | 37 +-
.../management/internal/cli/help/HelpBlock.java | 3 -
.../management/internal/cli/i18n/CliStrings.java | 5 +-
.../management/internal/cli/json/GfJsonObject.java | 27 +-
.../internal/cli/result/AbstractResultData.java | 7 -
.../internal/cli/result/CommandResult.java | 75 +-
.../internal/cli/result/CompositeResultData.java | 2 -
.../internal/cli/result/ErrorResultData.java | 5 -
.../internal/cli/result/ResultBuilder.java | 16 +-
.../internal/cli/result/ResultDataException.java | 3 -
.../internal/cli/result/TableBuilderHelper.java | 1 -
.../internal/cli/shell/JmxOperationInvoker.java | 5 -
.../internal/cli/shell/jline/ANSIHandler.java | 1 -
.../cli/shell/jline/CygwinMinttyTerminal.java | 2 -
.../internal/cli/util/ConnectionEndpoint.java | 11 -
.../internal/cli/util/DiskStoreCompacter.java | 1 -
.../internal/cli/util/DiskStoreUpgrader.java | 1 -
.../internal/cli/util/DiskStoreValidater.java | 3 -
.../internal/cli/util/EvictionAttributesInfo.java | 5 -
.../internal/cli/util/HyphenFormatter.java | 1 -
.../management/internal/cli/util/JsonUtil.java | 4 -
.../management/internal/cli/util/LogFilter.java | 2 -
.../internal/cli/util/MemberInformation.java | 3 -
.../internal/cli/util/ReadWriteFile.java | 3 -
.../configuration/domain/CacheElement.java | 10 -
.../configuration/domain/Configuration.java | 3 -
.../internal/configuration/domain/XmlEntity.java | 2 -
.../functions/GetClusterConfigurationFunction.java | 40 +-
.../messages/SharedConfigurationStatusRequest.java | 4 -
.../SharedConfigurationStatusResponse.java | 7 -
.../internal/configuration/utils/XmlUtils.java | 44 --
.../internal/configuration/utils/ZipUtils.java | 3 -
.../support/LoginHandlerInterceptor.java | 1 -
.../geode/memcached/GemFireMemcachedServer.java | 4 -
.../geode/pdx/PdxConfigurationException.java | 3 -
.../geode/pdx/PdxFieldAlreadyExistsException.java | 3 -
.../geode/pdx/PdxFieldDoesNotExistException.java | 3 -
.../geode/pdx/PdxFieldTypeMismatchException.java | 3 -
.../geode/pdx/PdxInitializationException.java | 3 -
.../geode/pdx/PdxSerializationException.java | 3 -
.../java/org/apache/geode/pdx/PdxUnreadFields.java | 3 -
.../pdx/internal/AutoSerializableManager.java | 2 -
.../geode/pdx/internal/ClientTypeRegistration.java | 1 -
.../apache/geode/pdx/internal/DefaultPdxField.java | 1 -
.../apache/geode/pdx/internal/PdxInputStream.java | 3 -
.../apache/geode/pdx/internal/PdxInstanceEnum.java | 2 -
.../geode/pdx/internal/PdxInstanceFactoryImpl.java | 1 -
.../apache/geode/pdx/internal/PdxOutputStream.java | 10 -
.../org/apache/geode/pdx/internal/PdxType.java | 3 -
.../geode/pdx/internal/PeerTypeRegistration.java | 3 -
.../geode/pdx/internal/TrackingPdxReaderImpl.java | 1 -
.../internal/WeakConcurrentIdentityHashMap.java | 1 -
.../org/apache/geode/redis/GeodeRedisServer.java | 3 -
.../geode/redis/internal/ByteArrayWrapper.java | 1 -
.../redis/internal/ExecutionHandlerContext.java | 7 +-
.../org/apache/geode/security/AuthInitialize.java | 1 -
.../org/apache/geode/security/SecurityManager.java | 1 -
.../java/batterytest/greplogs/ExpectedStrings.java | 6 -
.../test/java/org/apache/geode/TXJUnitTest.java | 6 -
.../java/org/apache/geode/TestDataSerializer.java | 6 -
.../geode/cache/ConnectionPoolDUnitTest.java | 5 -
.../apache/geode/cache/RegionFactoryJUnitTest.java | 1 -
.../AutoConnectionSourceImplJUnitTest.java | 5 -
.../internal/ConnectionPoolImplJUnitTest.java | 3 -
.../internal/LocatorLoadBalancingDUnitTest.java | 8 -
.../cache/client/internal/LocatorTestBase.java | 3 -
.../client/internal/QueueManagerJUnitTest.java | 3 -
.../pooling/ConnectionManagerJUnitTest.java | 4 -
.../cache/execute/FunctionAdapterJUnitTest.java | 6 -
.../management/MXMemoryPoolListenerExample.java | 6 -
.../management/MemoryThresholdsDUnitTest.java | 8 -
.../MemoryThresholdsOffHeapDUnitTest.java | 1 -
.../partition/PartitionRegionHelperDUnitTest.java | 3 -
.../org/apache/geode/cache/query/PerfQuery.java | 3 -
.../apache/geode/cache/query/QueryJUnitTest.java | 3 -
.../geode/cache/query/QueryServiceJUnitTest.java | 3 -
.../apache/geode/cache/query/QueryTestUtils.java | 6 -
.../geode/cache/query/TypedIteratorJUnitTest.java | 3 -
.../java/org/apache/geode/cache/query/Utils.java | 3 -
.../cache/query/cq/dunit/CqQueryTestListener.java | 7 -
.../org/apache/geode/cache/query/data/City.java | 3 -
.../geode/cache/query/data/CollectionHolder.java | 3 -
.../geode/cache/query/data/ComparableWrapper.java | 3 -
.../org/apache/geode/cache/query/data/Country.java | 3 -
.../apache/geode/cache/query/data/District.java | 3 -
.../org/apache/geode/cache/query/data/Numbers.java | 3 -
.../geode/cache/query/data/PortfolioNoDS.java | 3 -
.../geode/cache/query/data/PortfolioPdx.java | 1 -
.../geode/cache/query/data/PositionNoDS.java | 3 -
.../apache/geode/cache/query/data/PositionPdx.java | 2 -
.../org/apache/geode/cache/query/data/Quote.java | 3 -
.../apache/geode/cache/query/data/Restricted.java | 3 -
.../org/apache/geode/cache/query/data/State.java | 3 -
.../org/apache/geode/cache/query/data/Student.java | 4 -
.../org/apache/geode/cache/query/data/Vehicle.java | 4 -
.../org/apache/geode/cache/query/data/Village.java | 3 -
.../cache/query/dunit/CqTimeTestListener.java | 3 -
.../geode/cache/query/dunit/GroupByDUnitImpl.java | 9 -
.../dunit/GroupByPartitionedQueryDUnitTest.java | 4 -
.../cache/query/dunit/GroupByQueryDUnitTest.java | 4 -
.../query/dunit/NonDistinctOrderByDUnitImpl.java | 4 -
.../NonDistinctOrderByPartitionedDUnitTest.java | 4 -
.../PdxLocalQueryVersionedClassDUnitTest.java | 1 -
.../geode/cache/query/dunit/PdxQueryDUnitTest.java | 6 -
.../cache/query/dunit/PositionPdxVersion.java | 1 -
.../dunit/QueryDataInconsistencyDUnitTest.java | 4 -
.../dunit/QueryUsingFunctionContextDUnitTest.java | 19 -
.../cache/query/dunit/QueryUsingPoolDUnitTest.java | 1 -
.../functional/ComparisonOperatorsJUnitTest.java | 3 -
.../cache/query/functional/CountStarJUnitTest.java | 3 -
...tinctResultsWithDupValuesInRegionJUnitTest.java | 6 -
.../functional/GroupByPartitionedJUnitTest.java | 4 -
.../functional/GroupByReplicatedJUnitTest.java | 4 -
.../functional/IUMRCompositeIteratorJUnitTest.java | 3 -
.../functional/IUMRSingleRegionJUnitTest.java | 2 -
...IndependentOperandsInWhereClause2JUnitTest.java | 3 -
.../query/functional/IndexCreationJUnitTest.java | 2 -
.../IndexMaintenanceAsynchJUnitTest.java | 3 -
.../query/functional/IndexOperatorJUnitTest.java | 3 -
.../functional/IndexPrimaryKeyUsageJUnitTest.java | 3 -
.../IndexUsageInNestedQueryJUnitTest.java | 3 -
.../IndexWithSngleFrmAndMultCondQryJUnitTest.java | 3 -
.../functional/IteratorTypeDefEmpJUnitTest.java | 3 -
.../query/functional/IteratorTypeDefJUnitTest.java | 3 -
.../IteratorTypeDefaultTypesJUnitTest.java | 3 -
.../query/functional/LimitClauseJUnitTest.java | 8 -
.../functional/LogicalOperatorsJUnitTest.java | 3 -
.../functional/MultiRegionIndexUsageJUnitTest.java | 2 -
.../functional/NegativeNumberQueriesJUnitTest.java | 2 -
.../NonDistinctOrderByPartitionedJUnitTest.java | 4 -
.../NonDistinctOrderByReplicatedJUnitTest.java | 4 -
.../NonDistinctOrderByTestImplementation.java | 9 -
.../query/functional/NumericQueryJUnitTest.java | 2 -
.../functional/OrderByPartitionedJUnitTest.java | 4 -
.../functional/OrderByTestImplementation.java | 4 -
.../functional/ParameterBindingJUnitTest.java | 3 -
.../functional/QRegionInterfaceJUnitTest.java | 3 -
.../QueryREUpdateInProgressJUnitTest.java | 3 -
.../query/functional/QueryUndefinedJUnitTest.java | 3 -
.../query/functional/SelectToDateJUnitTest.java | 4 -
.../functional/StructMemberAccessJUnitTest.java | 2 -
.../internal/CompiledGroupBySelectJUnitTest.java | 4 -
.../CompiledJunctionInternalsJUnitTest.java | 4 -
.../query/internal/ExecutionContextJUnitTest.java | 4 -
.../internal/ProjectionAttributeJUnitTest.java | 4 -
.../cache/query/internal/QCompilerJUnitTest.java | 4 -
.../QueryFromClauseCanonicalizationJUnitTest.java | 3 -
.../cache/query/internal/QueryTraceJUnitTest.java | 10 -
.../ResultsCollectionWrapperLimitJUnitTest.java | 3 -
.../internal/StructBagLimitBehaviourJUnitTest.java | 3 -
.../internal/cq/CqAttributesImplJUnitTest.java | 1 -
.../AsyncIndexUpdaterThreadShutdownJUnitTest.java | 3 -
.../index/AsynchIndexMaintenanceJUnitTest.java | 3 -
.../CompactRangeIndexQueryIntegrationTest.java | 2 -
...ncurrentIndexInitOnOverflowRegionDUnitTest.java | 12 -
...ntIndexOperationsOnOverflowRegionDUnitTest.java | 18 -
...exUpdateWithInplaceObjectModFalseDUnitTest.java | 3 -
.../ConcurrentIndexUpdateWithoutWLDUnitTest.java | 3 -
.../internal/index/CopyOnReadIndexJUnitTest.java | 26 -
.../index/IndexCreationInternalsJUnitTest.java | 3 -
.../cache/query/internal/index/IndexJUnitTest.java | 2 -
.../internal/index/IndexMaintainceJUnitTest.java | 3 -
.../internal/index/IndexStatisticsJUnitTest.java | 13 -
.../index/IndexTrackingQueryObserverDUnitTest.java | 7 -
.../index/IndexTrackingQueryObserverJUnitTest.java | 6 -
.../IndexedMergeEquiJoinScenariosJUnitTest.java | 3 -
.../internal/index/MemoryIndexStoreJUnitTest.java | 1 -
...ProgRegionCreationIndexUpdateTypeJUnitTest.java | 4 -
.../query/internal/types/TypeUtilsJUnitTest.java | 1 -
.../partitioned/PRIndexStatisticsJUnitTest.java | 14 -
.../query/partitioned/PRInvalidQueryJUnitTest.java | 3 -
.../partitioned/PRQueryCacheClosedJUnitTest.java | 3 -
.../query/partitioned/PRQueryDUnitHelper.java | 36 -
.../cache/query/partitioned/PRQueryJUnitTest.java | 3 -
.../partitioned/PRQueryNumThreadsJUnitTest.java | 3 -
.../partitioned/PRQueryRegionClosedJUnitTest.java | 3 -
.../PRQueryRegionDestroyedJUnitTest.java | 3 -
.../geode/cache/query/transaction/Person.java | 1 -
.../query/transaction/QueryAndJtaJUnitTest.java | 1 -
.../cache/snapshot/ParallelSnapshotDUnitTest.java | 1 -
.../StringPrefixPartitionResolverJUnitTest.java | 1 -
.../apache/geode/cache30/CacheCloseDUnitTest.java | 1 -
.../geode/cache30/CacheListenerTestCase.java | 4 -
.../apache/geode/cache30/CacheLoaderTestCase.java | 4 -
.../geode/cache30/CacheStatisticsDUnitTest.java | 1 -
.../apache/geode/cache30/CacheWriterTestCase.java | 4 -
.../geode/cache30/CacheXmlGeode10DUnitTest.java | 1 -
.../org/apache/geode/cache30/CacheXmlTestCase.java | 2 -
.../geode/cache30/ClientServerCCEDUnitTest.java | 2 -
.../cache30/ConcurrentLeaveDuringGIIDUnitTest.java | 2 -
...stributedNoAckAsyncOverflowRegionDUnitTest.java | 10 -
.../DiskDistributedNoAckAsyncRegionDUnitTest.java | 3 -
...istributedNoAckSyncOverflowRegionDUnitTest.java | 2 -
.../geode/cache30/DistAckMapMethodsDUnitTest.java | 5 -
.../DistributedAckOverflowRegionCCEDUnitTest.java | 4 -
...DistributedAckPersistentRegionCCEDUnitTest.java | 3 -
.../cache30/DistributedAckRegionCCEDUnitTest.java | 3 -
.../DistributedMulticastRegionDUnitTest.java | 1 -
.../geode/cache30/DynamicRegionDUnitTest.java | 1 -
.../geode/cache30/GlobalLockingDUnitTest.java | 1 -
.../geode/cache30/GlobalRegionCCEDUnitTest.java | 3 -
.../cache30/LRUEvictionControllerDUnitTest.java | 2 -
.../cache30/MemLRUEvictionControllerDUnitTest.java | 3 -
.../geode/cache30/MultiVMRegionTestCase.java | 1 -
.../geode/cache30/MyGatewayEventFilter1.java | 1 -
.../geode/cache30/MyGatewayEventFilter2.java | 1 -
.../PartitionedRegionCompressionDUnitTest.java | 3 -
...rtitionedRegionMembershipListenerDUnitTest.java | 4 -
.../cache30/ReconnectWithUDPSecurityDUnitTest.java | 1 -
.../geode/cache30/RegionAttributesTestCase.java | 4 -
.../cache30/RegionReliabilityDistAckDUnitTest.java | 3 -
.../RegionReliabilityDistNoAckDUnitTest.java | 3 -
.../cache30/RegionReliabilityGlobalDUnitTest.java | 3 -
.../org/apache/geode/cache30/RegionTestCase.java | 4 -
.../geode/cache30/RemoveAllMultiVmDUnitTest.java | 3 -
.../ShorteningExpirationTimeRegressionTest.java | 3 -
.../java/org/apache/geode/cache30/TestHeapLRU.java | 2 -
.../apache/geode/cache30/TestPdxSerializer.java | 5 -
.../geode/codeAnalysis/CompiledClassUtils.java | 1 -
.../DistributedLockServiceDUnitTest.java | 10 -
.../distributed/DistributedMemberDUnitTest.java | 2 -
.../apache/geode/distributed/LocatorDUnitTest.java | 1 -
.../apache/geode/distributed/LocatorJUnitTest.java | 1 -
.../internal/CacheConfigIntegrationTest.java | 3 +-
.../ClusterConfigurationServiceDUnitTest.java | 63 ++
.../internal/DlockAndTxlockRegressionTest.java | 1 -
.../InternalClusterConfigurationServiceTest.java | 206 +----
.../LocatorLoadSnapshotIntegrationTest.java | 1 -
.../internal/membership/InternalRoleJUnitTest.java | 2 -
.../membership/gms/GMSMemberJUnitTest.java | 1 -
.../membership/gms/MembershipManagerHelper.java | 1 -
.../gms/membership/GMSJoinLeaveJUnitTest.java | 2 -
.../gms/messenger/GMSEncryptJUnitTest.java | 9 -
.../membership/gms/messenger/InterceptUDP.java | 6 -
...ackwardCompatibilitySerializationDUnitTest.java | 10 -
.../internal/ClassNotFoundExceptionDUnitTest.java | 9 -
...alDataSerializerSerializationWhitelistTest.java | 1 -
.../remote/DistributionLocatorIdJUnitTest.java | 2 -
.../internal/cache/AbstractRegionMapTest.java | 229 ++++++
.../cache/BucketPersistenceAdvisorTest.java | 1 -
.../internal/cache/BucketRegionJUnitTest.java | 1 -
.../internal/cache/BucketRegionQueueHelper.java | 3 -
.../internal/cache/CacheAdvisorDUnitTest.java | 2 -
.../cache/CacheServerLauncherJUnitTest.java | 2 -
...tMessagesRegionCreationAndDestroyJUnitTest.java | 1 -
.../cache/ClientServerTransactionCCEDUnitTest.java | 6 -
.../ClusterConfigurationLoaderIntegrationTest.java | 92 ++-
.../geode/internal/cache/ColocationHelperTest.java | 8 -
.../geode/internal/cache/CommitFunction.java | 1 -
.../cache/ConcurrentDestroySubRegionDUnitTest.java | 8 -
...urrentFlushingAndRegionOperationsJUnitTest.java | 5 -
.../internal/cache/ConcurrentMapOpsDUnitTest.java | 1 -
.../cache/CustomerIDPartitionResolver.java | 3 -
.../internal/cache/DeltaFaultInDUnitTest.java | 4 -
.../internal/cache/DeltaPropagationDUnitTest.java | 3 -
.../cache/DeltaPropagationStatsDUnitTest.java | 12 -
.../geode/internal/cache/DeltaSizingDUnitTest.java | 8 -
.../geode/internal/cache/DiskIFJUnitTest.java | 6 -
.../DiskRandomOperationsAndRecoveryJUnitTest.java | 6 -
.../geode/internal/cache/DiskRegionProperties.java | 2 -
.../internal/cache/DiskRegionTestingBase.java | 1 -
.../internal/cache/DiskStoreFactoryJUnitTest.java | 1 -
.../internal/cache/DistributedCacheTestCase.java | 1 -
...victionAttributesMutatorImplRegressionTest.java | 73 ++
.../geode/internal/cache/FaultingInJUnitTest.java | 1 -
.../cache/FilterProfileConcurrencyTest.java | 3 -
.../FilterProfileNullCqBaseRegionJUnitTest.java | 1 -
.../internal/cache/FixedPRSinglehopDUnitTest.java | 3 -
.../geode/internal/cache/GIIDeltaDUnitTest.java | 8 -
.../internal/cache/GIIFlowControlDUnitTest.java | 6 -
.../cache/HAOverflowMemObjectSizerDUnitTest.java | 4 -
.../cache/InterruptClientServerDUnitTest.java | 1 -
.../geode/internal/cache/InterruptsDUnitTest.java | 1 -
.../geode/internal/cache/IteratorDUnitTest.java | 8 -
.../cache/JtaBeforeCompletionMessageTest.java | 1 -
.../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 1 -
.../LRUClearWithDiskRegionOpRegressionTest.java | 6 -
.../geode/internal/cache/LocalDataSetTest.java | 2 -
.../internal/cache/MapInterface2JUnitTest.java | 4 -
.../internal/cache/NestedTransactionFunction.java | 1 -
.../geode/internal/cache/OplogJUnitTest.java | 2 -
.../geode/internal/cache/PRBadToDataDUnitTest.java | 3 -
.../cache/PartitionAttributesImplJUnitTest.java | 1 -
.../cache/PartitionedRegionCreationJUnitTest.java | 2 -
.../PartitionedRegionDelayedRecoveryDUnitTest.java | 2 -
.../PartitionedRegionEntryCountDUnitTest.java | 2 -
.../PartitionedRegionInvalidateDUnitTest.java | 5 -
.../cache/PartitionedRegionQueryEvaluatorTest.java | 1 -
...nedRegionSingleHopWithServerGroupDUnitTest.java | 3 -
.../cache/PartitionedRegionStatsJUnitTest.java | 6 -
.../cache/PartitionedRegionTestHelper.java | 10 -
.../cache/PartitionedRegionTestUtilsDUnitTest.java | 9 -
.../internal/cache/RegionEntryFlagsJUnitTest.java | 3 -
.../cache/RemoteTransactionCCEDUnitTest.java | 3 -
.../internal/cache/RemoteTransactionDUnitTest.java | 13 -
.../geode/internal/cache/RollbackFunction.java | 1 -
.../geode/internal/cache/SizingFlagDUnitTest.java | 8 -
.../cache/StartServerWithXmlDUnitTest.java | 15 -
.../internal/cache/SystemFailureDUnitTest.java | 10 -
.../internal/cache/TXManagerImplJUnitTest.java | 3 -
.../org/apache/geode/internal/cache/TestUtils.java | 3 -
.../internal/cache/TombstoneCreationJUnitTest.java | 1 -
.../cache/TransactionsWithDeltaDUnitTest.java | 7 -
...ommitMessageBackwardCompatibilityDUnitTest.java | 1 -
.../org/apache/geode/internal/cache/UnzipUtil.java | 2 -
.../internal/cache/UpdateVersionJUnitTest.java | 3 -
.../control/MemoryMonitorOffHeapJUnitTest.java | 2 -
.../cache/control/RebalanceOperationDUnitTest.java | 16 -
...skRegionOverflowAsyncRollingOpLogJUnitTest.java | 2 -
...iskRegionOverflowSyncRollingOpLogJUnitTest.java | 5 -
.../cache/eviction/AbstractEvictionListTest.java | 2 -
.../eviction/EvictionObjectSizerDUnitTest.java | 2 -
.../cache/eviction/OffHeapEvictionDUnitTest.java | 2 -
.../eviction/TransactionsWithOverflowTest.java | 1 -
.../cache/execute/CustomerIDPartitionResolver.java | 3 -
.../cache/execute/FunctionServiceClientBase.java | 1 -
.../FunctionServicePeerAccessorPRDUnitTest.java | 9 -
...vicePeerAccessorPRMultipleMembersDUnitTest.java | 9 -
.../execute/LocalDataSetIndexingDUnitTest.java | 4 -
.../execute/MemberFunctionExecutionDUnitTest.java | 7 -
.../MultiRegionFunctionExecutionDUnitTest.java | 4 -
.../execute/MyFunctionExecutionException.java | 4 -
.../cache/execute/MyTransactionFunction.java | 4 -
...lientServerFunctionExecutionNoAckDUnitTest.java | 10 -
...ientServerRegionFunctionExecutionDUnitTest.java | 1 -
...egionFunctionExecutionNoSingleHopDUnitTest.java | 2 -
...rRegionFunctionExecutionSingleHopDUnitTest.java | 2 -
.../cache/execute/PRColocationDUnitTest.java | 4 -
.../cache/execute/PRTransactionDUnitTest.java | 1 -
.../PRTransactionWithSizeOperationDUnitTest.java | 2 -
.../PRTransactionWithVersionsDUnitTest.java | 3 -
.../geode/internal/cache/execute/PerfFunction.java | 2 -
.../internal/cache/execute/PerfTxFunction.java | 1 -
.../execute/SingleHopGetAllPutAllDUnitTest.java | 2 -
.../geode/internal/cache/execute/data/CustId.java | 3 -
.../internal/cache/execute/data/Customer.java | 3 -
.../geode/internal/cache/execute/data/Order.java | 3 -
.../geode/internal/cache/execute/data/OrderId.java | 3 -
.../internal/cache/execute/data/Shipment.java | 3 -
.../internal/cache/execute/data/ShipmentId.java | 3 -
.../mock/AlterMockCacheExtensionFunction.java | 3 -
.../mock/AlterMockRegionExtensionFunction.java | 4 -
.../mock/CreateMockCacheExtensionFunction.java | 3 -
.../mock/CreateMockRegionExtensionFunction.java | 4 -
.../mock/DestroyMockCacheExtensionFunction.java | 3 -
.../mock/DestroyMockRegionExtensionFunction.java | 3 -
.../extension/mock/MockExtensionCommands.java | 1 -
.../cache/functions/LocalDataSetFunction.java | 2 -
.../ha/BlockingHARQAddOperationJUnitTest.java | 12 -
.../cache/ha/BlockingHARQStatsJUnitTest.java | 8 -
.../cache/ha/BlockingHARegionJUnitTest.java | 1 -
.../geode/internal/cache/ha/Bug48571DUnitTest.java | 1 -
.../geode/internal/cache/ha/ConflatableObject.java | 1 -
.../cache/ha/EventIdOptimizationJUnitTest.java | 1 -
.../internal/cache/ha/HAConflationDUnitTest.java | 4 -
.../geode/internal/cache/ha/HAExpiryDUnitTest.java | 2 -
.../cache/ha/HARQAddOperationJUnitTest.java | 1 -
.../geode/internal/cache/ha/HARegionDUnitTest.java | 10 -
.../internal/cache/ha/HARegionQueueDUnitTest.java | 1 -
.../cache/ha/HARegionQueueStatsJUnitTest.java | 9 -
.../geode/internal/cache/ha/HARegionQueueTest.java | 4 -
.../geode/internal/cache/ha/PutAllDUnitTest.java | 1 -
.../geode/internal/cache/ha/StatsBugDUnitTest.java | 1 -
.../cache/ha/TestBlockingHARegionQueue.java | 4 -
.../cache/locks/TXLockServiceDUnitTest.java | 1 -
.../internal/cache/map/RegionMapDestroyTest.java | 2 -
.../cache/partitioned/Bug39356DUnitTest.java | 3 -
.../cache/partitioned/Bug51400DUnitTest.java | 3 -
.../cache/partitioned/ElidedPutAllDUnitTest.java | 6 -
.../partitioned/PartitionResolverDUnitTest.java | 8 -
.../PartitionedRegionLoaderWriterDUnitTest.java | 5 -
.../PartitionedRegionMetaDataCleanupDUnitTest.java | 5 -
...sistentColocatedPartitionedRegionDUnitTest.java | 11 -
.../PersistentPartitionedRegionDUnitTest.java | 6 -
...sistentPartitionedRegionOldConfigDUnitTest.java | 3 -
.../StreamingPartitionOperationManyDUnitTest.java | 2 -
.../StreamingPartitionOperationOneDUnitTest.java | 2 -
.../fixed/FixedPartitioningDUnitTest.java | 2 -
.../fixed/FixedPartitioningTestBase.java | 1 -
.../fixed/FixedPartitioningTestBaseJUnitTest.java | 2 -
...oningWithColocationAndPersistenceDUnitTest.java | 2 -
.../PartitionedRegionLoadModelJUnitTest.java | 3 -
.../PersistentRecoveryOrderDUnitTest.java | 6 -
.../PersistentRecoveryOrderOldConfigDUnitTest.java | 8 -
.../rollingupgrade/RollingUpgrade2DUnitTest.java | 1 -
.../cache/snapshot/GFSnapshotDUnitTest.java | 1 -
.../cache/tier/sockets/AcceptorImplDUnitTest.java | 1 -
.../CacheServerTransactionsSelectorDUnitTest.java | 3 -
.../tier/sockets/ClientConflationDUnitTest.java | 2 -
.../sockets/ClientInterestNotifyDUnitTest.java | 2 -
.../ClientProxyWithDeltaDistributedTest.java | 1 -
.../tier/sockets/ClientServerMiscDUnitTest.java | 2 -
.../cache/tier/sockets/ConflationDUnitTest.java | 6 -
.../DataSerializerPropagationDUnitTest.java | 12 +-
.../sockets/DurableClientQueueSizeDUnitTest.java | 1 -
.../internal/cache/tier/sockets/FaultyDelta.java | 2 -
.../sockets/ForceInvalidateEvictionDUnitTest.java | 5 -
.../tier/sockets/HAInterestPart1DUnitTest.java | 2 -
.../tier/sockets/HAInterestPart2DUnitTest.java | 1 -
.../sockets/InterestListEndpointPRDUnitTest.java | 3 -
.../InterestListEndpointSelectorDUnitTest.java | 3 -
.../sockets/InterestResultPolicyDUnitTest.java | 1 -
.../cache/tier/sockets/MessageJUnitTest.java | 4 -
.../tier/sockets/NewRegionAttributesDUnitTest.java | 1 -
.../sockets/RegisterInterestKeysDUnitTest.java | 3 -
.../sockets/RegisterInterestKeysPRDUnitTest.java | 3 -
.../tier/sockets/ReliableMessagingDUnitTest.java | 1 -
.../cache/tier/sockets/ServerConnectionTest.java | 12 -
.../tier/sockets/UnregisterInterestDUnitTest.java | 8 -
.../sockets/command/ExecuteFunction65Test.java | 1 -
.../tier/sockets/command/ExecuteFunctionTest.java | 1 -
.../GetClientPartitionAttributesCommandTest.java | 1 -
.../cache/tx/RemoteFetchEntryMessageTest.java | 1 -
.../cache/tx/RemoteOperationMessageTest.java | 1 -
.../internal/cache/tx/RemotePutAllMessageTest.java | 1 -
.../internal/cache/tx/RemotePutMessageTest.java | 69 ++
.../cache/tx/RemoteRemoveAllMessageTest.java | 1 -
.../versions/RegionVersionHolderJUnitTest.java | 3 -
.../RegionVersionVectorIntegrationTest.java | 1 -
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 3 +
.../AsyncEventQueueValidationsJUnitTest.java | 3 -
.../ConcurrentAsyncEventQueueDUnitTest.java | 3 -
.../CommonParallelAsyncEventQueueDUnitTest.java | 3 -
.../ParallelGatewaySenderQueueJUnitTest.java | 5 -
.../CompressionCacheListenerDUnitTest.java | 2 -
.../CompressionRegionConfigDUnitTest.java | 4 -
.../CompressionRegionFactoryDUnitTest.java | 2 -
.../compression/CompressionStatsDUnitTest.java | 2 -
.../geode/internal/config/JAXBServiceTest.java | 226 ++++++
.../datasource/ConnectionPoolingJUnitTest.java | 4 -
.../org/apache/geode/internal/jta/CacheUtils.java | 3 -
.../org/apache/geode/internal/jta/JTAUtils.java | 4 -
.../org/apache/geode/internal/jta/SyncImpl.java | 2 -
.../internal/jta/TransactionImplJUnitTest.java | 2 -
.../internal/jta/UserTransactionImplJUnitTest.java | 2 -
.../internal/net/SSLSocketIntegrationTest.java | 1 -
.../geode/internal/net/SocketCreatorJUnitTest.java | 1 -
.../MemoryAllocatorFillPatternIntegrationTest.java | 2 -
.../MemoryAllocatorFillPatternJUnitTest.java | 3 -
.../offheap/OffHeapLRURecoveryRegressionTest.java | 1 -
.../internal/offheap/TinyMemoryBlockJUnitTest.java | 2 -
.../geode/internal/process/lang/AvailablePid.java | 1 -
.../geode/internal/size/ObjectTraverserPerf.java | 3 -
.../StatTypesAreRolledOverRegressionTest.java | 3 -
.../internal/stats50/AtomicStatsJUnitTest.java | 4 -
.../geode/internal/util/PluckStacksDUnitTest.java | 5 -
.../geode/internal/util/PluckStacksUnitTest.java | 17 -
.../org/apache/geode/management/MBeanUtil.java | 14 -
.../management/RegionManagementDUnitTest.java | 1 -
.../bean/stats/AsyncEventQueueStatsJUnitTest.java | 4 -
.../bean/stats/CacheServerStatsJUnitTest.java | 2 -
.../management/bean/stats/DiskStatsJUnitTest.java | 2 -
.../bean/stats/GatewayMBeanBridgeJUnitTest.java | 2 -
.../bean/stats/GatewayReceiverStatsJUnitTest.java | 3 -
.../bean/stats/MemberLevelStatsJUnitTest.java | 2 -
.../internal/cli/CommandManagerJUnitTest.java | 4 -
.../cli/commands/AlterRegionCommandDUnitTest.java | 1 -
.../commands/CreateDefinedIndexesCommandTest.java | 8 +-
.../cli/commands/CreateIndexCommandTest.java | 14 +-
.../cli/commands/CreateRegionCommandTest.java | 22 +-
.../DescribeJndiBindingCommandDUnitTest.java | 2 +-
.../cli/commands/DescribeRegionDUnitTest.java | 66 +-
.../commands/DescribeRegionIntegrationTest.java | 1 -
.../cli/commands/DescribeRegionJUnitTest.java | 56 +-
.../commands/DestroyJndiBindingCommandTest.java | 5 +
.../cli/commands/ListGatewayCommandTest.java | 106 +++
.../commands/ListJndiBindingCommandDUnitTest.java | 16 +-
.../cli/commands/ListRegionIntegrationTest.java | 1 -
.../cli/commands/ShowMetricsJUnitTest.java | 6 +-
.../GfshStatusCommandsIntegrationTest.java | 8 +-
.../cli/functions/RegionFunctionArgsTest.java | 1 -
.../ShowMissingDiskStoresFunctionJUnitTest.java | 1 -
.../functions/SizeExportLogsFunctionFileTest.java | 2 -
.../internal/cli/result/ResultBuilderTest.java | 93 ++-
.../internal/cli/util/HyphenFormatterTest.java | 2 -
.../internal/cli/util/LogFilterTest.java | 1 -
.../ClusterConfigImportDUnitTest.java | 6 +-
.../ClusterConfigLocatorRestartDUnitTest.java | 1 -
.../configuration/EventTestCacheWriter.java | 2 -
.../domain/CacheElementJUnitTest.java | 1 -
.../GetClusterConfigurationFunctionTest.java | 128 ++++
.../utils/XmlUtilsAddNewNodeJUnitTest.java | 11 -
.../configuration/utils/XmlUtilsJUnitTest.java | 3 -
.../internal/pulse/TestFunctionsDUnitTest.java | 2 -
.../internal/pulse/TestHeapDUnitTest.java | 2 -
.../internal/pulse/TestLocatorsDUnitTest.java | 2 -
.../security/GfshCommandsSecurityTest.java | 10 +-
.../internal/security/MultiGfshDUnitTest.java | 2 +-
.../internal/security/TestFunctions.java | 1 -
.../org/apache/geode/management/model/Item.java | 11 -
.../org/apache/geode/management/model/Order.java | 13 -
.../memcached/GemcachedBinaryClientJUnitTest.java | 6 -
.../geode/pdx/AutoSerializableJUnitTest.java | 2 -
.../org/apache/geode/pdx/ByteSourceJUnitTest.java | 1 -
.../java/org/apache/geode/pdx/DSInsidePdx.java | 1 -
.../geode/pdx/JSONPdxClientServerDUnitTest.java | 2 -
.../test/java/org/apache/geode/pdx/NestedPdx.java | 1 -
.../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 3 -
.../apache/geode/pdx/PdxAttributesJUnitTest.java | 5 -
.../apache/geode/pdx/PdxClientServerDUnitTest.java | 1 -
.../geode/pdx/PdxDeserializationDUnitTest.java | 7 -
.../java/org/apache/geode/pdx/PdxInsideDS.java | 1 -
.../org/apache/geode/pdx/PdxInstanceJUnitTest.java | 3 -
.../org/apache/geode/pdx/PdxStringJUnitTest.java | 1 -
.../apache/geode/pdx/PdxTypeExportDUnitTest.java | 2 -
.../apache/geode/pdx/SeparateClassloaderPdx.java | 1 -
.../java/org/apache/geode/pdx/SimpleClass1.java | 1 -
.../java/org/apache/geode/pdx/SimpleClass2.java | 3 -
.../geode/pdx/internal/MultipleCacheJUnitTest.java | 4 -
.../java/org/apache/geode/redis/AuthJUnitTest.java | 1 -
.../apache/geode/redis/ConcurrentStartTest.java | 1 -
.../org/apache/geode/redis/HashesJUnitTest.java | 1 -
.../org/apache/geode/redis/ListsJUnitTest.java | 1 -
.../apache/geode/redis/SortedSetsJUnitTest.java | 1 -
.../org/apache/geode/redis/StringsJunitTest.java | 1 -
.../apache/geode/security/SecurityTestUtil.java | 1 -
.../geode/security/SimpleSecurityManagerTest.java | 1 -
...tionedQuerySecurityAllowedQueriesDUnitTest.java | 1 -
...nedQuerySecurityRestrictedQueriesDUnitTest.java | 1 -
.../QuerySecurityRestrictedQueriesDUnitTest.java | 9 -
...rityRetrictedButMethodsDoNotExistDUnitTest.java | 1 -
.../geode/security/query/UserPermissions.java | 8 -
.../apache/geode/sequence/DefaultLineMapper.java | 1 -
.../geode/sequence/GemfireSequenceDisplay.java | 8 -
.../org/apache/geode/sequence/HydraLineMapper.java | 4 -
.../java/org/apache/geode/sequence/Lifeline.java | 2 -
.../org/apache/geode/sequence/SequenceDiagram.java | 7 -
.../apache/geode/test/dunit/DUnitBlackboard.java | 2 -
.../geode/test/dunit/DistributedTestUtils.java | 1 -
.../java/org/apache/geode/test/dunit/Jitter.java | 1 -
.../dunit/internal/InternalBlackboardImpl.java | 1 -
.../test/dunit/rules/CleanupDUnitVMsRule.java | 1 -
.../geode/test/dunit/standalone/ChildVM.java | 3 -
.../test/dunit/standalone/ProcessManager.java | 3 -
.../apache/geode/test/golden/GoldenTestCase.java | 2 -
.../geode/test/junit/rules/GfshCommandRule.java | 13 +-
.../java/parReg/query/unittest/NewPortfolio.java | 3 -
geode-core/src/test/java/util/TestException.java | 1 -
.../codeAnalysis/sanctionedDataSerializables.txt | 4 +-
.../geode/cache/client/internal/CloseCQOp.java | 3 -
.../geode/cache/client/internal/CreateCQOp.java | 4 -
.../cache/client/internal/CreateCQWithIROp.java | 4 -
.../cache/client/internal/GetDurableCQsOp.java | 3 -
.../geode/cache/client/internal/StopCQOp.java | 3 -
.../cache/query/internal/cq/ClientCQImpl.java | 1 -
.../cache/query/internal/cq/ServerCQImpl.java | 1 -
.../geode/internal/CQDistributedSystemService.java | 1 -
.../cache/tier/sockets/command/CloseCQ.java | 1 -
.../cache/tier/sockets/command/ExecuteCQ61.java | 1 -
.../cache/query/cq/dunit/CqDataDUnitTest.java | 14 -
.../cq/dunit/CqDataOptimizedExecuteDUnitTest.java | 3 -
.../CqDataUsingPoolOptimizedExecuteDUnitTest.java | 3 -
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 9 -
.../query/cq/dunit/CqPerfUsingPoolDUnitTest.java | 9 -
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 20 -
.../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java | 2 -
.../CqQueryUsingPoolOptimizedExecuteDUnitTest.java | 3 -
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 13 -
...esultSetUsingPoolOptimizedExecuteDUnitTest.java | 4 -
...curityPartitionedUnauthorizedUserDUnitTest.java | 8 -
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 2 -
.../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java | 4 -
.../query/cq/dunit/CqStatsUsingPoolDUnitTest.java | 2 -
.../cache/query/cq/dunit/CqTimeTestListener.java | 3 -
...onedRegionCqQueryOptimizedExecuteDUnitTest.java | 2 -
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 1 -
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 3 -
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 2 -
.../query/dunit/QueryIndexUpdateRIDUnitTest.java | 10 -
.../cache/query/dunit/QueryMonitorDUnitTest.java | 1 -
.../internal/cache/ha/CQListGIIDUnitTest.java | 1 -
.../tier/sockets/DurableClientSimpleDUnitTest.java | 1 -
.../cache/tier/sockets/DurableClientTestCase.java | 5 -
.../tier/sockets/command/ExecuteCQ61Test.java | 1 -
.../management/CacheServerManagementDUnitTest.java | 10 -
.../management/internal/pulse/TestCQDUnitTest.java | 2 -
.../internal/pulse/TestClientsDUnitTest.java | 2 -
.../internal/pulse/TestServerDUnitTest.java | 2 -
.../geode/test/dunit/rules/CQUnitTestRule.java | 2 -
.../gfsh/command-pages/create.html.md.erb | 2 +-
.../gfsh/command-pages/destroy.html.md.erb | 30 +
.../gfsh/command-pages/list.html.md.erb | 39 +
.../apache/geode/experimental/driver/Driver.java | 1 -
.../geode/experimental/driver/DriverFactory.java | 1 -
.../geode/experimental/driver/ProtobufDriver.java | 1 -
.../geode/experimental/driver/ProtobufRegion.java | 1 -
.../apache/geode/experimental/driver/Region.java | 9 -
.../geode/experimental/driver/ValueSerializer.java | 1 -
.../driver/AllTypesJavaSerializer.java | 8 -
.../driver/FunctionServiceIntegrationTest.java | 1 -
.../experimental/driver/IntegrationTestBase.java | 7 -
.../driver/QueryServiceIntegrationTest.java | 1 -
.../experimental/driver/RegionIntegrationTest.java | 2 -
.../driver/ValueSerializerIntegrationTest.java | 3 -
.../apache/geode/test/compiler/ClassBuilder.java | 1 -
.../apache/geode/test/junit/rules/RuleList.java | 1 -
.../geode/test/junit/rules/gfsh/GfshExecution.java | 2 -
.../apache/geode/test/compiler/JarBuilderTest.java | 1 -
.../geode/test/compiler/JavaCompilerTest.java | 1 -
.../geode/cache/lucene/LuceneQueryFactory.java | 4 -
.../geode/cache/lucene/LuceneSerializer.java | 2 -
.../apache/geode/cache/lucene/LuceneService.java | 1 -
.../lucene/internal/IndexRepositoryFactory.java | 1 -
.../internal/LuceneIndexCreationProfile.java | 1 -
.../internal/LuceneIndexForPartitionedRegion.java | 3 +-
.../lucene/internal/LuceneRegionListener.java | 1 -
.../cache/lucene/internal/LuceneServiceImpl.java | 3 +-
.../internal/PartitionedRepositoryManager.java | 2 +-
.../lucene/internal/distributed/TopEntries.java | 1 -
.../internal/filesystem/SeekableInputStream.java | 1 -
.../internal/repository/IndexRepository.java | 6 -
.../internal/repository/IndexRepositoryImpl.java | 1 -
.../serializer/HeterogeneousLuceneSerializer.java | 2 -
.../internal/xml/LuceneIndexXmlGenerator.java | 5 -
.../lucene/FlatFormatSerializerJUnitTest.java | 1 -
.../apache/geode/cache/lucene/LocalCacheRule.java | 1 -
.../lucene/LuceneClientSecurityDUnitTest.java | 19 +-
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 64 ++
.../lucene/LuceneCommandsSecurityDUnitTest.java | 8 +-
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 64 ++
.../apache/geode/cache/lucene/LuceneDUnitTest.java | 1 -
.../cache/lucene/LuceneIndexCreationDUnitTest.java | 14 +-
.../geode/cache/lucene/LuceneIntegrationTest.java | 1 -
.../NestedObjectSeralizerIntegrationTest.java | 2 -
.../internal/LuceneEventListenerJUnitTest.java | 1 -
.../LuceneIndexForPartitionedRegionTest.java | 4 +-
.../LuceneIndexRecoveryHAIntegrationTest.java | 1 -
.../PartitionedRepositoryManagerJUnitTest.java | 2 -
.../RawLuceneRepositoryManagerJUnitTest.java | 1 -
.../internal/cli/LuceneIndexCommandsJUnitTest.java | 1 -
...neIndexCommandsWithReindexAllowedDUnitTest.java | 1 -
.../LuceneListIndexFunctionJUnitTest.java | 1 -
.../repository/IndexRepositoryImplJUnitTest.java | 3 -
.../IndexRepositoryImplPerformanceTest.java | 1 -
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 3 -
.../LuceneIndexXmlParserIntegrationJUnitTest.java | 1 -
.../apache/geode/cache/lucene/test/Customer.java | 1 -
.../cache/lucene/test/LuceneTestSerializer.java | 3 -
.../org/apache/geode/cache/lucene/test/Person.java | 2 -
.../execute/EmtpyRegionFunctionException.java | 1 -
.../gemfire/cache/execute/FunctionException.java | 5 -
.../internal/protocol/protobuf/v1/Failure.java | 2 -
.../protocol/protobuf/v1/ProtobufOpsProcessor.java | 6 +-
.../protobuf/v1/ProtobufProtocolService.java | 2 -
.../protobuf/v1/ProtobufStreamProcessor.java | 2 +-
.../protobuf/v1/ServerMessageExecutionContext.java | 1 -
.../v1/authentication/AuthorizingCache.java | 2 -
.../operations/ClearRequestOperationHandler.java | 6 -
...cuteFunctionOnGroupRequestOperationHandler.java | 8 -
.../GetRegionNamesRequestOperationHandler.java | 2 -
.../v1/operations/GetRequestOperationHandler.java | 4 -
.../operations/GetSizeRequestOperationHandler.java | 3 -
.../v1/operations/KeySetOperationHandler.java | 8 -
.../PutIfAbsentRequestOperationHandler.java | 5 -
.../v1/operations/PutRequestOperationHandler.java | 3 -
.../operations/RemoveRequestOperationHandler.java | 2 -
.../registry/ProtobufOperationContextRegistry.java | 1 -
.../protobuf/v1/state/ConnectionState.java | 1 -
.../protobuf/v1/state/RequireAuthentication.java | 5 -
.../protocol/serialization/ValueSerializer.java | 2 -
.../internal/protocol/TestExecutionContext.java | 2 -
.../protobuf/ProtobufStreamProcessorTest.java | 1 -
.../internal/protocol/protobuf/v1/MessageUtil.java | 1 -
.../v1/ProtocolVersionIntegrationTest.java | 1 -
.../protobuf/v1/TestSerializeAllSerializer.java | 7 -
.../v1/acceptance/CacheOperationsJUnitTest.java | 1 -
.../LocatorConnectionAuthenticationDUnitTest.java | 1 -
.../ClearRequestOperationHandlerJUnitTest.java | 9 -
...ionOnGroupRequestOperationHandlerJUnitTest.java | 5 -
...onOnMemberRequestOperationHandlerJUnitTest.java | 5 -
...onOnRegionRequestOperationHandlerJUnitTest.java | 7 -
.../GetAllRequestOperationHandlerJUnitTest.java | 3 -
.../GetRequestOperationHandlerJUnitTest.java | 4 -
.../GetServerOperationHandlerJUnitTest.java | 1 -
.../GetSizeRequestOperationHandlerJUnitTest.java | 3 -
.../KeySetOperationHandlerJUnitTest.java | 8 -
.../v1/operations/OperationHandlerJUnitTest.java | 1 -
.../OqlQueryRequestOperationHandlerJUnitTest.java | 1 -
...utIfAbsentRequestOperationHandlerJUnitTest.java | 1 -
.../RemoveRequestOperationHandlerJUnitTest.java | 2 -
.../internal/controllers/PulseController.java | 3 -
.../geode/tools/pulse/internal/data/Cluster.java | 17 -
.../tools/pulse/internal/data/DataBrowser.java | 1 -
.../service/ClusterMembersRGraphService.java | 5 -
.../internal/service/ClusterRegionService.java | 1 -
.../internal/service/ClusterRegionsService.java | 1 -
.../service/ClusterSelectedRegionService.java | 1 -
.../internal/service/SystemAlertsService.java | 1 -
.../tools/pulse/internal/util/ConnectionUtil.java | 4 -
.../geode/tools/pulse/internal/util/TimeUtils.java | 2 -
geode-pulse/src/main/webapp/META-INF/NOTICE | 2 +-
.../tools/pulse/tests/junit/BaseServiceTest.java | 1 -
.../geode/tools/pulse/tests/ui/PulseBase.java | 3 -
.../geode/cache/client/internal/SenderProxy.java | 2 -
.../client/internal/locator/wan/LocatorHelper.java | 14 -
.../locator/wan/LocatorMembershipListenerImpl.java | 2 -
.../locator/wan/RemoteLocatorJoinRequest.java | 1 -
.../locator/wan/RemoteLocatorJoinResponse.java | 1 -
.../locator/wan/RemoteLocatorPingRequest.java | 5 -
.../locator/wan/RemoteLocatorPingResponse.java | 3 -
.../internal/locator/wan/RemoteLocatorRequest.java | 4 -
.../locator/wan/RemoteLocatorResponse.java | 4 -
.../locator/wan/WanLocatorDiscovererImpl.java | 4 -
.../internal/WANDistributedSystemService.java | 1 -
.../wan/GatewaySenderEventRemoteDispatcher.java | 2 -
.../cache/wan/GatewaySenderFactoryImpl.java | 1 -
...currentParallelGatewaySenderEventProcessor.java | 1 -
.../RemoteParallelGatewaySenderEventProcessor.java | 2 -
.../cache/wan/serial/SerialGatewaySenderImpl.java | 1 -
.../cache/wan/AckReaderThreadJUnitTest.java | 2 -
...ueueOverflowMBeanAttributesDistributedTest.java | 1 -
.../wan/GatewayReceiverFactoryImplJUnitTest.java | 1 -
.../cache/wan/GatewayReceiverImplJUnitTest.java | 1 -
...atewaySenderEventRemoteDispatcherJUnitTest.java | 1 -
.../geode/internal/cache/wan/WANTestBase.java | 5 -
.../ConcurrentParallelGatewaySenderDUnitTest.java | 7 -
...rrentParallelGatewaySenderOffHeapDUnitTest.java | 3 -
...ParallelGatewaySenderOperation_1_DUnitTest.java | 6 -
...ParallelGatewaySenderOperation_2_DUnitTest.java | 5 -
...rentSerialGatewaySenderOperationsDUnitTest.java | 6 -
...ialGatewaySenderOperationsOffHeapDUnitTest.java | 3 -
.../ConcurrentWANPropagation_1_DUnitTest.java | 10 -
.../ConcurrentWANPropagation_2_DUnitTest.java | 3 -
.../misc/CommonParallelGatewaySenderDUnitTest.java | 5 -
...ommonParallelGatewaySenderOffHeapDUnitTest.java | 3 -
.../NewWANConcurrencyCheckForDestroyDUnitTest.java | 2 -
.../cache/wan/misc/PDXNewWanDUnitTest.java | 5 -
...atedRegion_ParallelWANPropagationDUnitTest.java | 3 -
.../cache/wan/misc/WANConfigurationJUnitTest.java | 2 -
.../cache/wan/misc/WanAutoDiscoveryDUnitTest.java | 4 -
.../cache/wan/misc/WanValidationsDUnitTest.java | 16 +-
...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 -
...lGatewaySenderOperation_2_OffHeapDUnitTest.java | 3 -
...GatewaySenderQueueOverflowOffHeapDUnitTest.java | 3 -
.../ParallelWANConflationOffHeapDUnitTest.java | 3 -
...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 -
...ANPropagationConcurrentOpsOffHeapDUnitTest.java | 3 -
.../ParallelWANPropagationOffHeapDUnitTest.java | 3 -
.../SerialGatewaySenderQueueOffHeapDUnitTest.java | 3 -
...stenceEnabledGatewaySenderOffHeapDUnitTest.java | 3 -
...ParallelGatewaySenderOperation_2_DUnitTest.java | 3 -
.../parallel/ParallelWANConflationDUnitTest.java | 6 -
...ANPersistenceEnabledGatewaySenderDUnitTest.java | 3 -
...arallelWANPropagationClientServerDUnitTest.java | 1 -
...rallelWANPropagationConcurrentOpsDUnitTest.java | 5 -
.../parallel/ParallelWANPropagationDUnitTest.java | 8 -
.../ParallelWANPropagationLoopBackDUnitTest.java | 2 -
.../wan/parallel/ParallelWANStatsDUnitTest.java | 2 -
.../cache/wan/serial/GatewayReceiverDUnitTest.java | 4 -
...lGatewaySenderDistributedDeadlockDUnitTest.java | 2 -
.../SerialGatewaySenderEventListenerDUnitTest.java | 1 -
.../SerialGatewaySenderOperationsDUnitTest.java | 7 +-
.../serial/SerialGatewaySenderQueueDUnitTest.java | 3 -
.../wan/serial/SerialWANConflationDUnitTest.java | 3 -
...ANPersistenceEnabledGatewaySenderDUnitTest.java | 5 -
.../SerialWANPropagationLoopBackDUnitTest.java | 3 -
...lWANPropagation_PartitionedRegionDUnitTest.java | 3 -
.../SerialWANPropagationsFeatureDUnitTest.java | 2 -
.../cache/wan/serial/SerialWANStatsDUnitTest.java | 2 -
.../WANClusterConfigurationDUnitTest.java | 391 ++++++++++
.../web/controllers/support/RegionEntryData.java | 19 -
geode-web-api/src/main/webapp/META-INF/NOTICE | 2 +-
.../commands/ShutdownCommandOverHttpDUnitTest.java | 1 -
gradle.properties | 2 +-
gradle/dependency-versions.properties | 4 +-
gradle/spotless.gradle | 2 +
gradle/test.gradle | 20 +-
1609 files changed, 5651 insertions(+), 9942 deletions(-)
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigBuilder.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMappingBuilder.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java
create mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorService.java
create mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/package-info.java
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGenerator.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigBuilderTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingBuilderTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandIntegrationTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandIntegrationTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorTest.java
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
create mode 100644 geode-core/src/main/java/org/apache/geode/cache/configuration/package-info.java
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/map/RegionMapPutContext.java
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/config/JAXBService.java
create mode 100644 geode-core/src/test/java/org/apache/geode/distributed/internal/ClusterConfigurationServiceDUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/EvictionAttributesMutatorImplRegressionTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/tx/RemotePutMessageTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/config/JAXBServiceTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/configuration/functions/GetClusterConfigurationFunctionTest.java
create mode 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java
create mode 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.
[geode] 01/01: GEODE-4647: add a stats eventSecondaryQueueSizeId to
track events in secondary gateway sender queue
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-4647
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 613aae452a8e3067bd85a77fdfce6b963b9e23e3
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Wed Feb 21 21:31:07 2018 -0800
GEODE-4647: add a stats eventSecondaryQueueSizeId to track events in secondary
gateway sender queue
---
.../asyncqueue/internal/AsyncEventQueueStats.java | 3 +
.../internal/cache/AbstractBucketRegionQueue.java | 8 ++
.../geode/internal/cache/AbstractRegionMap.java | 12 ++
.../apache/geode/internal/cache/BucketAdvisor.java | 2 +
.../geode/internal/cache/BucketRegionQueue.java | 2 +
.../internal/cache/wan/AbstractGatewaySender.java | 1 +
.../internal/cache/wan/GatewaySenderStats.java | 61 +++++++++
.../wan/parallel/ParallelGatewaySenderQueue.java | 8 +-
.../wan/parallel/ParallelQueueRemovalMessage.java | 3 +
.../SerialAsyncEventQueueImplJUnitTest.java | 3 +
.../cache/wan/AsyncEventQueueTestBase.java | 18 ++-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 8 +-
.../asyncqueue/AsyncEventQueueStatsDUnitTest.java | 48 +++++--
.../ParallelQueueRemovalMessageJUnitTest.java | 12 ++
.../bean/stats/AsyncEventQueueStatsJUnitTest.java | 2 -
.../geode/internal/cache/wan/WANTestBase.java | 79 +++++++++--
.../parallel/ParallelWANConflationDUnitTest.java | 56 ++++++--
.../wan/parallel/ParallelWANStatsDUnitTest.java | 150 +++++++++++++++++++++
.../serial/SerialGatewaySenderQueueDUnitTest.java | 12 +-
.../wan/serial/SerialWANConflationDUnitTest.java | 73 +++++++++-
.../wan/serial/SerialWANPropagationDUnitTest.java | 1 +
21 files changed, 517 insertions(+), 45 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
index 2f3029a..8d68cee 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/AsyncEventQueueStats.java
@@ -42,6 +42,8 @@ public class AsyncEventQueueStats extends GatewaySenderStats {
f.createLongCounter(EVENT_QUEUE_TIME, "Total time spent queueing events.",
"nanoseconds"),
f.createIntGauge(EVENT_QUEUE_SIZE, "Size of the event queue.", "operations", false),
+ f.createIntGauge(EVENT_SECONDARY_QUEUE_SIZE, "Size of the secondary event queue.",
+ "operations", false),
f.createIntGauge(TMP_EVENT_QUEUE_SIZE, "Size of the temporary events queue.",
"operations", false),
f.createIntCounter(EVENTS_NOT_QUEUED_CONFLATED,
@@ -108,6 +110,7 @@ public class AsyncEventQueueStats extends GatewaySenderStats {
eventsNotQueuedConflatedId = type.nameToId(EVENTS_NOT_QUEUED_CONFLATED);
eventQueueTimeId = type.nameToId(EVENT_QUEUE_TIME);
eventQueueSizeId = type.nameToId(EVENT_QUEUE_SIZE);
+ eventSecondaryQueueSizeId = type.nameToId(EVENT_SECONDARY_QUEUE_SIZE);
eventTmpQueueSizeId = type.nameToId(TMP_EVENT_QUEUE_SIZE);
eventsDistributedId = type.nameToId(EVENTS_DISTRIBUTED);
eventsExceedingAlertThresholdId = type.nameToId(EVENTS_EXCEEDING_ALERT_THRESHOLD);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index af62f74..2406b18 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -220,6 +220,10 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
this.gatewaySenderStats.decQueueSize(size);
}
+ public void decSecondaryQueueSize(int size) {
+ this.gatewaySenderStats.decSecondaryQueueSize(size);
+ }
+
public void decQueueSize() {
this.gatewaySenderStats.decQueueSize();
}
@@ -228,6 +232,10 @@ public abstract class AbstractBucketRegionQueue extends BucketRegion {
this.gatewaySenderStats.incQueueSize(size);
}
+ public void incSecondaryQueueSize(int size) {
+ this.gatewaySenderStats.incSecondaryQueueSize(size);
+ }
+
public void incQueueSize() {
this.gatewaySenderStats.incQueueSize();
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 2c57182..0b2e68c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -635,6 +635,10 @@ public abstract class AbstractRegionMap
tombstones.put(tag, newRe);
} else {
_getOwner().updateSizeOnCreate(key, _getOwner().calculateRegionEntryValueSize(newRe));
+ if (_getOwner() instanceof BucketRegionQueue) {
+ BucketRegionQueue brq = (BucketRegionQueue) _getOwner();
+ brq.incSecondaryQueueSize(1);
+ }
}
incEntryCount(1);
lruEntryUpdate(newRe);
@@ -660,6 +664,10 @@ public abstract class AbstractRegionMap
} else {
_getOwner().updateSizeOnCreate(re.getKey(),
_getOwner().calculateRegionEntryValueSize(re));
+ if (_getOwner() instanceof BucketRegionQueue) {
+ BucketRegionQueue brq = (BucketRegionQueue) _getOwner();
+ brq.incSecondaryQueueSize(1);
+ }
}
}
incEntryCount(size());
@@ -1043,6 +1051,10 @@ public abstract class AbstractRegionMap
} finally {
if (done && result) {
initialImagePutEntry(newRe);
+ if (owner instanceof BucketRegionQueue) {
+ BucketRegionQueue brq = (BucketRegionQueue) owner;
+ brq.addToEventQueue(key, done, event);
+ }
}
if (!done) {
removeEntry(key, newRe, false);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
index 4708fd9..af386f5 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketAdvisor.java
@@ -314,6 +314,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
if (b instanceof BucketRegionQueue) {
BucketRegionQueue brq = (BucketRegionQueue) b;
brq.decQueueSize(brq.size());
+ brq.incSecondaryQueueSize(brq.size());
}
}
}
@@ -1189,6 +1190,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
if (br instanceof BucketRegionQueue) { // Shouldn't it be AbstractBucketRegionQueue
BucketRegionQueue brq = (BucketRegionQueue) br;
brq.incQueueSize(brq.size());
+ brq.decSecondaryQueueSize(brq.size());
}
if (br != null && br instanceof BucketRegion) {
((BucketRegion) br).afterAcquiringPrimaryState();
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
index 07c32a1..afc1544 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
@@ -438,6 +438,8 @@ public class BucketRegionQueue extends AbstractBucketRegionQueue {
}
if (this.getBucketAdvisor().isPrimary()) {
incQueueSize(1);
+ } else {
+ incSecondaryQueueSize(1);
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 0fef764..59547b2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -1098,6 +1098,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
}
statistics.setQueueSize(0);
+ statistics.setSecondaryQueueSize(0);
statistics.setTempQueueSize(0);
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
index 2b93082..15ff18e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderStats.java
@@ -46,6 +46,8 @@ public class GatewaySenderStats {
protected static final String EVENT_QUEUE_TIME = "eventQueueTime";
/** Name of the event queue size statistic */
protected static final String EVENT_QUEUE_SIZE = "eventQueueSize";
+ /** Name of the event secondary queue size statistic */
+ protected static final String EVENT_SECONDARY_QUEUE_SIZE = "eventSecondaryQueueSize";
/** Name of the event temporary queue size statistic */
protected static final String TMP_EVENT_QUEUE_SIZE = "tempQueueSize";
/** Name of the events distributed statistic */
@@ -104,6 +106,8 @@ public class GatewaySenderStats {
protected static int eventQueueTimeId;
/** Id of the event queue size statistic */
protected static int eventQueueSizeId;
+ /** Id of the event in secondary queue size statistic */
+ protected static int eventSecondaryQueueSizeId;
/** Id of the temp event queue size statistic */
protected static int eventTmpQueueSizeId;
/** Id of the events distributed statistic */
@@ -168,6 +172,8 @@ public class GatewaySenderStats {
f.createLongCounter(EVENT_QUEUE_TIME, "Total time spent queueing events.",
"nanoseconds"),
f.createIntGauge(EVENT_QUEUE_SIZE, "Size of the event queue.", "operations", false),
+ f.createIntGauge(EVENT_SECONDARY_QUEUE_SIZE, "Size of secondary event queue.",
+ "operations", false),
f.createIntGauge(TMP_EVENT_QUEUE_SIZE, "Size of the temporary events.", "operations",
false),
f.createIntCounter(EVENTS_NOT_QUEUED_CONFLATED,
@@ -238,6 +244,7 @@ public class GatewaySenderStats {
eventsNotQueuedConflatedId = type.nameToId(EVENTS_NOT_QUEUED_CONFLATED);
eventQueueTimeId = type.nameToId(EVENT_QUEUE_TIME);
eventQueueSizeId = type.nameToId(EVENT_QUEUE_SIZE);
+ eventSecondaryQueueSizeId = type.nameToId(EVENT_SECONDARY_QUEUE_SIZE);
eventTmpQueueSizeId = type.nameToId(TMP_EVENT_QUEUE_SIZE);
eventsDistributedId = type.nameToId(EVENTS_DISTRIBUTED);
eventsExceedingAlertThresholdId = type.nameToId(EVENTS_EXCEEDING_ALERT_THRESHOLD);
@@ -358,6 +365,15 @@ public class GatewaySenderStats {
}
/**
+ * Returns the current value of the "eventSecondaryQueueSize" stat.
+ *
+ * @return the current value of the "eventSecondaryQueueSize" stat
+ */
+ public int getEventSecondaryQueueSize() {
+ return this.stats.getInt(eventSecondaryQueueSizeId);
+ }
+
+ /**
* Returns the current value of the "tempQueueSize" stat.
*
* @return the current value of the "tempQueueSize" stat.
@@ -462,6 +478,15 @@ public class GatewaySenderStats {
}
/**
+ * Sets the "eventSecondaryQueueSize" stat.
+ *
+ * @param size The size of the secondary queue
+ */
+ public void setSecondaryQueueSize(int size) {
+ this.stats.setInt(eventSecondaryQueueSizeId, size);
+ }
+
+ /**
* Sets the "tempQueueSize" stat.
*
* @param size The size of the temp queue
@@ -479,6 +504,14 @@ public class GatewaySenderStats {
}
/**
+ * Increments the "eventSecondaryQueueSize" stat by 1.
+ */
+ public void incSecondaryQueueSize() {
+ this.stats.incInt(eventSecondaryQueueSizeId, 1);
+ assert this.stats.getInt(eventSecondaryQueueSizeId) >= 0;
+ }
+
+ /**
* Increments the "tempQueueSize" stat by 1.
*/
public void incTempQueueSize() {
@@ -495,6 +528,16 @@ public class GatewaySenderStats {
}
/**
+ * Increments the "eventSecondaryQueueSize" stat by given delta.
+ *
+ * @param delta an integer by which secondary queue size to be increased
+ */
+ public void incSecondaryQueueSize(int delta) {
+ this.stats.incInt(eventSecondaryQueueSizeId, delta);
+ assert this.stats.getInt(eventSecondaryQueueSizeId) >= 0;
+ }
+
+ /**
* Increments the "tempQueueSize" stat by given delta.
*
* @param delta an integer by which temp queue size to be increased
@@ -511,6 +554,14 @@ public class GatewaySenderStats {
}
/**
+ * Decrements the "eventSecondaryQueueSize" stat by 1.
+ */
+ public void decSecondaryQueueSize() {
+ this.stats.incInt(eventSecondaryQueueSizeId, -1);
+ assert this.stats.getInt(eventSecondaryQueueSizeId) >= 0;
+ }
+
+ /**
* Decrements the "tempQueueSize" stat by 1.
*/
public void decTempQueueSize() {
@@ -527,6 +578,16 @@ public class GatewaySenderStats {
}
/**
+ * Decrements the "eventSecondaryQueueSize" stat by given delta.
+ *
+ * @param delta an integer by which secondary queue size to be increased
+ */
+ public void decSecondaryQueueSize(int delta) {
+ this.stats.incInt(eventSecondaryQueueSizeId, -delta);
+ assert this.stats.getInt(eventSecondaryQueueSizeId) >= 0;
+ }
+
+ /**
* Decrements the "tempQueueSize" stat by given delta.
*
* @param delta an integer by which temp queue size to be increased
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 cdb33ab..28c437f 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
@@ -1416,10 +1416,6 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
return (BucketRegionQueue) prQ.getDataStore().getLocalBucketById(bucketId);
}
- public int localSize() {
- return localSize(false);
- }
-
public String displayContent() {
int size = 0;
StringBuffer sb = new StringBuffer();
@@ -1436,6 +1432,10 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
return sb.toString();
}
+ public int localSize() {
+ return localSize(false);
+ }
+
public int localSize(boolean includeSecondary) {
int size = 0;
for (PartitionedRegion prQ : this.userRegionNameToshadowPRMap.values()) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index 39fedbf..df89e36 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -183,6 +183,9 @@ public class ParallelQueueRemovalMessage extends PooledDistributionMessage {
final boolean isDebugEnabled = logger.isDebugEnabled();
try {
brq.destroyKey(key);
+ if (!brq.getBucketAdvisor().isPrimary()) {
+ prQ.getParallelGatewaySender().getStatistics().decSecondaryQueueSize();
+ }
if (isDebugEnabled) {
logger.debug("Destroyed the key {} for shadowPR {} for bucket {}", key, prQ.getName(),
brq.getId());
diff --git a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
index eb8ad01..4c5caa2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
@@ -50,14 +50,17 @@ public class SerialAsyncEventQueueImplJUnitTest {
attrs.id = AsyncEventQueueImpl.ASYNC_EVENT_QUEUE_PREFIX + "id";
SerialAsyncEventQueueImpl queue = new SerialAsyncEventQueueImpl(cache, attrs);
queue.getStatistics().incQueueSize(5);
+ queue.getStatistics().incSecondaryQueueSize(6);
queue.getStatistics().incTempQueueSize(10);
assertEquals(5, queue.getStatistics().getEventQueueSize());
+ assertEquals(6, queue.getStatistics().getEventSecondaryQueueSize());
assertEquals(10, queue.getStatistics().getTempEventQueueSize());
queue.stop();
assertEquals(0, queue.getStatistics().getEventQueueSize());
+ assertEquals(0, queue.getStatistics().getEventSecondaryQueueSize());
assertEquals(0, queue.getStatistics().getTempEventQueueSize());
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
index 8366ca7..2074e9e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -718,19 +718,33 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase {
}
public static void checkAsyncEventQueueStats(String queueId, final int queueSize,
- final int eventsReceived, final int eventsQueued, final int eventsDistributed) {
+ int secondaryQueueSize, final int eventsReceived, final int eventsQueued,
+ final int eventsDistributed) {
Set<AsyncEventQueue> asyncQueues = cache.getAsyncEventQueues();
AsyncEventQueue queue = null;
+ boolean isParallel = false;
for (AsyncEventQueue q : asyncQueues) {
+ isParallel = q.isParallel();
if (q.getId().equals(queueId)) {
queue = q;
break;
}
}
final AsyncEventQueueStats statistics = ((AsyncEventQueueImpl) queue).getStatistics();
- Awaitility.await().atMost(60, TimeUnit.SECONDS)
+ Awaitility.await().atMost(120, TimeUnit.SECONDS)
.until(() -> assertEquals("Expected queue entries: " + queueSize + " but actual entries: "
+ statistics.getEventQueueSize(), queueSize, statistics.getEventQueueSize()));
+ if (isParallel) {
+ Awaitility.await().atMost(60, TimeUnit.SECONDS).until(() -> {
+ assertEquals(
+ "Expected events in the secondary queue is " + secondaryQueueSize + ", but actual is "
+ + statistics.getEventSecondaryQueueSize(),
+ secondaryQueueSize, statistics.getEventSecondaryQueueSize());
+ });
+ } else {
+ // for serial queue, evenvSecondaryQueueSize is not used
+ assertEquals(0, statistics.getEventSecondaryQueueSize());
+ }
assertEquals(queueSize, statistics.getEventQueueSize());
assertEquals(eventsReceived, statistics.getEventsReceived());
assertEquals(eventsQueued, statistics.getEventsQueued());
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index aa1db53..442ef9f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -1521,8 +1521,8 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
LogWriterUtils.getLogWriter().info("Primary buckets on vm2: " + primaryBucketsvm2);
// before shutdown vm2, both vm1 and vm2 should have 40 events in primary queue
- vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 80, 80, 0));
- vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 80, 80, 0));
+ vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 40, 80, 80, 0));
+ vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 40, 80, 80, 0));
// ---------------------------- Kill vm2 --------------------------
vm2.invoke(() -> AsyncEventQueueTestBase.killSender());
@@ -1549,8 +1549,8 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase {
.info("After shutdown vm2, started vm3, Primary buckets on vm1: " + primaryBucketsvm1);
// vm1.invoke(()->AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 80, 80, 80, 0));
- vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 80, 80, 0));
- vm3.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 0, 0, 0));
+ vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 40, 80, 80, 0));
+ vm3.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 40, 40, 0, 0, 0));
vm3.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln"));
vm1.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln"));
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
index 935a650..3ea44eb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueStatsDUnitTest.java
@@ -27,6 +27,8 @@ import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.junit.categories.AEQTest;
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, AEQTest.class})
public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
@@ -74,15 +76,17 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
// sender
Wait.pause(2000);// give some time for system to become stable
- vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 1000, 1000, 1000));
+ vm1.invoke(
+ () -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 0, 1000, 1000, 1000));
vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats("ln", 10));
- vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 1000, 0, 0));
+ vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 0, 1000, 0, 0));
vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats("ln", 0));
}
/**
* Two listeners added to the same RR.
*/
+ @Category({FlakyTest.class, WanTest.class}) // GEODE-4647
@Test
public void testAsyncStatsTwoListeners() throws Exception {
Integer lnPort = createFirstLocatorWithDSId(1);
@@ -119,19 +123,43 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
vm4.invoke(() -> AsyncEventQueueTestBase.createReplicatedRegionWithAsyncEventQueue(
getTestMethodName() + "_RR", "ln1,ln2", isOffHeap()));
+ vm1.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
+ vm2.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
+ vm3.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
+ vm4.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln1"));
+ vm1.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
+ vm2.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
+ vm3.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
+ vm4.invoke(() -> AsyncEventQueueTestBase.pauseAsyncEventQueue("ln2"));
+
vm1.invoke(() -> AsyncEventQueueTestBase.doPuts(getTestMethodName() + "_RR", 1000));
+ vm1.invoke(
+ () -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln1", 1000, 0, 1000, 1000, 0));
+ vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln2", 1000, 0, 1000, 0, 0));
+
+ vm1.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln1"));
+ vm2.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln1"));
+ vm3.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln1"));
+ vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln1"));
+ vm1.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln2"));
+ vm2.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln2"));
+ vm3.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln2"));
+ vm4.invoke(() -> AsyncEventQueueTestBase.resumeAsyncEventQueue("ln2"));
+
vm1.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln1", 1000));
vm1.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln2", 1000));
Wait.pause(2000);// give some time for system to become stable
- vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln1", 0, 1000, 1000, 1000));
+ vm1.invoke(
+ () -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln1", 0, 0, 1000, 1000, 1000));
vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats("ln1", 10));
- vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln2", 0, 1000, 1000, 1000));
+ vm1.invoke(
+ () -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln2", 0, 0, 1000, 1000, 1000));
vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats("ln2", 10));
- vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln1", 0, 1000, 0, 0));
+ vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln1", 0, 0, 1000, 0, 0));
vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats("ln1", 0));
- vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln2", 0, 1000, 0, 0));
+ vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln2", 0, 0, 1000, 0, 0));
vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueBatchStats("ln2", 0));
}
@@ -229,11 +257,12 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
vm1.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 1500));
Wait.pause(2000);// give some time for system to become stable
- vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 1500, 1500, 1500));
+ vm1.invoke(
+ () -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 0, 1500, 1500, 1500));
vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueUnprocessedStats("ln", 0));
- vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 1500, 0, 0));
+ vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 0, 1500, 0, 0));
vm2.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueUnprocessedStats("ln", 1500));
}
@@ -301,7 +330,8 @@ public class AsyncEventQueueStatsDUnitTest extends AsyncEventQueueTestBase {
vm1.invoke(() -> AsyncEventQueueTestBase.validateAsyncEventListener("ln", 1000));
Wait.pause(2000);// give some time for system to become stable
- vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 2000, 2000, 1000));
+ vm1.invoke(
+ () -> AsyncEventQueueTestBase.checkAsyncEventQueueStats("ln", 0, 0, 2000, 2000, 1000));
vm1.invoke(() -> AsyncEventQueueTestBase.checkAsyncEventQueueConflatedStats("ln", 500));
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index 5e0f704..d1ea59f 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -65,6 +65,8 @@ import org.apache.geode.internal.cache.eviction.EvictionController;
import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
+import org.apache.geode.internal.cache.wan.GatewaySenderStats;
+import org.apache.geode.internal.statistics.DummyStatisticsFactory;
import org.apache.geode.test.fake.Fakes;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -81,6 +83,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
private PartitionedRegion rootRegion;
private BucketRegionQueue bucketRegionQueue;
private BucketRegionQueueHelper bucketRegionQueueHelper;
+ private GatewaySenderStats stats;
@Before
public void setUpGemFire() {
@@ -116,6 +119,8 @@ public class ParallelQueueRemovalMessageJUnitTest {
when(this.queueRegion.getParallelGatewaySender()).thenReturn(this.sender);
when(this.sender.getQueues()).thenReturn(null);
when(this.sender.getDispatcherThreads()).thenReturn(1);
+ stats = new GatewaySenderStats(new DummyStatisticsFactory(), "ln");
+ when(this.sender.getStatistics()).thenReturn(stats);
}
private void createRootRegion() {
@@ -183,6 +188,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
// Validate initial BucketRegionQueue state
assertFalse(this.bucketRegionQueue.isInitialized());
assertEquals(0, this.bucketRegionQueue.getFailedBatchRemovalMessageKeys().size());
+ stats.setSecondaryQueueSize(1);
// Create and process a ParallelQueueRemovalMessage (causes the failedBatchRemovalMessageKeys to
// add a key)
@@ -190,6 +196,8 @@ public class ParallelQueueRemovalMessageJUnitTest {
// Validate BucketRegionQueue after processing ParallelQueueRemovalMessage
assertEquals(1, this.bucketRegionQueue.getFailedBatchRemovalMessageKeys().size());
+ // failed BatchRemovalMessage will not modify stats
+ assertEquals(1, stats.getEventSecondaryQueueSize());
}
@Test
@@ -201,6 +209,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
// Add an event to the BucketRegionQueue and verify BucketRegionQueue state
this.bucketRegionQueueHelper.addEvent(KEY);
assertEquals(1, this.bucketRegionQueue.size());
+ assertEquals(1, stats.getEventSecondaryQueueSize());
// Create and process a ParallelQueueRemovalMessage (causes the value of the entry to be set to
// DESTROYED)
@@ -210,6 +219,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
// Clean up destroyed tokens and validate BucketRegionQueue
this.bucketRegionQueueHelper.cleanUpDestroyedTokensAndMarkGIIComplete();
assertEquals(0, this.bucketRegionQueue.size());
+ assertEquals(0, stats.getEventSecondaryQueueSize());
}
@Test
@@ -247,6 +257,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
// Add an event to the BucketRegionQueue and verify BucketRegionQueue state
GatewaySenderEventImpl event = this.bucketRegionQueueHelper.addEvent(KEY);
assertEquals(1, this.bucketRegionQueue.size());
+ assertEquals(1, stats.getEventSecondaryQueueSize());
// Add a mock GatewaySenderEventImpl to the temp queue
BlockingQueue<GatewaySenderEventImpl> tempQueue = createTempQueueAndAddEvent(processor, event);
@@ -259,6 +270,7 @@ public class ParallelQueueRemovalMessageJUnitTest {
// Validate temp queue is empty after processing ParallelQueueRemovalMessage
assertEquals(0, tempQueue.size());
+ assertEquals(0, stats.getEventSecondaryQueueSize());
// Clean up destroyed tokens
this.bucketRegionQueueHelper.cleanUpDestroyedTokensAndMarkGIIComplete();
diff --git a/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
index 48ca857..7c485be 100644
--- a/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/bean/stats/AsyncEventQueueStatsJUnitTest.java
@@ -49,8 +49,6 @@ public class AsyncEventQueueStatsJUnitTest extends MBeanStatsTestCase {
sample();
assertEquals(0, getEventQueueSize());
-
-
}
private int getEventQueueSize() {
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 30b7972..f989405 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
@@ -124,6 +124,7 @@ import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.ServerLocation;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
@@ -142,6 +143,8 @@ import org.apache.geode.internal.cache.execute.data.Order;
import org.apache.geode.internal.cache.execute.data.OrderId;
import org.apache.geode.internal.cache.execute.data.Shipment;
import org.apache.geode.internal.cache.execute.data.ShipmentId;
+import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage;
+import org.apache.geode.internal.cache.partitioned.BecomePrimaryBucketMessage.BecomePrimaryBucketResponse;
import org.apache.geode.internal.cache.partitioned.PRLocallyDestroyedException;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.CacheServerTestUtil;
@@ -932,9 +935,9 @@ public class WANTestBase extends DistributedTestCase {
props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
}
props.setProperty(MCAST_PORT, "0");
- props.setProperty(LOCATORS, "localhost[" + locPort + "]");
String logLevel = System.getProperty(LOG_LEVEL, "info");
props.setProperty(LOG_LEVEL, logLevel);
+ props.setProperty(LOCATORS, "localhost[" + locPort + "]");
InternalDistributedSystem ds = test.getSystem(props);
cache = CacheFactory.create(ds);
}
@@ -1131,12 +1134,57 @@ public class WANTestBase extends DistributedTestCase {
return connectionInfo;
}
+ public static void moveAllPrimaryBuckets(String senderId, final DistributedMember destination,
+ final String regionName) {
+
+ AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId);
+ final RegionQueue regionQueue;
+ regionQueue = sender.getQueues().toArray(new RegionQueue[1])[0];
+ if (sender.isParallel()) {
+ ConcurrentParallelGatewaySenderQueue parallelGatewaySenderQueue =
+ (ConcurrentParallelGatewaySenderQueue) regionQueue;
+ PartitionedRegion prQ =
+ parallelGatewaySenderQueue.getRegions().toArray(new PartitionedRegion[1])[0];
+
+ Set<Integer> primaryBucketIds = prQ.getDataStore().getAllLocalPrimaryBucketIds();
+ for (int bid : primaryBucketIds) {
+ movePrimary(destination, regionName, bid);
+ }
+
+ // double check after moved all primary buckets
+ primaryBucketIds = prQ.getDataStore().getAllLocalPrimaryBucketIds();
+ assertTrue(primaryBucketIds.isEmpty());
+ }
+ }
+
+ public static void movePrimary(final DistributedMember destination, final String regionName,
+ final int bucketId) {
+ PartitionedRegion region = (PartitionedRegion) cache.getRegion(regionName);
+
+ BecomePrimaryBucketResponse response = BecomePrimaryBucketMessage
+ .send((InternalDistributedMember) destination, region, bucketId, true);
+ assertNotNull(response);
+ assertTrue(response.waitForResponse());
+ }
+
+ public static int getSecondaryQueueSizeInStats(String senderId) {
+ AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId);
+ GatewaySenderStats statistics = sender.getStatistics();
+ return statistics.getEventSecondaryQueueSize();
+ }
+
public static List<Integer> getSenderStats(String senderId, final int expectedQueueSize) {
AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId);
GatewaySenderStats statistics = sender.getStatistics();
if (expectedQueueSize != -1) {
final RegionQueue regionQueue;
regionQueue = sender.getQueues().toArray(new RegionQueue[1])[0];
+ if (sender.isParallel()) {
+ ConcurrentParallelGatewaySenderQueue parallelGatewaySenderQueue =
+ (ConcurrentParallelGatewaySenderQueue) regionQueue;
+ PartitionedRegion pr =
+ parallelGatewaySenderQueue.getRegions().toArray(new PartitionedRegion[1])[0];
+ }
Awaitility.await().atMost(120, TimeUnit.SECONDS)
.until(() -> assertEquals("Expected queue entries: " + expectedQueueSize
+ " but actual entries: " + regionQueue.size(), expectedQueueSize,
@@ -1153,9 +1201,28 @@ public class WANTestBase extends DistributedTestCase {
stats.add(statistics.getEventsNotQueuedConflated());
stats.add(statistics.getEventsConflatedFromBatches());
stats.add(statistics.getConflationIndexesMapSize());
+ stats.add(statistics.getEventSecondaryQueueSize());
return stats;
}
+ protected static int getTotalBucketQueueSize(PartitionedRegion prQ, boolean isPrimary) {
+ int size = 0;
+ if (prQ != null) {
+ Set<Map.Entry<Integer, BucketRegion>> allBuckets = prQ.getDataStore().getAllLocalBuckets();
+ List<Integer> thisProcessorBuckets = new ArrayList<Integer>();
+
+ for (Map.Entry<Integer, BucketRegion> bucketEntry : allBuckets) {
+ BucketRegion bucket = bucketEntry.getValue();
+ int bId = bucket.getId();
+ if ((isPrimary && bucket.getBucketAdvisor().isPrimary())
+ || (!isPrimary && !bucket.getBucketAdvisor().isPrimary())) {
+ size += bucket.size();
+ }
+ }
+ }
+ return size;
+ }
+
public static List<Integer> getSenderStatsForDroppedEvents(String senderId) {
AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId);
GatewaySenderStats statistics = sender.getStatistics();
@@ -3117,9 +3184,7 @@ public class WANTestBase extends DistributedTestCase {
}
if (!sender.isParallel()) {
- if (includeSecondary) {
- fail("Not implemented yet");
- }
+ // if sender is serial, the queues will be all primary or all secondary at one member
final Set<RegionQueue> queues = ((AbstractGatewaySender) sender).getQueues();
int size = 0;
for (RegionQueue q : queues) {
@@ -3134,11 +3199,7 @@ public class WANTestBase extends DistributedTestCase {
} else if (regionQueue instanceof ParallelGatewaySenderQueue) {
return ((ParallelGatewaySenderQueue) regionQueue).localSize(includeSecondary);
} else {
- if (includeSecondary) {
- fail("Not Implemented yet");
- }
- regionQueue = ((AbstractGatewaySender) sender).getQueues().toArray(new RegionQueue[1])[0];
- return regionQueue.getRegion().size();
+ fail("Not implemented yet");
}
}
fail("Not yet implemented?");
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index 3281df6..9a85871 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -62,6 +62,11 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
vm4.invoke(() -> checkQueueSize("ln", (keyValues.size() + updateKeyValues.size())));
+ vm4.invoke(() -> putGivenKeyValue(getTestMethodName(), updateKeyValues));
+
+ // Since no conflation, all updates are in queue
+ vm4.invoke(() -> checkQueueSize("ln", keyValues.size() + 2 * updateKeyValues.size()));
+
vm2.invoke(() -> validateRegionSize(getTestMethodName(), 0));
resumeSenders();
@@ -86,7 +91,7 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
vm6.invoke(() -> createSender("ln", 2, true, 100, 50, false, false, null, true));
vm7.invoke(() -> createSender("ln", 2, true, 100, 50, false, false, null, true));
- createSenderPRs();
+ createSenderPRs(1);
startSenderInVMs("ln", vm4, vm5, vm6, vm7);
@@ -103,24 +108,35 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
vm4.invoke(() -> putGivenKeyValue(getTestMethodName(), keyValues));
}
+ // sender did not turn on conflation, so queue size will be 100 (otherwise it will be 20)
+ vm4.invoke(() -> checkQueueSize("ln", 100));
vm4.invoke(() -> enableConflation("ln"));
vm5.invoke(() -> enableConflation("ln"));
vm6.invoke(() -> enableConflation("ln"));
vm7.invoke(() -> enableConflation("ln"));
- resumeSenders();
-
ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 100));
ArrayList<Integer> v5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 100));
ArrayList<Integer> v6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 100));
ArrayList<Integer> v7List =
- (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 100));
+ assertTrue("Event in secondary queue should be 100",
+ (v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)) == 100);
+
+ resumeSenders();
+
+ v4List = (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v5List = (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v6List = (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0));
assertTrue("No events conflated in batch",
(v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0);
+ assertEquals("Event in secondary queue should be 0 after dispatched", 0,
+ (v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)));
vm2.invoke(() -> validateRegionSize(getTestMethodName(), 10));
@@ -155,12 +171,14 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
vm4.invoke(() -> checkQueueSize("ln", keyValues.size() + updateKeyValues.size())); // creates
// aren't
// conflated
+ validateEventSecondaryQueueSize(keyValues.size() + updateKeyValues.size(), redundancy);
vm4.invoke(() -> putGivenKeyValue(getTestMethodName(), updateKeyValues));
- vm4.invoke(() -> checkQueueSize("ln", keyValues.size() + updateKeyValues.size())); // creates
- // aren't
- // conflated
+ int expectedEventNumAfterConflation = keyValues.size() + updateKeyValues.size();
+ vm4.invoke(() -> checkQueueSize("ln", expectedEventNumAfterConflation));
+
+ validateEventSecondaryQueueSize(expectedEventNumAfterConflation, redundancy);
vm2.invoke(() -> validateRegionSize(getTestMethodName(), 0));
@@ -168,6 +186,24 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
keyValues.putAll(updateKeyValues);
validateReceiverRegionSize(keyValues);
+
+ // after dispatch, both primary and secondary queues are empty
+ vm4.invoke(() -> checkQueueSize("ln", 0));
+ validateEventSecondaryQueueSize(0, redundancy);
+ }
+
+ private void validateEventSecondaryQueueSize(int expectedNum, int redundancy) {
+ ArrayList<Integer> v4List =
+ (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum));
+ ArrayList<Integer> v5List =
+ (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum));
+ ArrayList<Integer> v6List =
+ (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum));
+ ArrayList<Integer> v7List =
+ (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum));
+ assertTrue("Event in secondary queue should be 100",
+ (v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)) == expectedNum
+ * redundancy);
}
@Test
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index 9d9ed0f..1edf2a2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -53,6 +53,156 @@ public class ParallelWANStatsDUnitTest extends WANTestBase {
}
@Test
+ public void testQueueSizeInSecondaryBucketRegionQueuesWithMemberRestart() throws Exception {
+ Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
+ Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
+
+ createCacheInVMs(nyPort, vm2);
+ createReceiverInVMs(vm2);
+
+ createSendersWithConflation(lnPort);
+
+ createSenderPRs(1);
+
+ startPausedSenders();
+
+ createReceiverPR(vm2, 1);
+ putKeyValues();
+
+ ArrayList<Integer> v4List =
+ (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ ArrayList<Integer> v5List =
+ (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ ArrayList<Integer> v6List =
+ (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ ArrayList<Integer> v7List =
+ (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+
+ assertEquals(NUM_PUTS, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); // queue
+ // size
+ assertEquals(NUM_PUTS * 2, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); // eventsReceived
+ assertEquals(NUM_PUTS * 2, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); // events
+ // queued
+ assertEquals(0, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); // events
+ // distributed
+ assertEquals(NUM_PUTS, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); // secondary
+ // queue
+ // size
+
+ // stop vm7 to trigger rebalance and move some primary buckets
+ System.out.println("Current secondary queue sizes:" + v4List.get(10) + ":" + v5List.get(10)
+ + ":" + v6List.get(10) + ":" + v7List.get(10));
+ vm7.invoke(() -> WANTestBase.closeCache());
+ Awaitility.await().atMost(120, TimeUnit.SECONDS).until(() -> {
+ int v4secondarySize = vm4.invoke(() -> WANTestBase.getSecondaryQueueSizeInStats("ln"));
+ int v5secondarySize = vm5.invoke(() -> WANTestBase.getSecondaryQueueSizeInStats("ln"));
+ int v6secondarySize = vm6.invoke(() -> WANTestBase.getSecondaryQueueSizeInStats("ln"));
+ assertEquals(NUM_PUTS, v4secondarySize + v5secondarySize + v6secondarySize); // secondary
+ // queue
+ // size
+ });
+ System.out.println("New secondary queue sizes:" + v4List.get(10) + ":" + v5List.get(10) + ":"
+ + v6List.get(10));
+
+ vm7.invoke(() -> WANTestBase.createCache(lnPort));
+ vm7.invoke(() -> WANTestBase.createSender("ln", 2, true, 100, 10, true, false, null, true));
+ vm7.invoke(() -> WANTestBase.createPartitionedRegion(testName, "ln", 1, 10, isOffHeap()));
+ startSenderInVMs("ln", vm7);
+ vm7.invoke(() -> pauseSender("ln"));
+
+ v4List = (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ v5List = (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ v6List = (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ assertEquals(NUM_PUTS, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); // secondary
+ // queue
+ // size
+ System.out.println("After restart vm7, secondary queue sizes:" + v4List.get(10) + ":"
+ + v5List.get(10) + ":" + v6List.get(10) + ":" + v7List.get(10));
+
+ vm4.invoke(() -> WANTestBase.resumeSender("ln"));
+ vm5.invoke(() -> WANTestBase.resumeSender("ln"));
+ vm6.invoke(() -> WANTestBase.resumeSender("ln"));
+ vm7.invoke(() -> WANTestBase.resumeSender("ln"));
+
+ vm2.invoke(() -> WANTestBase.validateRegionSize(testName, NUM_PUTS));
+ vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(0, NUM_PUTS, NUM_PUTS));
+
+ vm4.invoke(() -> WANTestBase.checkQueueSize("ln", 0));
+
+ v4List = (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v5List = (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v6List = (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+
+ assertEquals(NUM_PUTS, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); // events
+ // distributed
+ assertEquals(0, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); // secondary
+ // queue
+ // size
+ }
+
+ // TODO: add a test without redudency for primary switch
+ @Test
+ public void testQueueSizeInSecondaryWithPrimarySwitch() throws Exception {
+ Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
+ Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
+
+ createCacheInVMs(nyPort, vm2);
+ createReceiverInVMs(vm2);
+
+ createSendersWithConflation(lnPort);
+
+ createSenderPRs(1);
+
+ startPausedSenders();
+
+ createReceiverPR(vm2, 1);
+
+ putKeyValues();
+
+ ArrayList<Integer> v4List =
+ (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ ArrayList<Integer> v5List =
+ (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ ArrayList<Integer> v6List =
+ (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+ ArrayList<Integer> v7List =
+ (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS));
+
+ assertEquals(NUM_PUTS, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); // queue
+ // size
+ assertEquals(NUM_PUTS * 2, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); // eventsReceived
+ assertEquals(NUM_PUTS * 2, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); // events
+ // queued
+ assertEquals(0, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); // events
+ // distributed
+ assertEquals(NUM_PUTS, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); // secondary
+ // queue
+ // size
+
+ vm4.invoke(() -> WANTestBase.resumeSender("ln"));
+ vm5.invoke(() -> WANTestBase.resumeSender("ln"));
+ vm6.invoke(() -> WANTestBase.resumeSender("ln"));
+ vm7.invoke(() -> WANTestBase.resumeSender("ln"));
+ vm2.invoke(() -> WANTestBase.validateRegionSize(testName, NUM_PUTS));
+ vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(0, NUM_PUTS, NUM_PUTS));
+
+ vm4.invoke(() -> WANTestBase.checkQueueSize("ln", 0));
+
+ v4List = (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v5List = (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v6List = (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+
+ assertEquals(NUM_PUTS, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); // events
+ // distributed
+ assertEquals(0, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); // secondary
+ // queue
+ // size
+ }
+
+ @Test
public void testPartitionedRegionParallelPropagation_BeforeDispatch() throws Exception {
Integer lnPort = (Integer) vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId(1));
Integer nyPort = (Integer) vm1.invoke(() -> WANTestBase.createFirstRemoteLocator(2, lnPort));
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 7e3248e..1226fde 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -18,6 +18,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.junit.Assert.*;
import java.io.File;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Properties;
@@ -101,7 +102,13 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase {
vm4.invoke(() -> WANTestBase.pauseSender("ln"));
vm6.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 1000));
- Wait.pause(5000);
+ ArrayList<Integer> v4List =
+ (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 1000));
+ ArrayList<Integer> v5List =
+ (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 1000));
+ // secondary queue size stats in serial queue should be 0
+ assertEquals(0, v4List.get(10) + v5List.get(10));
+
HashMap primarySenderUpdates = (HashMap) vm4.invoke(() -> WANTestBase.checkQueue());
HashMap secondarySenderUpdates = (HashMap) vm5.invoke(() -> WANTestBase.checkQueue());
assertEquals(primarySenderUpdates, secondarySenderUpdates);
@@ -136,6 +143,9 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase {
// removing all the keys.
secondarySenderUpdates = (HashMap) vm5.invoke(() -> WANTestBase.checkQueue());
assertEquals(secondarySenderUpdates.get("Destroy"), receiverUpdates.get("Create"));
+
+ vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0));
}
protected void checkPrimarySenderUpdatesOnVM5(HashMap primarySenderUpdates) {
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
index 5b14fcc..b66fef2 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java
@@ -41,10 +41,10 @@ public class SerialWANConflationDUnitTest extends WANTestBase {
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
- vm4.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 0, 8, isOffHeap()));
- vm5.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 0, 8, isOffHeap()));
- vm6.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 0, 8, isOffHeap()));
- vm7.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 0, 8, isOffHeap()));
+ vm4.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
+ vm5.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
+ vm6.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
+ vm7.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
vm4.invoke(() -> createSender("ln", 2, false, 100, 50, false, false, null, true));
vm5.invoke(() -> createSender("ln", 2, false, 100, 50, false, false, null, true));
@@ -89,6 +89,71 @@ public class SerialWANConflationDUnitTest extends WANTestBase {
assertTrue("No events conflated in batch",
(v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0);
+ }
+
+ @Test
+ public void testSerialPropagationPartitionRegionConflationDuringEnqueue() throws Exception {
+ Integer lnPort = (Integer) vm0.invoke(() -> createFirstLocatorWithDSId(1));
+ Integer nyPort = (Integer) vm1.invoke(() -> createFirstRemoteLocator(2, lnPort));
+
+ createCacheInVMs(nyPort, vm2, vm3);
+
+ vm2.invoke(() -> createPartitionedRegion(getTestMethodName(), null, 1, 8, isOffHeap()));
+ vm3.invoke(() -> createPartitionedRegion(getTestMethodName(), null, 1, 8, isOffHeap()));
+
+ createReceiverInVMs(vm2, vm3);
+
+ createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+ vm4.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
+ vm5.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
+ vm6.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
+ vm7.invoke(() -> createPartitionedRegion(getTestMethodName(), "ln", 1, 8, isOffHeap()));
+
+ vm4.invoke(() -> createSender("ln", 2, false, 100, 50, true, false, null, true));
+ vm5.invoke(() -> createSender("ln", 2, false, 100, 50, true, false, null, true));
+ vm6.invoke(() -> createSender("ln", 2, false, 100, 50, true, false, null, true));
+ vm7.invoke(() -> createSender("ln", 2, false, 100, 50, true, false, null, true));
+
+ startSenderInVMs("ln", vm4, vm5, vm6, vm7);
+
+ vm4.invoke(() -> pauseSender("ln"));
+ vm5.invoke(() -> pauseSender("ln"));
+ vm6.invoke(() -> pauseSender("ln"));
+ vm7.invoke(() -> pauseSender("ln"));
+
+
+ final Map keyValues = new HashMap();
+
+ for (int i = 1; i <= 10; i++) {
+ for (int j = 1; j <= 10; j++) {
+ keyValues.put(j, i);
+ }
+ vm4.invoke(() -> putGivenKeyValue(getTestMethodName(), keyValues));
+ }
+
+ ArrayList<Integer> v4List =
+ (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 20));
+ assertTrue("After conflation during enqueue, there should be only 20 events",
+ v4List.get(0) == 20);
+
+ vm4.invoke(() -> resumeSender("ln"));
+ vm5.invoke(() -> resumeSender("ln"));
+ vm6.invoke(() -> resumeSender("ln"));
+ vm7.invoke(() -> resumeSender("ln"));
+
+ v4List = (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ ArrayList<Integer> v5List =
+ (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ ArrayList<Integer> v6List =
+ (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+ ArrayList<Integer> v7List =
+ (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0));
+
+ assertTrue("No events in secondary queue stats since it's serial sender",
+ (v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)) == 0);
+ assertTrue("Total queued events should be 100",
+ (v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)) == 100);
vm2.invoke(() -> validateRegionSize(getTestMethodName(), 10));
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
index e84fd89..87c90e0 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANPropagationDUnitTest.java
@@ -163,6 +163,7 @@ public class SerialWANPropagationDUnitTest extends WANTestBase {
IgnoredException.addIgnoredException(BatchException70.class.getName());
IgnoredException.addIgnoredException(ServerOperationException.class.getName());
IgnoredException.addIgnoredException(IOException.class.getName());
+ IgnoredException.addIgnoredException(java.net.SocketException.class.getName());
vm4.invoke(() -> WANTestBase.doPuts(getTestMethodName() + "_RR", 10000));
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.