You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by la...@apache.org on 2018/03/21 16:58:41 UTC
[geode] branch feature/GEODE-4881 updated (0aef84d -> 4f91f53)
This is an automated email from the ASF dual-hosted git repository.
ladyvader pushed a change to branch feature/GEODE-4881
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit 0aef84d GEODE-4881: Support lucene reindexing (of existing data) with rebalance
add 6e2a754 GEODE-4782: Add category annotation for Gfsh tests (#1630)
add 7402122 GEODE-4783: Add categor annotation for Management tests (#1629)
add ad77bde GEODE-4384/3875: refactor create/destroy jndi binding commands to use CacheConfig objects (#1627)
add 6073a15 GEODE-4875: make a public ClusterConfigurationService interface
add bf079a1 GEODE-4880: Ignore Pulse UI acceptance tests that are flaky (#1635)
add c74a83f GEODE-4497: fix Gfsh text wrapping error
add 07a7b05 GEODE-4883: ServerLauncherDUnitTest fails with BindException
add 794af72 GEODE-4884: Remove Thread.sleep from ServerLauncherDUnitTest
add 0fe3839 GEODE-4885: Disabling DistributedRestoreSystemPropertiesTest until it can be fixed
add 694ee1d GEODE-4857: add interface methods to ClusterConfigurationService (#1637)
add 5018feb Commit then review: update documentation to be for version 1.6.0
add ce0c965 GEODE-4878: Remove Thread.sleep from ClusterConfigLocatorRestartDUnitTest (#1633)
add 8444bd0 [GEODE-4891] Fixes for concourse API changes.
add b4ad610 GEODE-4833: JdbcWriter and JdbcAsyncWriter may fail to write null fields to database (#1636)
add 752bc23 GEODE-4815: Forced locator members to be LOCATOR_DM_TYPES
add c6dee63 GEODE-4882: Add FlakyTest category to AnalyzeConnectorsSerializablesJUnitTest
add d8e29f0 GEODE-4869: Move all the Configuration objects to a public package (#1638)
add 4b5d42d GEODE-4888 Document security-udp-dhalgo property (#1642)
add bafab6b GEODE-4771: Defaults in ConfigurePDXCommand
add 54b18ed GEODE-4771: Changes requested by reviewers.
add 3fa3074 GEODE-4771: Internal API was renamed
add 1564f45 GEODE-4896: Delete com.gemstone.gemfire duplicate of FunctionExceptionTest
add 5bfccee GEODE-4832: Add FlakyTest category to CacheWriterGetOldValueIntegrationTest
add 8f36acf GEODE-4832: Cleanup CacheWriterGetOldValueIntegrationTest
add 05feafb GEODE-4864 Document the gfsh create jndi-binding command (#1644)
add 8da6377 GEODE-4869: Update sanctioned-geode-core-serializables.txt since moving configuration classes
add 68f4ca4 GEODE-4898: Fix field names in DestroyJndiBindingCommand (#1648)
add dca52c8 GEODE-1279: Rename several Bug*Test tests to have descriptive names (#1645)
add 888c7ab GEODE-4885: Change ClusterStartupRule to launch DUnit during setUp
add f39342d GEODE-4885: Fix ClientCQAuthDUnitTest by invoking getVM during setUp
add 461a53d GEODE-4885: Fix JMXMBeanDUnitTest by adding DistributedTestRule
add 2480ed8 GEODE-4832: use TemporaryFolder in CacheWriterGetOldValueIntegrationTest (#1652)
add 220eff1 GEODE-4885: Reenable DistributedRestoreSystemPropertiesTest
add a6092e9 Feature/geode 4810: Move rebalance model classes to own package (#1623)
add ccfa6bb GEODE-4901: increase the wait time for the newly created queue to be ready. (#1651)
add ee328b9 GEODE-4873: Remove link to test code from main code. (#1641)
add e1dc682 GEODE-4907: Fix analyze serializables for moved enum RefusalReason (#1655)
new 4f91f53 GEODE-4881: Support lucene reindexing (of existing data) with rebalance
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 (0aef84d)
\
N -- N -- N refs/heads/feature/GEODE-4881 (4f91f53)
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:
ci/bin/concourse_job_performance.py | 2 +-
.../tools/pulse/ui/PulseAcceptanceTestBase.java | 3 +
geode-book/config.yml | 6 +-
.../source/subnavs/geode-subnav.erb | 3 +
geode-book/redirects.rb | 4 +-
.../jdbc/internal/AbstractJdbcCallback.java | 4 +-
.../connectors/jdbc/internal/ColumnValue.java | 13 +-
.../geode/connectors/jdbc/internal/SqlHandler.java | 31 +-
.../connectors/jdbc/internal/TableMetaData.java | 54 ++
...olumnManager.java => TableMetaDataManager.java} | 52 +-
.../jdbc/internal/TableMetaDataView.java | 8 +-
.../AnalyzeConnectorsSerializablesJUnitTest.java | 5 +-
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 5 +-
.../geode/connectors/jdbc/JdbcDUnitTest.java | 81 +-
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 4 +-
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 4 +-
.../connectors/jdbc/internal/ColumnValueTest.java | 12 +-
.../connectors/jdbc/internal/SqlHandlerTest.java | 50 +-
.../jdbc/internal/SqlStatementFactoryTest.java | 10 +-
.../jdbc/internal/TableKeyColumnManagerTest.java | 141 ----
.../TableMetaDataManagerIntegrationTest.java | 106 +++
.../jdbc/internal/TableMetaDataManagerTest.java | 226 ++++++
.../java/org/apache/geode/cache/GemFireCache.java | 6 +-
.../cache/configuration/CacheConfig.java | 5 +-
.../cache/configuration/CacheElement.java | 8 +-
.../cache/configuration/CacheLoaderType.java | 5 +-
.../configuration/CacheTransactionManagerType.java | 5 +-
.../cache/configuration/CacheWriterType.java | 5 +-
.../configuration/ClassWithParametersType.java | 5 +-
.../cache/configuration/DeclarableType.java | 5 +-
.../cache/configuration/DiskDirType.java | 5 +-
.../cache/configuration/DiskDirsType.java | 5 +-
.../cache/configuration/DiskStoreType.java | 5 +-
.../configuration/DynamicRegionFactoryType.java | 5 +-
.../configuration/EnumActionDestroyOverflow.java | 5 +-
.../cache/configuration/EnumReadableWritable.java | 5 +-
.../configuration/ExpirationAttributesType.java | 5 +-
.../cache/configuration/FunctionServiceType.java | 5 +-
.../cache/configuration/InitializerType.java | 5 +-
.../cache/configuration/JndiBindingsType.java | 33 +-
.../cache/configuration/ParameterType.java | 5 +-
.../cache/configuration/PdxType.java | 5 +-
.../cache/configuration/PoolType.java | 5 +-
.../configuration/RegionAttributesDataPolicy.java | 5 +-
.../RegionAttributesIndexUpdateType.java | 5 +-
.../configuration/RegionAttributesMirrorType.java | 5 +-
.../cache/configuration/RegionAttributesScope.java | 5 +-
.../cache/configuration/RegionAttributesType.java | 5 +-
.../cache/configuration/RegionConfig.java | 18 +-
.../cache/configuration/ResourceManagerType.java | 5 +-
.../SerializationRegistrationType.java | 5 +-
.../cache/configuration/ServerType.java | 5 +-
.../cache/configuration/StringType.java | 5 +-
.../distributed/ClusterConfigurationService.java | 174 +++++
.../internal/AbstractDistributionConfig.java | 3 +-
...va => InternalClusterConfigurationService.java} | 57 +-
.../distributed/internal/InternalLocator.java | 10 +-
.../geode/distributed/internal/ServerLocator.java | 2 +-
.../membership/gms/locator/GMSLocator.java | 4 +-
.../distributed/internal/tcpserver/TcpHandler.java | 4 +-
.../distributed/internal/tcpserver/TcpServer.java | 4 +-
.../internal/cache/ClusterConfigurationLoader.java | 6 +-
.../geode/internal/cache/GemFireCacheImpl.java | 12 +-
.../partitioned/PartitionedRegionRebalanceOp.java | 4 +-
.../partitioned/rebalance/CompositeDirector.java | 2 +
.../rebalance/ExplicitMoveDirector.java | 11 +-
.../cache/partitioned/rebalance/FPRDirector.java | 2 +
.../cache/partitioned/rebalance/MoveBuckets.java | 3 +-
.../cache/partitioned/rebalance/MovePrimaries.java | 3 +-
.../partitioned/rebalance/MovePrimariesFPR.java | 7 +-
.../rebalance/PercentageMoveDirector.java | 7 +-
.../partitioned/rebalance/RebalanceDirector.java | 1 +
.../rebalance/RebalanceDirectorAdapter.java | 2 +
.../rebalance/RemoveOverRedundancy.java | 7 +-
.../partitioned/rebalance/SatisfyRedundancy.java | 5 +-
.../rebalance/SatisfyRedundancyFPR.java | 7 +-
.../rebalance/model/AddressComparor.java | 19 +-
.../cache/partitioned/rebalance/model/Bucket.java | 160 ++++
.../partitioned/rebalance/model/BucketRollup.java | 104 +++
.../cache/partitioned/rebalance/model/Member.java | 239 ++++++
.../partitioned/rebalance/model/MemberRollup.java | 159 ++++
.../cache/partitioned/rebalance/model/Move.java | 74 ++
.../{ => model}/PartitionedRegionLoadModel.java | 812 +--------------------
.../partitioned/rebalance/model/RefusalReason.java | 49 ++
.../internal/cache/xmlcache/CacheXmlGenerator.java | 9 +-
.../internal/datasource/DataSourceFactory.java | 11 +-
.../apache/geode/internal/jndi/JNDIInvoker.java | 13 +-
.../management/internal/JmxManagerLocator.java | 4 +-
.../cli/commands/AlterAsyncEventQueueCommand.java | 4 +-
.../cli/commands/CommandAvailabilityIndicator.java | 2 +-
.../internal/cli/commands/ConfigurePDXCommand.java | 181 +++--
.../cli/commands/CreateJndiBindingCommand.java | 116 ++-
.../internal/cli/commands/DeployCommand.java | 4 +-
.../cli/commands/DestroyJndiBindingCommand.java | 70 +-
.../ExportImportClusterConfigurationCommands.java | 6 +-
.../internal/cli/commands/GfshCommand.java | 6 +-
.../cli/commands/ListJndiBindingCommand.java | 8 +-
.../cli/converters/ConfigPropertyConverter.java | 12 +-
.../cli/functions/CreateJndiBindingFunction.java | 48 +-
.../cli/functions/JndiBindingConfiguration.java | 217 ------
.../management/internal/cli/i18n/CliStrings.java | 9 +-
.../geode/management/internal/cli/shell/Gfsh.java | 2 +-
.../callbacks/ConfigurationChangeListener.java | 6 +-
.../functions/DownloadJarFunction.java | 4 +-
.../functions/GetClusterConfigurationFunction.java | 4 +-
.../SharedConfigurationStatusRequestHandler.java | 4 +-
.../sanctioned-geode-core-serializables.txt | 19 +-
...est.java => ValueConstraintRegressionTest.java} | 19 +-
.../AutoConnectionSourceImplJUnitTest.java | 11 +-
...itTest.java => QueryServiceRegressionTest.java} | 264 ++++---
...=> CacheXmlParameterizationRegressionTest.java} | 78 +-
...va => DefaultEvictionActionRegressionTest.java} | 75 +-
...=> ShorteningExpirationTimeRegressionTest.java} | 112 +--
.../LocatorLauncherIntegrationTestCase.java | 2 +-
.../geode/distributed/ServerLauncherDUnitTest.java | 17 +-
.../distributed/ServerLauncherDUnitTestHelper.java | 1 +
.../internal/CacheConfigIntegrationTest.java | 4 +-
.../InternalClusterConfigurationServiceTest.java | 148 +++-
...oDataThrowsRuntimeExceptionRegressionTest.java} | 28 +-
.../internal/tcpserver/TcpServerJUnitTest.java | 6 +-
... SystemFailureThreadCleanupRegressionTest.java} | 11 +-
...onCreateBeforeInitializationRegressionTest.java | 135 ++++
.../geode/internal/cache/Bug33359DUnitTest.java | 153 ----
.../geode/internal/cache/Bug33726DUnitTest.java | 156 ----
.../geode/internal/cache/Bug33726JUnitTest.java | 27 +-
.../CacheWriterGetOldValueIntegrationTest.java | 222 +++---
.../ClearRegionMessageAssertionRegressionTest.java | 121 +++
.../geode/internal/cache/GemFireCacheImplTest.java | 33 +
.../extension/mock/MockExtensionCommands.java | 5 +-
.../PartitionedRegionLoadModelJUnitTest.java | 11 +-
.../cache/wan/AsyncEventQueueTestBase.java | 15 +-
.../datasource/AbstractPoolCacheJUnitTest.java | 10 +-
.../apache/geode/management/JMXMBeanDUnitTest.java | 31 +-
.../commands/AlterAsyncEventQueueCommandTest.java | 6 +-
.../cli/commands/AlterCompressorDUnitTest.java | 6 +-
.../ConfigurePDXCommandIntegrationTest.java | 135 ++++
.../cli/commands/ConfigurePDXCommandTest.java | 382 ++++++++++
.../CreateAlterDestroyRegionCommandsDUnitTest.java | 6 +-
.../CreateAsyncEventQueueCommandDUnitTest.java | 6 +-
.../commands/CreateAsyncEventQueueCommandTest.java | 6 +-
.../CreateDefinedIndexesCommandDUnitTest.java | 6 +-
.../commands/CreateDefinedIndexesCommandTest.java | 11 +-
.../commands/CreateGatewayReceiverCommandTest.java | 6 +-
.../commands/CreateGatewaySenderCommandTest.java | 6 +-
.../CreateJndiBindingCommandDUnitTest.java | 6 +-
.../cli/commands/CreateJndiBindingCommandTest.java | 179 ++---
.../DestroyAsyncEventQueueCommandDUnitTest.java | 14 +-
.../DestroyAsyncEventQueueCommandTest.java | 4 +-
.../commands/DestroyGatewaySenderCommandTest.java | 6 +-
.../DestroyJndiBindingCommandDUnitTest.java | 4 +-
.../commands/DestroyJndiBindingCommandTest.java | 139 +---
.../commands/DestroyRegionCommandDUnitTest.java | 10 +-
.../cli/commands/DestroyRegionCommandTest.java | 6 +-
.../cli/commands/DiskStoreCommandsDUnitTest.java | 4 +-
.../cli/commands/GfshCommandJUnitTest.java | 6 +-
.../IndexCommandsShareConfigurationDUnitTest.java | 6 +-
.../converters/ConfigPropertyConverterTest.java | 6 +-
.../functions/CreateJndiBindingFunctionTest.java | 26 +-
.../functions/DestroyJndiBindingFunctionTest.java | 11 +-
.../cli/functions/ListJndiBindingFunctionTest.java | 13 +-
.../internal/cli/shell/GfshJunitTest.java | 10 +
.../internal/configuration/ClusterConfig.java | 4 +-
.../ClusterConfigLocatorRestartDUnitTest.java | 15 +-
.../ClusterConfigWithSecurityDUnitTest.java | 6 +-
...usterConfigurationServiceUsingDirDUnitTest.java | 4 +-
.../SharedConfigurationTestUtils.java | 4 +-
.../utils/XmlUtilsAddNewNodeJUnitTest.java | 5 +-
.../dunit/internal/JUnit4DistributedTestCase.java | 4 +-
.../geode/test/dunit/rules/ClusterStartupRule.java | 2 +-
.../geode/test/junit/rules/MemberStarterRule.java | 2 +-
...acheXmlParameterizationRegressionTest_cache.xml | 42 ++
...rameterizationRegressionTest_gemfire.properties | 19 +
.../DefaultEvictionActionRegressionTest_cache.xml | 29 +
.../geode/security/ClientCQAuthDUnitTest.java | 19 +-
.../topics/gemfire_properties.html.md.erb | 12 +-
.../gfsh/command-pages/create.html.md.erb | 55 +-
.../geode/test/junit/categories/GfshTest.java | 19 +-
.../test/junit/categories/ManagementTest.java | 19 +-
.../LuceneClusterConfigurationDUnitTest.java | 7 +-
.../cache/execute/FunctionExceptionTest.java | 49 --
.../protobuf/v1/utilities/ProtobufUtilities.java | 3 -
.../internal/cache/UpdateVersionDUnitTest.java | 668 ++++++-----------
.../cache/wan/CacheClientNotifierDUnitTest.java | 64 +-
.../cache/wan/Simple2CacheServerDUnitTest.java | 41 +-
.../geode/internal/cache/wan/WANTestBase.java | 105 +--
.../cli/commands/AlterRuntimeCommandDUnitTest.java | 4 +-
186 files changed, 4324 insertions(+), 3334 deletions(-)
create mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaData.java
rename geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/{TableKeyColumnManager.java => TableMetaDataManager.java} (62%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/configuration/RegionElement.java => geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataView.java (82%)
delete mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableKeyColumnManagerTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
create mode 100644 geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/CacheConfig.java (99%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/CacheElement.java (79%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/CacheLoaderType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/CacheTransactionManagerType.java (98%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/CacheWriterType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/ClassWithParametersType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/DeclarableType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/DiskDirType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/DiskDirsType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/DiskStoreType.java (98%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/DynamicRegionFactoryType.java (97%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/EnumActionDestroyOverflow.java (94%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/EnumReadableWritable.java (94%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/ExpirationAttributesType.java (98%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/FunctionServiceType.java (98%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/InitializerType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/JndiBindingsType.java (96%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/ParameterType.java (97%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/PdxType.java (98%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/PoolType.java (99%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/RegionAttributesDataPolicy.java (95%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/RegionAttributesIndexUpdateType.java (94%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/RegionAttributesMirrorType.java (94%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/RegionAttributesScope.java (95%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/RegionAttributesType.java (99%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/RegionConfig.java (98%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/ResourceManagerType.java (97%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/SerializationRegistrationType.java (98%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/ServerType.java (99%)
rename geode-core/src/main/java/org/apache/geode/{internal => }/cache/configuration/StringType.java (94%)
create mode 100644 geode-core/src/main/java/org/apache/geode/distributed/ClusterConfigurationService.java
rename geode-core/src/main/java/org/apache/geode/distributed/internal/{ClusterConfigurationService.java => InternalClusterConfigurationService.java} (94%)
copy geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java => geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/AddressComparor.java (65%)
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Bucket.java
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/BucketRollup.java
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Member.java
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/MemberRollup.java
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/Move.java
rename geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/{ => model}/PartitionedRegionLoadModel.java (55%)
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/rebalance/model/RefusalReason.java
delete mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/JndiBindingConfiguration.java
rename geode-core/src/test/java/org/apache/geode/cache/{query/Bug32947ValueConstraintJUnitTest.java => ValueConstraintRegressionTest.java} (86%)
rename geode-core/src/test/java/org/apache/geode/cache/query/{BugJUnitTest.java => QueryServiceRegressionTest.java} (67%)
rename geode-core/src/test/java/org/apache/geode/cache30/{Bug40255JUnitTest.java => CacheXmlParameterizationRegressionTest.java} (76%)
rename geode-core/src/test/java/org/apache/geode/cache30/{Bug40662JUnitTest.java => DefaultEvictionActionRegressionTest.java} (64%)
rename geode-core/src/test/java/org/apache/geode/cache30/{Bug44418JUnitTest.java => ShorteningExpirationTimeRegressionTest.java} (69%)
rename geode-core/src/test/java/org/apache/geode/distributed/internal/{Bug40751DUnitTest.java => ValueToDataThrowsRuntimeExceptionRegressionTest.java} (91%)
rename geode-core/src/test/java/org/apache/geode/internal/{Bug49856JUnitTest.java => SystemFailureThreadCleanupRegressionTest.java} (93%)
create mode 100755 geode-core/src/test/java/org/apache/geode/internal/cache/AfterRegionCreateBeforeInitializationRegressionTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/Bug33359DUnitTest.java
delete mode 100755 geode-core/src/test/java/org/apache/geode/internal/cache/Bug33726DUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/ClearRegionMessageAssertionRegressionTest.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/{ => rebalance}/PartitionedRegionLoadModelJUnitTest.java (99%)
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandIntegrationTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommandTest.java
create mode 100644 geode-core/src/test/resources/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest_cache.xml
create mode 100644 geode-core/src/test/resources/org/apache/geode/cache30/CacheXmlParameterizationRegressionTest_gemfire.properties
create mode 100644 geode-core/src/test/resources/org/apache/geode/cache30/DefaultEvictionActionRegressionTest_cache.xml
copy geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java => geode-junit/src/main/java/org/apache/geode/test/junit/categories/GfshTest.java (65%)
copy geode-connectors/src/test/java/org/apache/geode/codeAnalysis/AnalyzeConnectorsSerializablesJUnitTest.java => geode-junit/src/main/java/org/apache/geode/test/junit/categories/ManagementTest.java (65%)
delete mode 100644 geode-old-client-support/src/test/java/com/gemstone/gemfire/cache/execute/FunctionExceptionTest.java
--
To stop receiving notification emails like this one, please contact
ladyvader@apache.org.
[geode] 01/01: GEODE-4881: Support lucene reindexing (of existing
data) with rebalance
Posted by la...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ladyvader pushed a commit to branch feature/GEODE-4881
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4f91f53594bac3f36cb99c5d58278fa260a931bb
Author: Lynn Hughes-Godfrey <lh...@pivotal.io>
AuthorDate: Fri Mar 16 16:47:55 2018 -0700
GEODE-4881: Support lucene reindexing (of existing data) with rebalance
* LuceneServiceImpl changes to support AEQ addition to existing region (after index initialized)
* Testing with and without redundancy
---
.../cache/lucene/internal/LuceneServiceImpl.java | 12 +-
...ncyWithRegionCreatedBeforeReindexDUnitTest.java | 343 +++++++++++++++++++++
2 files changed, 349 insertions(+), 6 deletions(-)
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index 5d0ea48..01bc5c6 100644
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -224,18 +224,15 @@ public class LuceneServiceImpl implements InternalLuceneService {
LuceneSerializer serializer) {
validateRegionAttributes(region.getAttributes());
- String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, regionPath);
-
region.addCacheServiceProfile(new LuceneIndexCreationProfile(indexName, regionPath, fields,
analyzer, fieldAnalyzers, serializer));
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, regionPath);
LuceneIndexImpl luceneIndex = beforeDataRegionCreated(indexName, regionPath,
region.getAttributes(), analyzer, fieldAnalyzers, aeqId, serializer, fields);
afterDataRegionCreated(luceneIndex);
- region.addAsyncEventQueueId(aeqId, true);
-
createLuceneIndexOnDataRegion(region, luceneIndex);
}
@@ -309,15 +306,18 @@ public class LuceneServiceImpl implements InternalLuceneService {
*/
public void afterDataRegionCreated(InternalLuceneIndex index) {
index.initialize();
- registerIndex(index);
+
if (this.managementListener != null) {
this.managementListener.afterIndexCreated(index);
}
+ String aeqId = LuceneServiceImpl.getUniqueIndexName(index.getName(), index.getRegionPath());
+
+ ((LuceneIndexImpl) index).getDataRegion().addAsyncEventQueueId(aeqId, true);
PartitionedRepositoryManager repositoryManager =
(PartitionedRepositoryManager) index.getRepositoryManager();
repositoryManager.allowRepositoryComputation();
-
+ registerIndex(index);
}
public LuceneIndexImpl beforeDataRegionCreated(final String indexName, final String regionPath,
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java
new file mode 100644
index 0000000..25dc640
--- /dev/null
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest.java
@@ -0,0 +1,343 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.cache.lucene;
+
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.INDEX_NAME;
+import static org.apache.geode.cache.lucene.test.LuceneTestUtilities.REGION_NAME;
+
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.IntStream;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.control.RebalanceFactory;
+import org.apache.geode.cache.control.RebalanceOperation;
+import org.apache.geode.cache.control.RebalanceResults;
+import org.apache.geode.cache.control.ResourceManager;
+import org.apache.geode.cache.lucene.internal.LuceneIndexFactoryImpl;
+import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
+import org.apache.geode.cache.partition.PartitionMemberInfo;
+import org.apache.geode.cache.partition.PartitionRebalanceInfo;
+import org.apache.geode.cache.partition.PartitionRegionInfo;
+import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+
+@Category(DistributedTest.class)
+@RunWith(JUnitParamsRunner.class)
+public class RebalanceWithRedundancyWithRegionCreatedBeforeReindexDUnitTest
+ extends LuceneQueriesAccessorBase {
+
+ protected VM dataStore3;
+ protected VM dataStore4;
+
+ public void postSetUp() throws Exception {
+ super.postSetUp();
+ dataStore3 = Host.getHost(0).getVM(2);
+ dataStore4 = Host.getHost(0).getVM(3);
+ }
+
+ @Before
+ public void setNumBuckets() {
+ NUM_BUCKETS = 113;
+ }
+
+ @Before
+ public void setLuceneReindexFlag() {
+ dataStore1.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ dataStore2.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ dataStore3.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ dataStore4.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ }
+
+ @Override
+ protected RegionTestableType[] getListOfRegionTestTypes() {
+ return new RegionTestableType[] {RegionTestableType.PARTITION,
+ RegionTestableType.PARTITION_REDUNDANT};
+ }
+
+ @After
+ public void clearLuceneReindexFlag() {
+ dataStore1.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ dataStore2.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ dataStore3.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ dataStore4.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ }
+
+ protected SerializableRunnable createIndex = new SerializableRunnable("createIndex") {
+ public void run() {
+ LuceneService luceneService = LuceneServiceProvider.get(getCache());
+ ((LuceneIndexFactoryImpl) luceneService.createIndexFactory()).addField("text")
+ .create(INDEX_NAME, REGION_NAME, LuceneServiceImpl.LUCENE_REINDEX);
+ }
+ };
+
+ protected SerializableRunnable rebalance = new SerializableRunnable("rebalance") {
+ public void run() {
+ Cache cache = getCache();
+ cache.getRegion(REGION_NAME);
+
+ ResourceManager resMan = cache.getResourceManager();
+ RebalanceFactory factory = resMan.createRebalanceFactory();
+ System.out.println("Starting rebalance");
+ RebalanceResults rebalanceResults = null;
+ RebalanceOperation rebalanceOp = factory.start();
+ try {
+ rebalanceResults = rebalanceOp.getResults();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ Awaitility.await().atMost(60, TimeUnit.SECONDS).until(() -> rebalanceOp.isDone());
+ System.out.println("Rebalance completed: "
+ + RebalanceResultsToString(rebalanceResults, "Rebalance completed"));
+ }
+ };
+
+ protected SerializableRunnable doConcOps = new SerializableRunnable("doConcOps") {
+ public void run() {
+ putEntryInEachBucket(113);
+ }
+ };
+
+ protected void createIndexAndRebalance(RegionTestableType regionTestType,
+ SerializableRunnableIF createIndex, boolean doOps) throws Exception {
+
+ // give rebalance some work to do by adding another vm
+ // dataStore4.invoke(() -> (createIndex));
+ dataStore4.invoke(() -> initDataStore(regionTestType));
+
+ AsyncInvocation aiRebalancer = dataStore1.invokeAsync(rebalance);
+
+ if (doOps) {
+ AsyncInvocation aiConcOps = dataStore1.invokeAsync(doConcOps);
+ aiConcOps.join();
+ aiConcOps.checkException();
+ }
+
+ // re-index stored data
+ AsyncInvocation ai1 = dataStore1.invokeAsync(createIndex);
+ AsyncInvocation ai2 = dataStore2.invokeAsync(createIndex);
+ AsyncInvocation ai3 = dataStore3.invokeAsync(createIndex);
+ AsyncInvocation ai4 = dataStore4.invokeAsync(createIndex);
+
+ aiRebalancer.join();
+ aiRebalancer.checkException();
+
+ ai1.join();
+ ai2.join();
+ ai3.join();
+ ai4.join();
+
+ ai1.checkException();
+ ai2.checkException();
+ ai3.checkException();
+ ai4.checkException();
+
+ }
+
+ @Test
+ @Parameters(method = "getListOfRegionTestTypes")
+ public void returnCorrectResultsWithConcurrentOpsAndRebalance(RegionTestableType regionTestType)
+ throws Exception {
+
+ createAndPopulateRegion(regionTestType, NUM_BUCKETS / 2);
+
+ createIndexAndRebalance(regionTestType, createIndex, true);
+
+ executeTextSearch(dataStore3, "world", "text", NUM_BUCKETS);
+
+ }
+
+ private void createAndPopulateRegion(RegionTestableType regionTestType, int numEntries) {
+
+ dataStore1.invoke(() -> initDataStore(regionTestType));
+ dataStore2.invoke(() -> initDataStore(regionTestType));
+ dataStore3.invoke(() -> initDataStore(regionTestType));
+
+ putEntryInEachBucket(numEntries);
+ }
+
+ protected void putEntryInEachBucket(int numBuckets) {
+ dataStore3.invoke(() -> {
+ final Cache cache = getCache();
+ Region<Object, Object> region = cache.getRegion(REGION_NAME);
+ IntStream.range(0, numBuckets).forEach(i -> region.put(i, new TestObject("hello world")));
+ });
+ }
+
+ public static String RebalanceResultsToString(RebalanceResults results, String title) {
+ if (results == null) {
+ return "null";
+ }
+ StringBuffer aStr = new StringBuffer();
+ aStr.append("Rebalance results (" + title + ") totalTime: "
+ + valueToString(results.getTotalTime()) + "\n");
+
+ // bucketCreates
+ aStr.append(
+ "totalBucketCreatesCompleted: " + valueToString(results.getTotalBucketCreatesCompleted()));
+ aStr.append(" totalBucketCreateBytes: " + valueToString(results.getTotalBucketCreateBytes()));
+ aStr.append(
+ " totalBucketCreateTime: " + valueToString(results.getTotalBucketCreateTime()) + "\n");
+
+ // bucketTransfers
+ aStr.append("totalBucketTransfersCompleted: "
+ + valueToString(results.getTotalBucketTransfersCompleted()));
+ aStr.append(
+ " totalBucketTransferBytes: " + valueToString(results.getTotalBucketTransferBytes()));
+ aStr.append(
+ " totalBucketTransferTime: " + valueToString(results.getTotalBucketTransferTime()) + "\n");
+
+ // primaryTransfers
+ aStr.append("totalPrimaryTransfersCompleted: "
+ + valueToString(results.getTotalPrimaryTransfersCompleted()));
+ aStr.append(" totalPrimaryTransferTime: " + valueToString(results.getTotalPrimaryTransferTime())
+ + "\n");
+
+ // PartitionRebalanceDetails (per region)
+ Set<PartitionRebalanceInfo> prdSet = results.getPartitionRebalanceDetails();
+ for (PartitionRebalanceInfo prd : prdSet) {
+ aStr.append(partitionRebalanceDetailsToString(prd));
+ }
+ aStr.append("total time (ms): " + valueToString(results.getTotalTime()));
+
+ String returnStr = aStr.toString();
+ return returnStr;
+ }
+
+ private static String partitionRebalanceDetailsToString(PartitionRebalanceInfo details) {
+ if (details == null) {
+ return "null\n";
+ }
+
+ StringBuffer aStr = new StringBuffer();
+ aStr.append("PartitionedRegionDetails for region named " + getRegionName(details) + " time: "
+ + valueToString(details.getTime()) + "\n");
+
+ // bucketCreates
+ aStr.append("bucketCreatesCompleted: " + valueToString(details.getBucketCreatesCompleted()));
+ aStr.append(" bucketCreateBytes: " + valueToString(details.getBucketCreateBytes()));
+ aStr.append(" bucketCreateTime: " + valueToString(details.getBucketCreateTime()) + "\n");
+
+ // bucketTransfers
+ aStr.append(
+ "bucketTransfersCompleted: " + valueToString(details.getBucketTransfersCompleted()));
+ aStr.append(" bucketTransferBytes: " + valueToString(details.getBucketTransferBytes()));
+ aStr.append(" bucketTransferTime: " + valueToString(details.getBucketTransferTime()) + "\n");
+
+ // primaryTransfers
+ aStr.append(
+ "PrimaryTransfersCompleted: " + valueToString(details.getPrimaryTransfersCompleted()));
+ aStr.append(" PrimaryTransferTime: " + valueToString(details.getPrimaryTransferTime()) + "\n");
+
+ // PartitionMemberDetails (before)
+ aStr.append("PartitionedMemberDetails (before)\n");
+ Set<PartitionMemberInfo> pmdSet = details.getPartitionMemberDetailsBefore();
+ for (PartitionMemberInfo pmd : pmdSet) {
+ aStr.append(partitionMemberDetailsToString(pmd));
+ }
+
+ // PartitionMemberDetails (after)
+ aStr.append("PartitionedMemberDetails (after)\n");
+ pmdSet = details.getPartitionMemberDetailsAfter();
+ for (PartitionMemberInfo pmd : pmdSet) {
+ aStr.append(partitionMemberDetailsToString(pmd));
+ }
+
+ return aStr.toString();
+ }
+
+ public static String partitionedRegionDetailsToString(PartitionRegionInfo prd) {
+
+ if (prd == null) {
+ return "null\n";
+ }
+
+ StringBuffer aStr = new StringBuffer();
+
+ aStr.append("PartitionedRegionDetails for region named " + getRegionName(prd) + "\n");
+ aStr.append(" configuredBucketCount: " + valueToString(prd.getConfiguredBucketCount()) + "\n");
+ aStr.append(" createdBucketCount: " + valueToString(prd.getCreatedBucketCount()) + "\n");
+ aStr.append(
+ " lowRedundancyBucketCount: " + valueToString(prd.getLowRedundancyBucketCount()) + "\n");
+ aStr.append(
+ " configuredRedundantCopies: " + valueToString(prd.getConfiguredRedundantCopies()) + "\n");
+ aStr.append(" actualRedundantCopies: " + valueToString(prd.getActualRedundantCopies()) + "\n");
+
+ // memberDetails
+ Set<PartitionMemberInfo> pmd = prd.getPartitionMemberInfo();
+ for (PartitionMemberInfo memberDetails : pmd) {
+ aStr.append(partitionMemberDetailsToString(memberDetails));
+ }
+
+ // colocatedWithDetails
+ String colocatedWith = prd.getColocatedWith();
+ aStr.append(" colocatedWith: " + colocatedWith + "\n");
+
+ String returnStr = aStr.toString();
+ return returnStr;
+ }
+
+ private static String partitionMemberDetailsToString(PartitionMemberInfo pmd) {
+ StringBuffer aStr = new StringBuffer();
+ long localMaxMemory = pmd.getConfiguredMaxMemory();
+ long size = pmd.getSize();
+ aStr.append(" Member Details for: " + pmd.getDistributedMember() + "\n");
+ aStr.append(" configuredMaxMemory: " + valueToString(localMaxMemory));
+ double inUse = (double) size / localMaxMemory;
+ double heapUtilization = inUse * 100;
+ aStr.append(" size: " + size + " (" + valueToString(heapUtilization) + "%)");
+ aStr.append(" bucketCount: " + valueToString(pmd.getBucketCount()));
+ aStr.append(" primaryCount: " + valueToString(pmd.getPrimaryCount()) + "\n");
+ return aStr.toString();
+ }
+
+ /**
+ * Convert the given long to a String; if it is negative then flag it in the string
+ */
+ private static String valueToString(long value) {
+ String returnStr = "" + value;
+ return returnStr;
+ }
+
+ /**
+ * Convert the given double to a String; if it is negative then flag it in the string
+ */
+ private static String valueToString(double value) {
+ String returnStr = "" + value;
+ return returnStr;
+ }
+
+ public static String getRegionName(PartitionRegionInfo prd) {
+ return prd.getRegionPath().substring(1);
+ }
+
+ public static String getRegionName(PartitionRebalanceInfo prd) {
+ return prd.getRegionPath().substring(1);
+ }
+}
--
To stop receiving notification emails like this one, please contact
ladyvader@apache.org.