Merge branch 'develop' into feature/GEODE-420 # Conflicts: # geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d35ec46c Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d35ec46c Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d35ec46c Branch: refs/heads/feature/GEODE-420 Commit: d35ec46cb08f7a601c0b96e18b00d759bb6cd074 Parents: 02c0bec a0a1fdc Author: Udo Kohlmeyer <[email protected]> Authored: Mon Aug 22 12:00:45 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Mon Aug 22 12:00:45 2016 +1000 ---------------------------------------------------------------------- .../cache/client/internal/AbstractOp.java | 11 + .../client/internal/ClientMetadataService.java | 40 +- .../cache/client/internal/DestroyOp.java | 22 +- .../client/internal/GetClientPRMetaDataOp.java | 24 +- .../gemfire/cache/client/internal/GetOp.java | 18 +- .../gemfire/cache/client/internal/PutAllOp.java | 7 +- .../gemfire/cache/client/internal/PutOp.java | 46 +- .../cache/client/internal/RemoveAllOp.java | 7 +- .../internal/SingleHopOperationCallable.java | 1 + .../internal/InternalDistributedSystem.java | 14 - .../internal/locks/GrantorRequestProcessor.java | 5 +- .../gemfire/internal/cache/CachePerfStats.java | 2 +- .../internal/cache/ColocationHelper.java | 38 +- .../internal/cache/ColocationLogger.java | 180 ++++ .../internal/cache/PartitionRegionConfig.java | 2 +- .../internal/cache/PartitionedRegion.java | 111 ++- .../internal/cache/ha/HARegionQueue.java | 8 +- .../cache/tier/sockets/BaseCommand.java | 4 +- .../internal/cache/tier/sockets/Message.java | 2 - .../cache/tier/sockets/command/Destroy.java | 8 +- .../cache/tier/sockets/command/Destroy65.java | 7 +- .../cache/tier/sockets/command/Destroy70.java | 2 +- .../cache/tier/sockets/command/Get70.java | 9 +- .../cache/tier/sockets/command/Invalidate.java | 8 +- .../tier/sockets/command/Invalidate70.java | 2 +- .../cache/tier/sockets/command/Put61.java | 7 +- .../cache/tier/sockets/command/Put65.java | 13 +- .../cache/tier/sockets/command/Put70.java | 2 +- .../cache/tier/sockets/command/PutAll.java | 7 +- .../cache/tier/sockets/command/PutAll70.java | 9 +- .../cache/tier/sockets/command/PutAll80.java | 9 +- .../cache/tier/sockets/command/RemoveAll.java | 9 +- .../cache/tier/sockets/command/Request.java | 7 +- .../parallel/ParallelGatewaySenderQueue.java | 2 +- .../gemfire/internal/i18n/LocalizedStrings.java | 3 + .../util/concurrent/StoppableCondition.java | 58 +- .../internal/cache/ColocationHelperTest.java | 148 +++ .../PartitionedRegionSingleHopDUnitTest.java | 5 +- .../internal/cache/SingleHopStatsDUnitTest.java | 17 +- ...tentColocatedPartitionedRegionDUnitTest.java | 973 ++++++++++++++++++- .../PersistentPartitionedRegionTestBase.java | 17 +- .../rules/LocatorServerConfigurationRule.java | 149 +++ .../internal/LuceneIndexCreationProfile.java | 98 +- .../internal/cli/LuceneIndexCommands.java | 7 + .../lucene/internal/cli/LuceneIndexDetails.java | 8 +- .../internal/cli/LuceneSearchResults.java | 2 +- .../functions/LuceneCreateIndexFunction.java | 12 +- .../lucene/LuceneIndexCreationDUnitTest.java | 58 +- .../LuceneIndexCreationProfileJUnitTest.java | 11 +- .../cli/LuceneIndexCommandsDUnitTest.java | 34 + .../cli/LuceneIndexCommandsJUnitTest.java | 40 + .../LuceneClusterConfigurationDUnitTest.java | 361 +++++++ .../cache/lucene/test/LuceneTestUtilities.java | 11 +- 53 files changed, 2296 insertions(+), 359 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d35ec46c/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java ---------------------------------------------------------------------- diff --cc geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java index 94d0ede,b9566df..b741015 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java @@@ -470,21 -421,18 +470,18 @@@ public class InternalDistributedSystem this.shareSockets = this.originalConfig.getConserveSockets(); this.startTime = System.currentTimeMillis(); this.grc = new GrantorRequestProcessor.GrantorRequestContext(stopper); - + - elderLock = new StoppableReentrantLock(stopper); - elderLockCondition = elderLock.newCondition(); - this.creationStack = TEST_CREATION_STACK_GENERATOR.get().generateCreationStack(this.originalConfig); -// if (DistributionConfigImpl.multicastTest) { -// this.logger.warning("Use of multicast has been forced"); -// } -// if (DistributionConfigImpl.forceDisableTcp) { -// this.logger.warning("Use of UDP has been forced"); -// } -// if (com.gemstone.gemfire.distributed.internal.membership.jgroup.JGroupMembershipManager.multicastTest) { -// this.logger.warning("Use of multicast for all distributed cache operations has been forced"); -// } + // if (DistributionConfigImpl.multicastTest) { + // this.logger.warning("Use of multicast has been forced"); + // } + // if (DistributionConfigImpl.forceDisableTcp) { + // this.logger.warning("Use of UDP has been forced"); + // } + // if (com.gemstone.gemfire.distributed.internal.membership.jgroup.JGroupMembershipManager.multicastTest) { + // this.logger.warning("Use of multicast for all distributed cache operations has been forced"); + // } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d35ec46c/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java ---------------------------------------------------------------------- diff --cc geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java index f63078d,5f9213d..de646a2 --- a/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java @@@ -3732,21 -3760,22 +3732,24 @@@ public class LocalizedStrings public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_NO_ANALYZER_ON_THAT_FIELD = new StringId(6630, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with no analyzer on that field."); public static final StringId LuceneService_CANNOT_CREATE_INDEX_0_ON_REGION_1_WITH_ANALYZER_2_ON_FIELD_3_BECAUSE_ANOTHER_MEMBER_DEFINES_THE_SAME_INDEX_WITH_ANALYZER_4_ON_THAT_FIELD = new StringId(6631, "Cannot create Lucene index {0} on region {1} with analyzer {2} on field {3} because another member defines the same index with analyzer {4} on that field."); - public static final StringId AbstractDistributionConfig_CLUSTER_SSL_ALIAS_0 = new StringId(6633,"SSL communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); - public static final StringId AbstractDistributionConfig_GATEWAY_SSL_ALIAS_0 = new StringId(6634,"SSL gateway communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); - public static final StringId AbstractDistributionConfig_SERVER_SSL_ALIAS_0 = new StringId(6635,"SSL inter-server communication (peer-to-peer) uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); - public static final StringId AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0 = new StringId(6636,"SSL http service communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); - public static final StringId AbstractDistributionConfig_JMX_MANAGER_SSL_ALIAS_0 = new StringId(6637,"SSL jmx communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); + public static final StringId AbstractDistributionConfig_CLUSTER_SSL_ALIAS_0 = new StringId(6633, "SSL communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); + public static final StringId AbstractDistributionConfig_GATEWAY_SSL_ALIAS_0 = new StringId(6634, "SSL gateway communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); + public static final StringId AbstractDistributionConfig_SERVER_SSL_ALIAS_0 = new StringId(6635, "SSL inter-server communication (peer-to-peer) uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); + public static final StringId AbstractDistributionConfig_HTTP_SERVICE_SSL_ALIAS_0 = new StringId(6636, "SSL http service communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); + public static final StringId AbstractDistributionConfig_JMX_MANAGER_SSL_ALIAS_0 = new StringId(6637, "SSL jmx communication uses the this alias when determining the key to use from the keystore for SSL. Defaults to \"{0}\"."); - public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_0_INVALID_TRY_1 = new StringId(6638,"\"{0}\" is not in the valid set of options \"{1}\""); + public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_0_INVALID_TRY_1 = new StringId(6638, "\"{0}\" is not in the valid set of options \"{1}\""); - public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET = new StringId(6639,"When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases"); + public static final StringId AbstractDistributionConfig_SSL_ENABLED_COMPONENTS_SET_INVALID_DEPRECATED_SSL_SET = new StringId(6639, "When using ssl-enabled-components one cannot use any other SSL properties other than cluster-ssl-* or the corresponding aliases"); + public static final StringId ColocationHelper_REGION_SPECIFIED_IN_COLOCATEDWITH_DOES_NOT_EXIST = new StringId(6640, "Region specified in ''colocated-with'' ({0}) for region {1} does not exist. It should be created before setting ''colocated-with'' attribute for this region."); + public static final StringId ColocationLogger_PERSISTENT_DATA_RECOVERY_OF_REGION_PREVENTED_BY_OFFLINE_COLOCATED_CHILDREN = new StringId(6641, "Persistent data recovery for region {0} is prevented by offline colocated region{1}"); + /** Testing strings, messageId 90000-99999 **/ - - /** These are simple messages for testing, translated with Babelfish. **/ + + /** + * These are simple messages for testing, translated with Babelfish. + **/ public static final StringId TESTING_THIS_IS_A_TEST_MESSAGE = new StringId(90000, "This is a test message."); public static final StringId TESTING_THIS_MESSAGE_HAS_0_MEMBERS = new StringId(90001, "Please ignore: This message has {0} members."); public static final StringId OBJECT_PREFIX = new StringId(90002, "Object_");
