You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2018/04/23 18:37:03 UTC
[geode] branch feature/GEODE-925 updated (8918195 -> 7640664)
This is an automated email from the ASF dual-hosted git repository.
udo pushed a change to branch feature/GEODE-925
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit 8918195 GEODE-925: Replaced all Wait.pause with Awaitility. Replaced all ThreadUtils.join with an Awaitility. General code and lambda clean up
add 8ec0c53 GEODE-5110: Remove use of subSections in CompositeResultData structures (#1826)
add 36204d1 GEODE-5038: Improve human-readable formatting of arrays in PdxInstance.toString(). (#1793)
add 2c96f1a GEODE-4858: move the utility methods out of ClusterConfigurationService (#1822)
add 65da520 GEDOE-4919 Make WAN region creation restrictions more prominent (#1829)
add 2b6a6d9 GEODE_2121: add categories to tests
add 4c2f9e8 GEODE-5078: provide API that does not allow access to internal regions (#1815)
add 179fc13 GEODE-5119 - add spruce to ci docker image.
add 07d6a74 Change keyserver back to mit because reasons.
add 09ddd56 Remove unused Ziputil from test source
add d658722 GEODE-5089: Removed test recoverRepoInANewNode (#1810)
add 5536886 GEODE-5082: Reindex not allowed on mixed server versions. (#1803)
add 47ae5e7 GEODE-5102: Lucene rolling test with REINDEX (#1818)
add af5d6ee GEODE-1279: Rename HARegionQueueSizeRegressionTest
add 7cc9e8f GEODE-5020: Move HARegionQueue system properties to SystemPropertyHelper
add 83dd8fc GEODE-5058: Delete redundant DUnit tests with JUnit4 prefix
add 3849147 GEODE-5033: Improve TearDown of DistributedTestRule
add 34acd5c GEODE-4876: Remove additional uses of DUnit Host and cleanup
add f144fb4 GEODE-5060: Delete DistributedDisconnectRule
add 46b8dde GEODE-5033: Use DistributedTestRule as non-static Rule
add 0ac5587 GEODE-1279: Rename BucketCreationCrash RegressionTests
add b5fc48c GEODE-1279: Delete useless test Bug51400DUnitTest
add fcc9436 GEODE-1279: Rename RegisterInterestKeysValuesDistributedTest
add 2e22ab1 GEODE-1279: Rename DeltaPropagationFailureRegressionTest
add 130a13d GEODE-1279: Rename QueueRemovalMessageProcessingDistributedTest
add d66fd4f GEODE-5033: Fixup OverridingGetPropertiesDisconnectsAllDistributedTest
add 8962935 GEODE-2668: Add new command class for destroy gateway-receivers (#1764)
add 3f6cda6 GEODE-5114: Archive UITest results (#1830)
new 7640664 GEODE-925: Replaced all Wait.pause with Awaitility. Replaced all ThreadUtils.join with an Awaitility. General code and lambda clean up
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 (8918195)
\
N -- N -- N refs/heads/feature/GEODE-925 (7640664)
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/docker/Dockerfile | 91 +-
ci/docker/docker.list | 2 +-
ci/pipelines/develop.yml | 20 +
.../internal/web/RestFunctionExecuteDUnitTest.java | 3 +-
.../RestAPIOnRegionFunctionExecutionDUnitTest.java | 3 +-
.../internal/web/controllers/RestAPITestBase.java | 3 +-
.../controllers/RestAPIsAndInterOpsDUnitTest.java | 3 +-
...RestAPIsOnGroupsFunctionExecutionDUnitTest.java | 3 +-
...estAPIsOnMembersFunctionExecutionDUnitTest.java | 3 +-
.../web/controllers/RestAPIsWithSSLDUnitTest.java | 3 +-
.../jdbc/internal/cli/AlterConnectionCommand.java | 5 +-
.../jdbc/internal/cli/AlterMappingCommand.java | 5 +-
.../internal/cli/DescribeConnectionCommand.java | 3 +-
.../jdbc/internal/cli/DescribeMappingCommand.java | 3 +-
.../internal/cli/DestroyConnectionCommand.java | 4 +-
.../jdbc/internal/cli/DestroyMappingCommand.java | 3 +-
.../AnalyzeConnectorsSerializablesJUnitTest.java | 3 +-
.../internal/cli/AlterConnectionCommandTest.java | 19 +-
.../jdbc/internal/cli/AlterMappingCommandTest.java | 18 +-
.../cli/DescribeConnectionCommandTest.java | 10 +-
.../internal/cli/DescribeMappingCommandTest.java | 6 +-
.../geode/cache/configuration/CacheElement.java | 53 +
.../distributed/ClusterConfigurationService.java | 62 +-
.../geode/internal/cache/GemFireCacheImpl.java | 91 +-
.../apache/geode/internal/cache/InternalCache.java | 7 +
.../cache/InternalCacheForClientAccess.java | 1189 ++++++++++++++++++++
.../geode/internal/cache/InternalRegion.java | 2 +
.../geode/internal/cache/ha/HARegionQueue.java | 67 +-
.../internal/cache/xmlcache/CacheCreation.java | 5 +
.../geode/internal/lang/SystemPropertyHelper.java | 4 +
.../cli/commands/CommandAvailabilityIndicator.java | 1 +
.../cli/commands/CompactDiskStoreCommand.java | 12 +-
.../cli/commands/CreateJndiBindingCommand.java | 3 +-
.../cli/commands/DescribeConfigCommand.java | 20 +-
.../cli/commands/DescribeRegionCommand.java | 4 +-
.../commands/DestroyGatewayReceiverCommand.java | 91 ++
.../cli/commands/DestroyJndiBindingCommand.java | 3 +-
.../functions/DestroyGatewayReceiverFunction.java | 76 ++
.../internal/cli/result/CompositeResultData.java | 113 --
.../apache/geode/pdx/internal/PdxInstanceImpl.java | 27 +-
.../pdx/internal/WritablePdxInstanceImpl.java | 16 +-
.../sanctioned-geode-core-serializables.txt | 1 +
.../java/org/apache/geode/DataSerializerTest.java | 3 +-
.../java/org/apache/geode/LonerDMJUnitTest.java | 3 +-
.../org/apache/geode/SystemFailureJUnitTest.java | 3 +-
.../cache/client/internal/AbstractOpTest.java | 3 +-
...pClientExecutorSubmitTaskWithExceptionTest.java | 3 +-
.../locator/LocatorStatusResponseJUnitTest.java | 3 +-
.../apache/geode/cache30/ReconnectDUnitTest.java | 3 +-
.../cache30/RegionMembershipListenerDUnitTest.java | 3 +-
.../geode/cache30/RequiredRolesDUnitTest.java | 3 +-
.../org/apache/geode/cache30/SlowRecDUnitTest.java | 3 +-
.../AnalyzeSerializablesJUnitTest.java | 3 +-
.../distributed/DistributedMemberDUnitTest.java | 3 +-
.../internal/DistributionMessageTest.java | 3 +-
.../LocatorLoadSnapshotIntegrationTest.java | 3 +-
.../internal/LocatorLoadSnapshotJUnitTest.java | 3 +-
.../distributed/internal/ReplyProcessor21Test.java | 3 +-
.../internal/locks/DLockServiceLeakTest.java | 3 +-
.../internal/membership/InternalRoleJUnitTest.java | 3 +-
...ackwardCompatibilitySerializationDUnitTest.java | 3 +-
.../internal/ClassNotFoundExceptionDUnitTest.java | 3 +-
.../java/org/apache/geode/internal/DSCODETest.java | 3 +-
.../geode/internal/DataSerializableJUnitTest.java | 28 +-
.../internal/HeapDataOutputStreamJUnitTest.java | 3 +-
.../geode/internal/HeapDataOutputStreamTest.java | 3 +-
.../internal/InternalDataSerializerJUnitTest.java | 3 +-
...InternalDataSerializerQuickcheckStringTest.java | 3 +-
...alDataSerializerSerializationWhitelistTest.java | 3 +-
.../geode/internal/PdxDeleteFieldDUnitTest.java | 3 +-
.../geode/internal/PdxDeleteFieldJUnitTest.java | 3 +-
.../apache/geode/internal/PdxRenameDUnitTest.java | 3 +-
.../apache/geode/internal/PdxRenameJUnitTest.java | 3 +-
.../internal/SSLConfigIntegrationJUnitTest.java | 3 +-
.../SystemFailureThreadCleanupRegressionTest.java | 3 +-
...java => BucketCreationCrashRegressionTest.java} | 46 +-
.../cache/InternalCacheForClientAccessTest.java | 332 ++++++
.../cache/P2PDeltaPropagationDUnitTest.java | 3 +-
.../internal/cache/SingleHopStatsDUnitTest.java | 3 +-
.../internal/cache/SystemFailureDUnitTest.java | 3 +-
.../org/apache/geode/internal/cache/UnzipUtil.java | 76 --
.../geode/internal/cache/ha/Bug48571DUnitTest.java | 290 -----
.../geode/internal/cache/ha/Bug48879DUnitTest.java | 227 ----
...java => HARegionQueueExpiryRegressionTest.java} | 6 +-
.../internal/cache/ha/HARegionQueueJUnitTest.java | 4 +-
.../cache/ha/HARegionQueueSizeRegressionTest.java | 245 ++++
.../geode/internal/cache/ha/HARegionQueueTest.java | 3 +-
.../HARegionQueueThreadIdExpiryRegressionTest.java | 198 ++++
...BucketCreationCrashCompletesRegressionTest.java | 248 ++++
.../cache/partitioned/Bug39356DUnitTest.java | 233 ----
.../cache/partitioned/Bug43684DUnitTest.java | 359 ------
.../cache/partitioned/Bug47388DUnitTest.java | 265 -----
.../cache/partitioned/Bug51400DUnitTest.java | 181 ---
...eueRemovalMessageProcessingDistributedTest.java | 269 +++++
.../RegisterInterestKeysValuesDistributedTest.java | 394 +++++++
.../internal/cache/tier/Bug40396DUnitTest.java | 217 ----
.../DeltaPropagationFailureRegressionTest.java | 155 +++
.../AcceptorImplClientQueueDistributedTest.java | 3 +-
.../cache/tier/sockets/AcceptorImplDUnitTest.java | 3 +-
.../internal/cache/tier/sockets/CCUStatsTest.java | 3 +-
.../tier/sockets/ClientHealthMonitorJUnitTest.java | 3 +-
.../ClientProxyWithDeltaDistributedTest.java | 3 +-
.../ClientWithInterestFailoverDistributedTest.java | 3 +-
.../internal/cache/tier/sockets/HandshakeTest.java | 3 +-
.../cache/tier/sockets/MessageIdExtractorTest.java | 3 +-
.../internal/cache/tier/sockets/PartTest.java | 3 +-
.../tier/sockets/RedundancyLevelTestBase.java | 3 +-
.../tier/sockets/ServerConnectionFactoryTest.java | 3 +-
.../sockets/ServerConnectionIntegrationTest.java | 3 +-
.../cache/tier/sockets/ServerConnectionTest.java | 3 +-
.../cache/tier/sockets/TcpServerFactoryTest.java | 3 +-
.../tier/sockets/command/CommitCommandTest.java | 3 +-
.../tier/sockets/command/ContainsKey66Test.java | 3 +-
.../tier/sockets/command/ContainsKeyTest.java | 3 +-
.../tier/sockets/command/CreateRegionTest.java | 3 +-
.../cache/tier/sockets/command/Destroy65Test.java | 3 +-
.../tier/sockets/command/DestroyRegionTest.java | 3 +-
.../cache/tier/sockets/command/DestroyTest.java | 3 +-
.../sockets/command/ExecuteFunction65Test.java | 3 +-
.../sockets/command/ExecuteFunction66Test.java | 3 +-
.../tier/sockets/command/ExecuteFunctionTest.java | 3 +-
.../cache/tier/sockets/command/Get70Test.java | 3 +-
.../cache/tier/sockets/command/GetAll651Test.java | 3 +-
.../cache/tier/sockets/command/GetAll70Test.java | 3 +-
.../cache/tier/sockets/command/GetAllTest.java | 3 +-
.../sockets/command/GetAllWithCallbackTest.java | 3 +-
.../GetClientPartitionAttributesCommand66Test.java | 3 +-
.../GetClientPartitionAttributesCommandTest.java | 3 +-
.../cache/tier/sockets/command/InvalidateTest.java | 3 +-
.../cache/tier/sockets/command/KeySetTest.java | 3 +-
.../cache/tier/sockets/command/Put61Test.java | 3 +-
.../cache/tier/sockets/command/Put65Test.java | 3 +-
.../cache/tier/sockets/command/PutTest.java | 3 +-
.../sockets/command/RegisterInterest61Test.java | 3 +-
.../command/RegisterInterestList61Test.java | 3 +-
.../command/RegisterInterestList66Test.java | 3 +-
.../sockets/command/RegisterInterestListTest.java | 3 +-
.../tier/sockets/command/RegisterInterestTest.java | 3 +-
.../cache/tier/sockets/command/RemoveAllTest.java | 3 +-
.../cache/tier/sockets/command/RequestTest.java | 3 +-
.../sockets/command/TXFailoverCommandTest.java | 3 +-
.../sockets/command/UnregisterInterestTest.java | 3 +-
.../geode/internal/net/SocketCloserJUnitTest.java | 3 +-
.../net/SocketCloserWithWaitJUnitTest.java | 3 +-
.../net/SocketCreatorFactoryJUnitTest.java | 3 +-
.../geode/internal/net/SocketCreatorJUnitTest.java | 3 +-
.../geode/internal/net/SocketUtilsJUnitTest.java | 3 +-
.../geode/internal/tcp/ConnectionTableTest.java | 3 +-
.../apache/geode/internal/tcp/ConnectionTest.java | 3 +-
.../cli/commands/CreateJndiBindingCommandTest.java | 25 +-
.../cli/commands/DescribeRegionDUnitTest.java | 14 +-
.../cli/commands/DescribeRegionJUnitTest.java | 12 +-
.../DestroyGatewayReceiverCommandTest.java | 103 ++
.../commands/DestroyJndiBindingCommandTest.java | 9 -
.../cli/commands/DiskStoreCommandsDUnitTest.java | 39 +-
.../DestroyGatewayReceiverFunctionTest.java | 95 ++
.../geode/pdx/DistributedSystemIdDUnitTest.java | 3 +-
.../geode/pdx/JSONFormatterBasicJUnitTest.java | 3 +-
.../geode/pdx/JSONPdxClientServerDUnitTest.java | 3 +-
.../geode/pdx/internal/PdxInstanceImplTest.java | 202 ++++
.../java/org/apache/geode/redis/AuthJUnitTest.java | 3 +-
.../apache/geode/redis/ConcurrentStartTest.java | 3 +-
.../org/apache/geode/redis/HashesJUnitTest.java | 3 +-
.../org/apache/geode/redis/ListsJUnitTest.java | 3 +-
.../org/apache/geode/redis/RedisDistDUnitTest.java | 3 +-
.../org/apache/geode/redis/RedisServerTest.java | 3 +-
.../java/org/apache/geode/redis/SetsJUnitTest.java | 3 +-
.../apache/geode/redis/SortedSetsJUnitTest.java | 3 +-
.../org/apache/geode/redis/StringsJunitTest.java | 3 +-
.../executor/AbstractScanExecutorTest.java | 3 +-
.../geode/test/dunit/DistributedTestUtils.java | 3 +-
.../dunit/cache/internal/JUnit4CacheTestCase.java | 5 +
.../CatchingUnexpectedExceptionExampleTest.java | 14 +-
.../examples/LocatorPortClusterExampleTest.java | 8 +-
.../dunit/internal/JUnit4DistributedTestCase.java | 62 +-
.../dunit/rules/AbstractDistributedTestRule.java | 94 ++
.../apache/geode/test/dunit/rules/CacheRule.java | 105 +-
.../test/dunit/rules/CleanupDUnitVMsRule.java | 12 +-
.../geode/test/dunit/rules/ClientCacheRule.java | 6 +-
.../dunit/rules/DistributedDisconnectRule.java | 138 ---
.../test/dunit/rules/DistributedDiskDirRule.java | 2 +
.../dunit/rules/DistributedExternalResource.java | 2 +-
.../rules/DistributedRestoreSystemProperties.java | 37 +-
.../test/dunit/rules/DistributedTestRule.java | 172 ++-
.../DistributedUseJacksonForJsonPathRule.java | 20 +-
.../geode/test/dunit/rules/SharedCountersRule.java | 13 +-
.../test/dunit/rules/SharedErrorCollector.java | 46 +-
.../tests/CacheRuleBuilderDistributedTest.java | 5 +-
.../rules/tests/CacheRuleDistributedTest.java | 5 +-
...edDisconnectRuleAsClassRuleDistributedTest.java | 172 ---
.../DistributedDisconnectRuleDistributedTest.java | 187 ---
...utedRestoreSystemPropertiesDistributedTest.java | 39 +-
.../DistributedRestoreSystemPropertiesTest.java | 56 -
.../tests/DistributedTestRuleDistributedTest.java | 9 +-
.../tests/SharedCountersRuleDistributedTest.java | 5 +-
.../tests/SharedErrorCollectorDistributedTest.java | 12 +-
...sicDUnitTest.java => BasicDistributedTest.java} | 76 +-
.../tests/GetCurrentVmNumDistributedTest.java | 6 +-
...=> GetDefaultDiskStoreNameDistributedTest.java} | 13 +-
.../GetPidAndIdAfterBounceDistributedTest.java | 6 +-
.../dunit/tests/GetPidAndIdDistributedTest.java | 6 +-
....java => GetTestMethodNameDistributedTest.java} | 12 +-
.../test/dunit/tests/JUnit4BasicDUnitTest.java | 243 ----
.../JUnit4GetDefaultDiskStoreNameDUnitTest.java | 67 --
.../tests/JUnit4GetTestMethodNameDUnitTest.java | 53 -
...ridingGetPropertiesDisconnectsAllDUnitTest.java | 60 -
.../geode/test/dunit/tests/JUnit4VMDUnitTest.java | 205 ----
...etPropertiesDisconnectsAllDistributedTest.java} | 30 +-
.../{VMDUnitTest.java => VMDistributedTest.java} | 24 +-
.../AnalyzeCQSerializablesJUnitTest.java | 3 +-
.../setting_up_a_multisite_system.html.md.erb | 22 +-
.../experimental/driver/AuthenticationTest.java | 3 +-
.../experimental/driver/DriverConnectionTest.java | 3 +-
.../driver/FunctionServiceIntegrationTest.java | 3 +-
.../driver/QueryServiceIntegrationTest.java | 3 +-
.../experimental/driver/RegionIntegrationTest.java | 3 +-
.../apache/geode/experimental/driver/SSLTest.java | 3 +-
.../experimental/driver/ValueEncoderTest.java | 3 +-
.../driver/ValueSerializerIntegrationTest.java | 3 +-
.../geode/test/junit/categories/RedisTest.java | 17 +-
.../cache/lucene/internal/LuceneServiceImpl.java | 49 +-
.../LuceneSearchWithRollingUpgradeDUnit.java | 151 ++-
...hRollingUpgradeReindexFlagEnabledDUnitTest.java | 31 +-
.../LuceneIndexRecoveryHAIntegrationTest.java | 126 ---
.../internal/LuceneServiceImplJUnitTest.java | 5 +
.../apache/geode/OldClientSupportDUnitTest.java | 3 +-
.../dunit/standalone/VersionManagerJUnitTest.java | 3 +-
.../OutputCapturingServerConnectionTest.java | 3 +-
.../tier/sockets/ProtobufServerConnectionTest.java | 3 +-
.../protobuf/ProtobufStreamProcessorTest.java | 3 +-
.../protobuf/v1/AuthenticationIntegrationTest.java | 3 +-
.../protobuf/v1/AuthorizationIntegrationTest.java | 3 +-
.../v1/DisconnectClientIntegrationTest.java | 3 +-
.../v1/ExecuteFunctionOnGroupIntegrationTest.java | 3 +-
.../v1/ExecuteFunctionOnMemberIntegrationTest.java | 3 +-
.../v1/ExecuteFunctionOnRegionIntegrationTest.java | 3 +-
.../v1/ProtobufProtocolServiceJUnitTest.java | 3 +-
.../v1/ProtocolVersionIntegrationTest.java | 3 +-
.../v1/ValueSerializerIntegrationTest.java | 3 +-
.../v1/acceptance/CacheConnectionJUnitTest.java | 5 +-
.../CacheConnectionTimeoutJUnitTest.java | 5 +-
.../v1/acceptance/CacheMaxConnectionJUnitTest.java | 6 +-
.../v1/acceptance/CacheOperationsJUnitTest.java | 5 +-
.../LocatorConnectionAuthenticationDUnitTest.java | 4 +-
.../v1/acceptance/LocatorConnectionDUnitTest.java | 4 +-
.../authentication/AuthorizingCacheImplTest.java | 3 +-
.../AuthorizingFunctionServiceImplTest.java | 3 +-
.../ClearRequestOperationHandlerJUnitTest.java | 3 +-
...ionOnGroupRequestOperationHandlerJUnitTest.java | 3 +-
...onOnMemberRequestOperationHandlerJUnitTest.java | 3 +-
...onOnRegionRequestOperationHandlerJUnitTest.java | 3 +-
.../GetAllRequestOperationHandlerJUnitTest.java | 3 +-
.../GetAndPutJsonDocumentsDUnitTest.java | 3 +-
...egionNamesRequestOperationHandlerJUnitTest.java | 3 +-
.../GetRequestOperationHandlerJUnitTest.java | 3 +-
.../GetServerOperationHandlerJUnitTest.java | 3 +-
.../GetSizeRequestOperationHandlerJUnitTest.java | 3 +-
.../KeySetOperationHandlerJUnitTest.java | 3 +-
.../v1/operations/OperationHandlerJUnitTest.java | 3 +-
...ueryRequestOperationHandlerIntegrationTest.java | 3 +-
.../OqlQueryRequestOperationHandlerJUnitTest.java | 3 +-
.../ProtocolVersionHandlerJUnitTest.java | 3 +-
.../PutAllRequestOperationHandlerJUnitTest.java | 3 +-
.../PutIfAbsentRequestIntegrationTest.java | 3 +-
...utIfAbsentRequestOperationHandlerJUnitTest.java | 3 +-
.../PutRequestOperationHandlerJUnitTest.java | 3 +-
.../RemoveRequestOperationHandlerJUnitTest.java | 3 +-
.../v1/operations/VersionValidatorJUnitTest.java | 3 +-
.../codec/JsonPdxConverterJUnitTest.java | 3 +-
.../ProtobufProtocolSerializerJUnitTest.java | 3 +-
.../v1/utilities/ProtobufUtilitiesJUnitTest.java | 3 +-
.../DestroyGatewayReceiverCommandDUnitTest.java | 427 +++++++
.../cache/wan/wancommand/WANCommandUtils.java | 5 +
.../AnalyzeWebApiSerializablesJUnitTest.java | 3 +-
.../AbstractBaseControllerJUnitTest.java | 3 +-
.../web/controllers/support/RegionDataTest.java | 3 +-
gradle/test.gradle | 12 +
277 files changed, 5574 insertions(+), 4121 deletions(-)
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/InternalCacheForClientAccess.java
create mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommand.java
create mode 100644 geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunction.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/{BucketCreationRequesterCrashHARegressionTest.java => BucketCreationCrashRegressionTest.java} (88%)
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/InternalCacheForClientAccessTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/UnzipUtil.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48879DUnitTest.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/ha/{ClientSubscriptionExpiryDataLossRegressionTest.java => HARegionQueueExpiryRegressionTest.java} (95%)
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueSizeRegressionTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARegionQueueThreadIdExpiryRegressionTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/BucketCreationCrashCompletesRegressionTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug39356DUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug43684DUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug47388DUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/Bug51400DUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/QueueRemovalMessageProcessingDistributedTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/RegisterInterestKeysValuesDistributedTest.java
delete mode 100755 geode-core/src/test/java/org/apache/geode/internal/cache/tier/Bug40396DUnitTest.java
create mode 100755 geode-core/src/test/java/org/apache/geode/internal/cache/tier/DeltaPropagationFailureRegressionTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommandTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DestroyGatewayReceiverFunctionTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/pdx/internal/PdxInstanceImplTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/AbstractDistributedTestRule.java
delete mode 100755 geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedDisconnectRule.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleAsClassRuleDistributedTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedDisconnectRuleDistributedTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedRestoreSystemPropertiesTest.java
rename geode-core/src/test/java/org/apache/geode/test/dunit/tests/{BasicDUnitTest.java => BasicDistributedTest.java} (70%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/tests/{GetDefaultDiskStoreNameDUnitTest.java => GetDefaultDiskStoreNameDistributedTest.java} (83%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/tests/{GetTestMethodNameDUnitTest.java => GetTestMethodNameDistributedTest.java} (79%)
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4BasicDUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4GetDefaultDiskStoreNameDUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4GetTestMethodNameDUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
delete mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/tests/JUnit4VMDUnitTest.java
rename geode-core/src/test/java/org/apache/geode/test/dunit/tests/{OverridingGetPropertiesDisconnectsAllDUnitTest.java => OverridingGetPropertiesDisconnectsAllDistributedTest.java} (69%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/tests/{VMDUnitTest.java => VMDistributedTest.java} (92%)
copy geode-cq/src/test/java/org/apache/geode/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java => geode-junit/src/main/java/org/apache/geode/test/junit/categories/RedisTest.java (69%)
copy geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/DistributedTestRuleDistributedTest.java => geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneSearchWithRollingUpgradeReindexFlagEnabledDUnitTest.java (50%)
delete mode 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
create mode 100644 geode-wan/src/test/java/org/apache/geode/internal/cache/wan/wancommand/DestroyGatewayReceiverCommandDUnitTest.java
--
To stop receiving notification emails like this one, please contact
udo@apache.org.
[geode] 01/01: GEODE-925: Replaced all Wait.pause with Awaitility.
Replaced all ThreadUtils.join with an Awaitility. General code and lambda
clean up
Posted by ud...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
udo pushed a commit to branch feature/GEODE-925
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 76406648c2131e42aba01283b10f2bc63224f120
Author: Udo Kohlmeyer <uk...@pivotal.io>
AuthorDate: Thu Apr 19 10:55:46 2018 -0700
GEODE-925: Replaced all Wait.pause with Awaitility. Replaced all ThreadUtils.join with an Awaitility. General code and lambda clean up
---
.../dunit/QueryDataInconsistencyDUnitTest.java | 648 +++++++++------------
1 file changed, 286 insertions(+), 362 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
index 20d3a78..cc7c336 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryDataInconsistencyDUnitTest.java
@@ -14,10 +14,16 @@
*/
package org.apache.geode.cache.query.dunit;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Properties;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.Logger;
+import org.awaitility.Awaitility;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -40,15 +46,13 @@ import org.apache.geode.cache.query.internal.QueryObserverHolder;
import org.apache.geode.cache.query.internal.index.IndexManager;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.internal.cache.execute.PRClientServerTestBase;
+import org.apache.geode.internal.logging.LogService;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
-import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -62,45 +66,34 @@ import org.apache.geode.test.junit.categories.OQLIndexTest;
public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
private static final int cnt = 0;
-
private static final int cntDest = 10;
-
static VM server = null;
-
static VM client = null;
-
static Cache cache = null;
-
- static String PartitionedRegionName1 = "TestPartitionedRegion1"; // default
- // name
- static String repRegionName = "TestRepRegion"; // default name
-
- static Integer serverPort1 = null;
-
- public static int numOfBuckets = 20;
-
+ private static String PartitionedRegionName1 = "TestPartitionedRegion1"; // default name
+ private static String repRegionName = "TestRepRegion"; // default name
public static String[] queries =
new String[] {"select * from /" + PartitionedRegionName1 + " where ID=1",};
+ private static volatile boolean hooked = false;
- public static String[] queriesForRR =
- new String[] {"<trace> select * from /" + repRegionName + " where ID=1"};
-
- public static volatile boolean hooked = false;
+ private Logger logger = LogService.getLogger(QueryDataInconsistencyDUnitTest.class.getName());
public QueryDataInconsistencyDUnitTest() {
super();
}
@Override
- public final void postTearDownCacheTestCase() throws Exception {
+ public final void postTearDownCacheTestCase() {
Invoke.invokeInEveryVM(JUnit4DistributedTestCase::disconnectFromDS);
Invoke.invokeInEveryVM(QueryObserverHolder::reset);
}
@Override
- public final void postSetUp() throws Exception {
+ public final void postSetUp() {
Host host = Host.getHost(0);
server = host.getVM(0);
+ Awaitility.setDefaultPollInterval(200, TimeUnit.MILLISECONDS);
+ Awaitility.waitAtMost(30, TimeUnit.SECONDS);
}
@Test
@@ -109,99 +102,79 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
Properties props = new Properties();
server.invoke(() -> PRClientServerTestBase.createCacheInVm(props));
- server.invoke(new CacheSerializableRunnable("create indexes") {
+ server.invoke("create indexes", () -> {
+ cache = CacheFactory.getAnyInstance();
+ Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
- @Override
- public void run2() throws CacheException {
- cache = CacheFactory.getAnyInstance();
- Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
-
- // Create common Portflios and NewPortfolios
- for (int j = cnt; j < cntDest; j++) {
- region.put(new Integer(j), new Portfolio(j));
- }
+ // Create common Portflios and NewPortfolios
+ for (int j = cnt; j < cntDest; j++) {
+ region.put(new Integer(j), new Portfolio(j));
+ }
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- try {
- Index index = qs.createIndex("idIndex", "ID", "/" + repRegionName);
- assertEquals(10, index.getStatistics().getNumberOfKeys());
- } catch (Exception e) {
- fail("Index creation failed");
- }
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ try {
+ Index index = qs.createIndex("idIndex", "ID", "/" + repRegionName);
+ assertEquals(10, index.getStatistics().getNumberOfKeys());
+ } catch (Exception e) {
+ fail("Index creation failed");
}
});
// Invoke update from client and stop in updateIndex
// first before updating the RegionEntry and second after updating
// the RegionEntry.
- AsyncInvocation putThread =
- server.invokeAsync(new CacheSerializableRunnable("update a Region Entry") {
-
- @Override
- public void run2() throws CacheException {
- Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
- IndexManager.testHook = new IndexManagerTestHook();
- repRegion.put(new Integer("1"), new Portfolio(cntDest + 1));
- // above call must be hooked in BEFORE_UPDATE_OP call.
- }
- });
- server.invoke(new CacheSerializableRunnable("query on server") {
-
- @Override
- public void run2() throws CacheException {
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- while (!hooked) {
- Wait.pause(100);
- }
- Object rs = null;
- try {
- rs = qs.newQuery("<trace> select * from /" + repRegionName + " where ID = 1").execute();
- } catch (Exception e) {
- e.printStackTrace();
- fail("Query execution failed on server.");
- IndexManager.testHook = null;
- }
- assertTrue(rs instanceof SelectResults);
- assertEquals(1, ((SelectResults) rs).size());
- Portfolio p1 = (Portfolio) ((SelectResults) rs).asList().get(0);
- if (p1.getID() != 1) {
- fail("Query thread did not verify index results even when RE is under update");
- IndexManager.testHook = null;
- }
- hooked = false;// Let client put go further.
+ AsyncInvocation putThread = server.invokeAsync("update a Region Entry", () -> {
+ Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
+ IndexManager.testHook = new IndexManagerTestHook();
+ repRegion.put(new Integer("1"), new Portfolio(cntDest + 1));
+ // above call must be hooked in BEFORE_UPDATE_OP call.
+ });
+ server.invoke("query on server", () -> {
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ Awaitility.await().until(() -> hooked);
+ Object rs = null;
+ try {
+ rs = qs.newQuery("<trace> select * from /" + repRegionName + " where ID = 1").execute();
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Query execution failed on server.");
+ IndexManager.testHook = null;
+ }
+ assertTrue(rs instanceof SelectResults);
+ assertEquals(1, ((SelectResults) rs).size());
+ Portfolio p1 = (Portfolio) ((SelectResults) rs).asList().get(0);
+ if (p1.getID() != 1) {
+ fail("Query thread did not verify index results even when RE is under update");
+ IndexManager.testHook = null;
}
+ hooked = false;// Let client put go further.
});
// Client put is again hooked in AFTER_UPDATE_OP call in updateIndex.
- server.invoke(new CacheSerializableRunnable("query on server") {
-
- @Override
- public void run2() throws CacheException {
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- while (!hooked) {
- Wait.pause(100);
- }
- Object rs = null;
- try {
- rs = qs.newQuery("<trace> select * from /" + repRegionName + " where ID = 1").execute();
- } catch (Exception e) {
- e.printStackTrace();
- fail("Query execution failed on server." + e.getMessage());
- } finally {
+ server.invoke("query on server", () -> {
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ Awaitility.await().until(() -> hooked);
+ Object rs = null;
+ try {
+ rs = qs.newQuery("<trace> select * from /" + repRegionName + " where ID = 1").execute();
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Query execution failed on server." + e.getMessage());
+ } finally {
+ IndexManager.testHook = null;
+ }
+ assertTrue(rs instanceof SelectResults);
+ if (((SelectResults) rs).size() > 0) {
+ Portfolio p1 = (Portfolio) ((SelectResults) rs).iterator().next();
+ if (p1.getID() != 1) {
+ fail("Query thread did not verify index results even when RE is under update and "
+ + "RegionEntry value has been modified before releasing the lock");
IndexManager.testHook = null;
}
- assertTrue(rs instanceof SelectResults);
- if (((SelectResults) rs).size() > 0) {
- Portfolio p1 = (Portfolio) ((SelectResults) rs).iterator().next();
- if (p1.getID() != 1) {
- fail("Query thread did not verify index results even when RE is under update and "
- + "RegionEntry value has been modified before releasing the lock");
- IndexManager.testHook = null;
- }
- }
- hooked = false;// Let client put go further.
}
+ hooked = false;// Let client put go further.
});
- ThreadUtils.join(putThread, 200);
+ Awaitility.await().until(joinThread(putThread));
+ // ThreadUtils.join(putThread, 200);
}
@Test
@@ -210,321 +183,277 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
Properties props = new Properties();
server.invoke(() -> PRClientServerTestBase.createCacheInVm(props));
- server.invoke(new CacheSerializableRunnable("create indexes") {
-
- @Override
- public void run2() throws CacheException {
- cache = CacheFactory.getAnyInstance();
- Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
- IndexManager.testHook = null;
- // Create common Portfolios and NewPortfolios
- Position.cnt = 0;
- for (int j = cnt; j < cntDest; j++) {
- Portfolio p = new Portfolio(j);
- CacheFactory.getAnyInstance().getLogger().fine("Shobhit: portfolio " + j + " : " + p);
- region.put(new Integer(j), p);
- }
+ server.invoke("create indexes", () -> {
+ cache = CacheFactory.getAnyInstance();
+ Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
+ IndexManager.testHook = null;
+ // Create common Portfolios and NewPortfolios
+ Position.cnt = 0;
+ for (int j = cnt; j < cntDest; j++) {
+ Portfolio p = new Portfolio(j);
+ CacheFactory.getAnyInstance().getLogger().fine("Shobhit: portfolio " + j + " : " + p);
+ region.put(j, p);
+ }
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- try {
- Index index = qs.createIndex("posIndex", "pos.secId",
- "/" + repRegionName + " p, p.positions.values pos");
- assertEquals(12, index.getStatistics().getNumberOfKeys());
- } catch (Exception e) {
- fail("Index creation failed");
- }
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ try {
+ Index index = qs.createIndex("posIndex", "pos.secId",
+ "/" + repRegionName + " p, p.positions.values pos");
+ assertEquals(12, index.getStatistics().getNumberOfKeys());
+ } catch (Exception e) {
+ fail("Index creation failed");
}
});
// Invoke update from client and stop in updateIndex
// first before updating the RegionEntry and second after updating
// the RegionEntry.
- AsyncInvocation putThread =
- server.invokeAsync(new CacheSerializableRunnable("update a Region Entry") {
-
- @Override
- public void run2() throws CacheException {
- Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
- IndexManager.testHook = new IndexManagerTestHook();
- Portfolio newPort = new Portfolio(cntDest + 1);
- CacheFactory.getAnyInstance().getLogger().fine("Shobhit: New Portfolio" + newPort);
- repRegion.put(new Integer("1"), newPort);
- // above call must be hooked in BEFORE_UPDATE_OP call.
- }
- });
-
- server.invoke(new CacheSerializableRunnable("query on server") {
+ AsyncInvocation putThread = server.invokeAsync("update a Region Entry", () -> {
+ Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
+ IndexManager.testHook = new IndexManagerTestHook();
+ Portfolio newPort = new Portfolio(cntDest + 1);
+ CacheFactory.getAnyInstance().getLogger().fine("Shobhit: New Portfolio" + newPort);
+ repRegion.put(new Integer("1"), newPort);
+ // above call must be hooked in BEFORE_UPDATE_OP call.
+ });
- @Override
- public void run2() throws CacheException {
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- Position pos1 = null;
- while (!hooked) {
- Wait.pause(100);
- }
- try {
- Object rs = qs.newQuery("<trace> select pos from /" + repRegionName
- + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
- CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
- assertTrue(rs instanceof SelectResults);
- pos1 = (Position) ((SelectResults) rs).iterator().next();
- if (!pos1.secId.equals("APPL")) {
- fail("Query thread did not verify index results even when RE is under update");
- IndexManager.testHook = null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail("Query execution failed on server.", e);
+ server.invoke("query on server", () -> {
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ Position pos1 = null;
+ Awaitility.await().until(() -> hooked);
+ try {
+ Object rs = qs.newQuery("<trace> select pos from /" + repRegionName
+ + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
+ CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
+ assertTrue(rs instanceof SelectResults);
+ pos1 = (Position) ((SelectResults) rs).iterator().next();
+ if (!pos1.secId.equals("APPL")) {
+ fail("Query thread did not verify index results even when RE is under update");
IndexManager.testHook = null;
- } finally {
- hooked = false;// Let client put go further.
- }
- while (!hooked) {
- Wait.pause(100);
}
- try {
- Object rs = qs.newQuery("<trace> select pos from /" + repRegionName
- + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
- CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
- assertTrue(rs instanceof SelectResults);
- if (((SelectResults) rs).size() > 0) {
- Position pos2 = (Position) ((SelectResults) rs).iterator().next();
- if (pos2.equals(pos1)) {
- fail("Query thread did not verify index results even when RE is under update and "
- + "RegionEntry value has been modified before releasing the lock");
- }
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail("Query execution failed on server.", e);
+ IndexManager.testHook = null;
+ } finally {
+ hooked = false;// Let client put go further.
+ }
+ Awaitility.await().until(() -> hooked);
+ try {
+ Object rs = qs.newQuery("<trace> select pos from /" + repRegionName
+ + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
+ CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
+ assertTrue(rs instanceof SelectResults);
+ if (((SelectResults) rs).size() > 0) {
+ Position pos2 = (Position) ((SelectResults) rs).iterator().next();
+ if (pos2.equals(pos1)) {
+ fail("Query thread did not verify index results even when RE is under update and "
+ + "RegionEntry value has been modified before releasing the lock");
}
- } catch (Exception e) {
- e.printStackTrace();
- fail("Query execution failed on server.");
- } finally {
- hooked = false;// Let client put go further.
- IndexManager.testHook = null;
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Query execution failed on server.");
+ } finally {
+ hooked = false;// Let client put go further.
+ IndexManager.testHook = null;
}
});
- ThreadUtils.join(putThread, 200);
+ Awaitility.await().until(joinThread(putThread));
+ // ThreadUtils.join(putThread, 200);
}
@Category(FlakyTest.class) // GEODE-925: time sensitive, async actions, short timeouts
@Test
- public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch() { // TODO: fix misspelling
+ public void testRangeIndexWithIndexAndQueryFromClauseMisMatch() { // TODO: fix misspelling
// Create caches
Properties props = new Properties();
server.invoke(() -> PRClientServerTestBase.createCacheInVm(props));
- server.invoke(new CacheSerializableRunnable("create indexes") {
-
- @Override
- public void run2() throws CacheException {
- cache = CacheFactory.getAnyInstance();
- Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
- IndexManager.testHook = null;
- // Create common Portfolios and NewPortfolios
- Position.cnt = 0;
- for (int j = cnt; j < cntDest; j++) {
- region.put(new Integer(j), new Portfolio(j));
- }
+ server.invoke("create indexes", () -> {
+ cache = CacheFactory.getAnyInstance();
+ Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
+ IndexManager.testHook = null;
+ // Create common Portfolios and NewPortfolios
+ Position.cnt = 0;
+ for (int j = cnt; j < cntDest; j++) {
+ region.put(j, new Portfolio(j));
+ }
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- try {
- Index index = qs.createIndex("posIndex", "pos.secId", "/" + repRegionName
- + " p, p.collectionHolderMap.values coll, p.positions.values pos");
- assertEquals(12, index.getStatistics().getNumberOfKeys());
- } catch (Exception e) {
- fail("Index creation failed");
- }
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ try {
+ Index index = qs.createIndex("posIndex", "pos.secId",
+ "/" + repRegionName + " p, p.collectionHolderMap.values coll, p.positions.values pos");
+ assertEquals(12, index.getStatistics().getNumberOfKeys());
+ } catch (Exception e) {
+ fail("Index creation failed");
}
});
// Invoke update from client and stop in updateIndex
// first before updating the RegionEntry and second after updating
// the RegionEntry.
- AsyncInvocation putThread =
- server.invokeAsync(new CacheSerializableRunnable("update a Region Entry") {
-
- @Override
- public void run2() throws CacheException {
- Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
- IndexManager.testHook = new IndexManagerTestHook();
- // This portfolio with same ID must have different positions.
- repRegion.put(new Integer("1"), new Portfolio(1));
- // above call must be hooked in BEFORE_UPDATE_OP call.
- }
- });
-
- server.invoke(new CacheSerializableRunnable("query on server") {
+ AsyncInvocation putThread = server.invokeAsync("update a Region Entry", () -> {
+ Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
+ IndexManager.testHook = new IndexManagerTestHook();
+ // This portfolio with same ID must have different positions.
+ repRegion.put(new Integer("1"), new Portfolio(1));
+ // above call must be hooked in BEFORE_UPDATE_OP call.
+ });
- @Override
- public void run2() throws CacheException {
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- Position pos1 = null;
- while (!hooked) {
- Wait.pause(100);
- }
- try {
- Object rs = qs.newQuery("<trace> select pos from /" + repRegionName
- + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
- CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
- assertTrue(rs instanceof SelectResults);
- pos1 = (Position) ((SelectResults) rs).iterator().next();
- if (!pos1.secId.equals("APPL")) {
- fail("Query thread did not verify index results even when RE is under update");
- IndexManager.testHook = null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail("Query execution failed on server.", e);
+ server.invoke("query on server", () -> {
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ Position pos1 = null;
+ Awaitility.await().until(() -> hooked);
+ try {
+ Object rs = qs.newQuery("<trace> select pos from /" + repRegionName
+ + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
+ CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
+ assertTrue(rs instanceof SelectResults);
+ pos1 = (Position) ((SelectResults) rs).iterator().next();
+ if (!pos1.secId.equals("APPL")) {
+ fail("Query thread did not verify index results even when RE is under update");
IndexManager.testHook = null;
- } finally {
- hooked = false;// Let client put go further.
}
- while (!hooked) {
- Wait.pause(100);
- }
- try {
- Object rs = qs.newQuery("select pos from /" + repRegionName
- + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
- assertTrue(rs instanceof SelectResults);
- if (((SelectResults) rs).size() > 0) {
- Position pos2 = (Position) ((SelectResults) rs).iterator().next();
- if (pos2.equals(pos1)) {
- fail("Query thread did not verify index results even when RE is under update and "
- + "RegionEntry value has been modified before releasing the lock");
- }
+ } catch (Exception e) {
+ logger.error(e);
+ fail("Query execution failed on server.");
+ IndexManager.testHook = null;
+ } finally {
+ hooked = false;// Let client put go further.
+ }
+ Awaitility.await().until(() -> hooked);
+ try {
+ Object rs = qs.newQuery("select pos from /" + repRegionName
+ + " p, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1").execute();
+ assertTrue(rs instanceof SelectResults);
+ if (((SelectResults) rs).size() > 0) {
+ Position pos2 = (Position) ((SelectResults) rs).iterator().next();
+ if (pos2.equals(pos1)) {
+ fail("Query thread did not verify index results even when RE is under update and "
+ + "RegionEntry value has been modified before releasing the lock");
}
- } catch (Exception e) {
- e.printStackTrace();
- fail("Query execution failed on server.");
- } finally {
- hooked = false;// Let client put go further.
- IndexManager.testHook = null;
}
+ } catch (Exception e) {
+ logger.error(e);
+ fail("Query execution failed on server.");
+ } finally {
+ hooked = false;// Let client put go further.
+ IndexManager.testHook = null;
}
});
- ThreadUtils.join(putThread, 200); // GEODE-925 occurs here and this is very short join 200
- // millis
+ Awaitility.await().until(joinThread(putThread));
+ // ThreadUtils.join(putThread, 200); // GEODE-925 occurs here and this is very short join 200
+ // millis
}
@Test
- public void testRangeIndexWithIndexAndQueryFromCluaseMisMatch2() {
+ public void testRangeIndexWithIndexAndQueryFromClauseMisMatch2() {
// Create caches
Properties props = new Properties();
server.invoke(() -> PRClientServerTestBase.createCacheInVm(props));
- server.invoke(new CacheSerializableRunnable("create indexes") {
-
- @Override
- public void run2() throws CacheException {
- cache = CacheFactory.getAnyInstance();
- Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
- IndexManager.testHook = null;
- // Create common Portfolios and NewPortfolios
- Position.cnt = 0;
- for (int j = cnt; j < cntDest; j++) {
- region.put(new Integer(j), new Portfolio(j));
- }
+ server.invoke("create indexes", () -> {
+ cache = CacheFactory.getAnyInstance();
+ Region region = cache.createRegionFactory(RegionShortcut.REPLICATE).create(repRegionName);
+ IndexManager.testHook = null;
+ // Create common Portfolios and NewPortfolios
+ Position.cnt = 0;
+ for (int j = cnt; j < cntDest; j++) {
+ region.put(new Integer(j), new Portfolio(j));
+ }
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- try {
- Index index = qs.createIndex("posIndex", "pos.secId",
- "/" + repRegionName + " p, p.positions.values pos");
- assertEquals(12, index.getStatistics().getNumberOfKeys());
- } catch (Exception e) {
- fail("Index creation failed");
- }
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ try {
+ Index index = qs.createIndex("posIndex", "pos.secId",
+ "/" + repRegionName + " p, p.positions.values pos");
+ assertEquals(12, index.getStatistics().getNumberOfKeys());
+ } catch (Exception e) {
+ fail("Index creation failed");
}
});
// Invoke update from client and stop in updateIndex
// first before updating the RegionEntry and second after updating
// the RegionEntry.
- AsyncInvocation putThread =
- server.invokeAsync(new CacheSerializableRunnable("update a Region Entry") {
-
- @Override
- public void run2() throws CacheException {
- Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
- IndexManager.testHook = new IndexManagerTestHook();
- // This portfolio with same ID must have different positions.
- repRegion.put(new Integer("1"), new Portfolio(1));
- // above call must be hooked in BEFORE_UPDATE_OP call.
- }
- });
-
- server.invoke(new CacheSerializableRunnable("query on server") {
+ AsyncInvocation putThread = server.invokeAsync("update a Region Entry", () -> {
+ Region repRegion = CacheFactory.getAnyInstance().getRegion(repRegionName);
+ IndexManager.testHook = new IndexManagerTestHook();
+ // This portfolio with same ID must have different positions.
+ repRegion.put(new Integer("1"), new Portfolio(1));
+ // above call must be hooked in BEFORE_UPDATE_OP call.
+ });
- @Override
- public void run2() throws CacheException {
- QueryService qs = CacheFactory.getAnyInstance().getQueryService();
- Position pos1 = null;
- while (!hooked) {
- Wait.pause(100);
- }
- try {
- Object rs = qs
- .newQuery("<trace> select pos from /" + repRegionName
- + " p, p.collectionHolderMap.values coll, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1")
- .execute();
- CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
- assertTrue(rs instanceof SelectResults);
- pos1 = (Position) ((SelectResults) rs).iterator().next();
- if (!pos1.secId.equals("APPL")) {
- fail("Query thread did not verify index results even when RE is under update");
- IndexManager.testHook = null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- Assert.fail("Query execution failed on server.", e);
+ server.invoke("query on server", () -> {
+ QueryService qs = CacheFactory.getAnyInstance().getQueryService();
+ Position pos1 = null;
+ Awaitility.await().until(() -> hooked);
+ try {
+ Object rs = qs
+ .newQuery("<trace> select pos from /" + repRegionName
+ + " p, p.collectionHolderMap.values coll, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1")
+ .execute();
+ CacheFactory.getAnyInstance().getLogger().fine("Shobhit: " + rs);
+ assertTrue(rs instanceof SelectResults);
+ pos1 = (Position) ((SelectResults) rs).iterator().next();
+ if (!pos1.secId.equals("APPL")) {
+ fail("Query thread did not verify index results even when RE is under update");
IndexManager.testHook = null;
- } finally {
- hooked = false;// Let client put go further.
}
- while (!hooked) {
- Wait.pause(100);
- }
- try {
- Object rs = qs
- .newQuery("select pos from /" + repRegionName
- + " p, p.collectionHolderMap.values coll, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1")
- .execute();
- assertTrue(rs instanceof SelectResults);
- if (((SelectResults) rs).size() > 0) {
- Position pos2 = (Position) ((SelectResults) rs).iterator().next();
- if (pos2.equals(pos1)) {
- fail("Query thread did not verify index results even when RE is under update and "
- + "RegionEntry value has been modified before releasing the lock");
- }
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail("Query execution failed on server.", e);
+ IndexManager.testHook = null;
+ } finally {
+ hooked = false;// Let client put go further.
+ }
+ Awaitility.await().until(() -> hooked);
+
+ try {
+ Object rs = qs
+ .newQuery("select pos from /" + repRegionName
+ + " p, p.collectionHolderMap.values coll, p.positions.values pos where pos.secId = 'APPL' AND p.ID = 1")
+ .execute();
+ assertTrue(rs instanceof SelectResults);
+ if (((SelectResults) rs).size() > 0) {
+ Position pos2 = (Position) ((SelectResults) rs).iterator().next();
+ if (pos2.equals(pos1)) {
+ fail("Query thread did not verify index results even when RE is under update and "
+ + "RegionEntry value has been modified before releasing the lock");
}
- } catch (Exception e) {
- e.printStackTrace();
- fail("Query execution failed on server.");
- } finally {
- IndexManager.testHook = null;
- hooked = false;// Let client put go further.
}
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Query execution failed on server.");
+ } finally {
+ IndexManager.testHook = null;
+ hooked = false;// Let client put go further.
}
});
- ThreadUtils.join(putThread, 200);
+ Awaitility.await().until(joinThread(putThread));
+ // ThreadUtils.join(putThread, 200);
}
- public static void createProxyRegions() {
- new QueryDataInconsistencyDUnitTest().createProxyRegs();
+ private Callable<Boolean> joinThread(AsyncInvocation thread) {
+ return () -> {
+ try {
+ thread.join(100L);
+ } catch (InterruptedException e) {
+ return false;
+ }
+ if (thread.isAlive()) {
+ return false;
+ }
+ return true;
+ };
}
private void createProxyRegs() {
ClientCache cache = (ClientCache) CacheFactory.getAnyInstance();
cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create(repRegionName);
-
- /*
- * cache.createClientRegionFactory(ClientRegionShortcut.PROXY).create( PartitionedRegionName1);
- */
- }
-
- public static void createNewPR() {
- new QueryDataInconsistencyDUnitTest().createPR();
}
public void createPR() {
PartitionResolver testKeyBasedResolver = new QueryAPITestPartitionResolver();
cache = CacheFactory.getAnyInstance();
+ int numOfBuckets = 20;
cache.createRegionFactory(RegionShortcut.PARTITION_REDUNDANT)
.setPartitionAttributes(new PartitionAttributesFactory().setTotalNumBuckets(numOfBuckets)
.setPartitionResolver(testKeyBasedResolver).create())
@@ -552,9 +481,10 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
public void run2() throws CacheException {
Cache cache = CacheFactory.getAnyInstance();
Region region = cache.getRegion(repRegionName);
- for (int j = from; j < to; j++)
+ for (int j = from; j < to; j++) {
region.put(new Integer(j), portfolio[j]);
- LogWriterUtils.getLogWriter().info(
+ }
+ logger.info(
"PRQueryDUnitHelper#getCacheSerializableRunnableForPRPuts: Inserted Portfolio data on Region "
+ regionName);
}
@@ -568,21 +498,15 @@ public class QueryDataInconsistencyDUnitTest extends JUnit4CacheTestCase {
switch (spot) {
case 9: // Before Index update and after region entry lock.
hooked = true;
- LogWriterUtils.getLogWriter()
+ logger
.info("QueryDataInconsistency.IndexManagerTestHook is hooked in Update Index Entry.");
- while (hooked) {
- Wait.pause(100);
- }
- assertEquals(hooked, false);
+ Awaitility.await().until(() -> !hooked);
break;
case 10: // Before Region update and after Index Remove call.
hooked = true;
- LogWriterUtils.getLogWriter()
+ logger
.info("QueryDataInconsistency.IndexManagerTestHook is hooked in Remove Index Entry.");
- while (hooked) {
- Wait.pause(100);
- }
- assertEquals(hooked, false);
+ Awaitility.await().until(() -> !hooked);
break;
default:
break;
--
To stop receiving notification emails like this one, please contact
udo@apache.org.