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/30 22:11:27 UTC
[geode] branch feature/GEODE-4909 updated (8f19c8a -> 647a004)
This is an automated email from the ASF dual-hosted git repository.
ladyvader pushed a change to branch feature/GEODE-4909
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit 8f19c8a GEODE-4909: Additional lucene reindex tests with security
add 7468915 docs: Explicitly state that regions must be co-located if using same parallel gateway-sender-id
add d044ce0 GEODE-4822 The second server instance startup error: Could not create an instance of PartitionRegionConfig
add f9b16e9 GEODE-4819: Separating authorization out from protobuf handlers (#1674)
add 8c06afb GEODE-4963: Ignore test for now
add 3baccb4 GEODE-4969 PDX Type registry throws CacheClosedException causing random test failures
add b2f7743 GEODE-4928 DistributedLockService doesn't work as expected while the dlock grantor is initialized
add a966ad0 GEODE-4876: Move VM APIs from Host to VM
add 034a279 GEODE-4876: Remove use of Host from GetPidAndIdDistributedTest
add ae4b068 GEODE-4876: Add version of getServerHostName without Host
add e55082a GEODE-4876: Update RegionClearStatsDistributedTest use of VM and NetworkUtils
add 841dde9 GEODE-4876: Update RegionExpirationDistributedTest use of VM and NetworkUtil
add cb6cd2d GEODE-4876: Update PRCustomPartitioningDistributedTest use of VM and NetworkUtil
add b069c1f GEODE-4876: Update RegionListenerDistributedTest use of VM and NetworkUtil
add 46e98fb GEODE-4876: Update FunctionExecutionWithExceptionDistributedTest use of VM and NetworkUtil
add 99bb4f0 GEODE-4876: Update AcceptorImplClientQueueDistributedTest use of VM and NetworkUtil
add 4296f21 GEODE-4876: Update SharedErrorCollectorDistributedTest use of VM and NetworkUtil
add 40795fe GEODE-4876: Update SharedCountersRuleDistributedTest use of VM and NetworkUtil
add b6b4ac2 GEODE-4876: Update DistributedTestRuleDistributedTest use of VM and NetworkUtil
add 5271b6b GEODE-4876: Update DistributedDisconnectRuleDistributedTest use of VM and NetworkUtil
add da4044e GEODE-4876: Update DistributedDisconnectRuleAsClassRuleDistributedTest use of VM
add 7be2a7e GEODE-4876: Cleanup CacheRule tests use of VM and javadocs
add a2cc503 GEODE-4970: Disable PartitionedRegionQueryDUnitTest
add 38bfac0 docs: typo repair
add 2a6db7c GEODE-4913: gfsh start server cmd is not recognizing local properties… (#1687)
add 1fc7cf6 GEODE-4973: Add docker-compose to pipeline docker image
add 6d8d212 Merge pull request #1702 from nreich/feature/GEODE-4973
add 03f6d27 GEODE-2321: Pulse application works incorrectly in some locales (#1661)
add 7b347af GEODE-3720: Add additional output pattern to failure assertion for ConnectCommandWithSSLTest (#1704)
add 020e5b5 GEODE-4928 DistributedLockService doesn't work as expected while the dlock grantor is initialized
add 755eaaa GEODE-4929: Add ability for tests to overide the default DiskDirs (#1701)
add a4bae5c GEODE-4934: Throw exception if shutdown fails in GfshRule (#1699)
add c42905c GEODE-4811: Add @Disabled "feature flag" annotation for gfsh commands.
add 4bdd31c GEODE-4928 DistributedLockService doesn't work as expected while the dlock grantor is initialized
add b55215d GEODE-3563: use a timeout for newly created sockets in TcpConduit.run() (#1671)
new 647a004 GEODE-4909: Additional lucene reindex tests with security
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 (8f19c8a)
\
N -- N -- N refs/heads/feature/GEODE-4909 (647a004)
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 | 2 +-
.../cli/CreateConnectionCommandDUnitTest.java | 2 +-
.../cli/JdbcClusterConfigDistributedTest.java | 8 +-
.../main/java/org/apache/geode/DataSerializer.java | 12 +-
.../org/apache/geode/cache/AttributesFactory.java | 12 +-
.../apache/geode/cache/query/internal/CqEntry.java | 3 +-
.../internal/CumulativeNonDistinctResults.java | 3 +-
.../cache/query/internal/LinkedResultSet.java | 10 +-
.../cache/query/internal/LinkedStructSet.java | 12 +-
.../cache/query/internal/NWayMergeResults.java | 3 +-
.../geode/cache/query/internal/ResultsBag.java | 3 +-
.../query/internal/ResultsCollectionWrapper.java | 12 +-
.../geode/cache/query/internal/ResultsSet.java | 8 +-
.../cache/query/internal/SortedResultSet.java | 10 +-
.../cache/query/internal/SortedStructSet.java | 36 ++-
.../geode/cache/query/internal/StructImpl.java | 5 +-
.../geode/cache/query/internal/StructSet.java | 26 +-
.../InternalClusterConfigurationService.java | 18 +-
.../distributed/internal/locks/DLockGrantor.java | 13 +
.../locks/DLockLessorDepartureHandler.java | 2 +
.../distributed/internal/locks/DLockService.java | 6 +-
.../internal/streaming/StreamingOperation.java | 2 +-
.../distributed/internal/tcpserver/TcpServer.java | 5 +-
.../org/apache/geode/internal/DSFIDFactory.java | 126 +++++----
.../geode/internal/InternalDataSerializer.java | 117 ++++++--
.../internal/admin/remote/DestroyEntryMessage.java | 3 +-
.../internal/admin/remote/RemoteEntrySnapshot.java | 5 +-
.../admin/remote/RemoteRegionSnapshot.java | 3 +-
.../geode/internal/cache/AbstractRegionMap.java | 2 +-
.../geode/internal/cache/DestroyOperation.java | 3 +-
.../cache/DestroyPartitionedRegionMessage.java | 3 +-
.../geode/internal/cache/DiskStoreAttributes.java | 3 +-
.../internal/cache/DistributedCacheOperation.java | 2 +-
.../internal/cache/DistributedPutAllOperation.java | 4 +-
.../DistributedRegionFunctionStreamingMessage.java | 3 +-
.../cache/DistributedRemoveAllOperation.java | 2 +-
.../geode/internal/cache/EntryEventImpl.java | 10 +-
.../cache/FunctionStreamingReplyMessage.java | 3 +-
.../geode/internal/cache/GemFireCacheImpl.java | 5 +-
.../internal/cache/InitialImageOperation.java | 2 +-
.../geode/internal/cache/InvalidateOperation.java | 3 +-
.../cache/InvalidatePartitionedRegionMessage.java | 3 +-
.../cache/LatestLastAccessTimeMessage.java | 3 +-
.../apache/geode/internal/cache/LocalRegion.java | 8 +-
.../geode/internal/cache/NonLocalRegionEntry.java | 5 +-
.../geode/internal/cache/QueuedOperation.java | 5 +-
.../cache/SearchLoadAndWriteProcessor.java | 14 +-
.../geode/internal/cache/TXCommitMessage.java | 11 +-
.../geode/internal/cache/TXFarSideCMTracker.java | 11 +-
.../internal/cache/TXRegionLockRequestImpl.java | 2 +-
.../cache/UpdateEntryVersionOperation.java | 3 +-
.../geode/internal/cache/UpdateOperation.java | 2 +-
.../internal/cache/WrappedCallbackArgument.java | 3 +-
.../cache/execute/FunctionRemoteContext.java | 3 +-
.../cache/locks/TXLessorDepartureHandler.java | 59 +++-
.../internal/cache/locks/TXLockServiceImpl.java | 9 +-
.../cache/partitioned/ContainsKeyValueMessage.java | 3 +-
.../internal/cache/partitioned/DestroyMessage.java | 4 +-
.../DestroyRegionOnDataStoreMessage.java | 3 +-
.../cache/partitioned/FetchBulkEntriesMessage.java | 14 +-
.../cache/partitioned/FetchEntryMessage.java | 2 +-
.../cache/partitioned/FetchKeysMessage.java | 21 +-
.../internal/cache/partitioned/GetMessage.java | 7 +-
.../cache/partitioned/PRTombstoneMessage.java | 3 +-
.../partitioned/PRUpdateEntryVersionMessage.java | 3 +-
.../cache/partitioned/PutAllPRMessage.java | 2 +-
.../internal/cache/partitioned/PutMessage.java | 6 +-
.../internal/cache/partitioned/QueryMessage.java | 5 +-
.../cache/partitioned/RemoveAllPRMessage.java | 2 +-
.../cache/persistence/DefaultDiskDirs.java | 38 +++
.../internal/cache/tier/sockets/AcceptorImpl.java | 3 +-
.../tier/sockets/ClientInterestMessageImpl.java | 7 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 2 +-
.../cache/tier/sockets/ObjectPartList.java | 5 +-
.../cache/tier/sockets/ObjectPartList651.java | 5 +-
.../tier/sockets/ProtobufServerConnection.java | 8 +-
.../cache/tier/sockets/VersionedObjectList.java | 4 +-
.../geode/internal/cache/tx/DistTxEntryEvent.java | 4 +-
.../cache/tx/RemoteContainsKeyValueMessage.java | 3 +-
.../internal/cache/tx/RemoteDestroyMessage.java | 6 +-
.../internal/cache/tx/RemoteFetchEntryMessage.java | 2 +-
.../internal/cache/tx/RemoteFetchKeysMessage.java | 22 +-
.../cache/tx/RemoteFetchVersionMessage.java | 3 +-
.../geode/internal/cache/tx/RemoteGetMessage.java | 7 +-
.../geode/internal/cache/tx/RemotePutMessage.java | 8 +-
.../internal/cache/wan/GatewaySenderEventImpl.java | 5 +-
...aySenderQueueEntrySynchronizationOperation.java | 3 +-
.../cache/wan/serial/BatchDestroyOperation.java | 3 +-
.../internal/cache/xmlcache/CacheXmlGenerator.java | 3 +-
.../geode/internal/lang/SystemPropertyHelper.java | 21 ++
.../apache/geode/internal/net/SocketCreator.java | 7 +-
.../security/IntegratedSecurityService.java | 18 ++
.../internal/security/LegacySecurityService.java | 87 ++++++
.../geode/internal/security/SecurityService.java | 69 ++---
.../org/apache/geode/internal/tcp/TCPConduit.java | 37 ++-
.../org/apache/geode/internal/util/BlobHelper.java | 16 ++
.../org/apache/geode/management/cli/Disabled.java | 41 +++
.../management/internal/cli/CommandManager.java | 8 +
.../internal/cli/functions/CliFunctionResult.java | 10 +-
.../configuration/domain/Configuration.java | 8 -
.../apache/geode/pdx/internal/PdxInstanceImpl.java | 21 +-
.../apache/geode/pdx/internal/TypeRegistry.java | 42 ++-
.../cache/CacheRegionClearStatsDUnitTest.java | 241 ----------------
.../CreateAndLocalDestroyInTXRegressionTest.java | 8 +-
.../PRCreationTotalNumBucketsDistributedTest.java | 6 +-
.../cache/RegionClearStatsDistributedTest.java | 179 ++++++++++++
...t.java => RegionExpirationDistributedTest.java} | 10 +-
.../cache/RegionExpirationIntegrationTest.java | 2 +-
.../ReplicateCacheListenerDistributedTest.java | 29 +-
.../geode/codeAnalysis/ClassAndMethodDetails.java | 6 +-
.../internal/DlockAndTxlockRegressionTest.java | 235 ++++++++++++++++
.../internal/HeapDataOutputStreamJUnitTest.java | 8 +
...alDataSerializerSerializationWhitelistTest.java | 2 +
...okenSerializationConsistencyRegressionTest.java | 5 +-
.../EntriesDoNotExpireDuringGiiRegressionTest.java | 4 +-
.../cache/EntryEventSerializationTest.java | 3 +
.../cache/MonthBasedPartitionResolver.java | 2 +-
...a => PRAccessorWithOverflowRegressionTest.java} | 29 +-
...va => PRCustomPartitioningDistributedTest.java} | 12 +-
.../internal/cache/PartitionRegionConfigTest.java | 2 +
.../PartitionedRegionCloseDistributedTest.java | 10 +-
.../cache/PartitionedRegionQueryDUnitTest.java | 17 +-
...est.java => RegionListenerDistributedTest.java} | 21 +-
...eplicateEntryIdleExpirationDistributedTest.java | 12 +-
.../geode/internal/cache/SerializableMonth.java | 2 +-
.../cache/StartServerWithXmlDUnitTest.java | 88 ++++++
.../ClientFunctionTimeoutRegressionTest.java | 6 +-
...tionExecutionWithExceptionDistributedTest.java} | 10 +-
.../BucketRebalanceStatRegressionTest.java | 6 +-
.../DefaultDiskDirsIntegrationTest.java | 47 ++++
.../cache/persistence/DefaultDiskDirsTest.java | 50 ++++
...=> AcceptorImplClientQueueDistributedTest.java} | 73 ++---
.../ClientProxyWithDeltaDistributedTest.java | 9 +-
.../ClientWithInterestFailoverDistributedTest.java | 12 +-
...isterInterestServerMetaDataDistributedTest.java | 8 +-
.../geode/internal/net/DummySocketCreator.java | 8 +-
.../internal/net/SSLSocketIntegrationTest.java | 5 +-
.../geode/internal/net/SocketCreatorJUnitTest.java | 17 ++
.../internal/cli/CommandManagerJUnitTest.java | 103 ++++---
.../cli/commands/ConnectCommandDUnitTest.java | 3 +-
.../CreateAsyncEventQueueCommandDUnitTest.java | 3 +-
.../CreateDefinedIndexesCommandDUnitTest.java | 5 +-
.../geode/pdx/AutoSerializableJUnitTest.java | 7 +-
.../apache/geode/pdx/PdxSerializerJUnitTest.java | 138 +++++++++
.../geode/pdx/PdxSerializerRegressionTest.java | 106 +++++++
.../SecurityManagerLifecycleDistributedTest.java | 60 ++--
.../apache/geode/test/dunit/DUnitBlackboard.java | 2 +-
.../java/org/apache/geode/test/dunit/Host.java | 74 ++---
.../org/apache/geode/test/dunit/NetworkUtils.java | 51 +++-
.../test/java/org/apache/geode/test/dunit/VM.java | 85 ++++--
.../examples/AsyncInvokeCallableExampleTest.java | 13 +-
.../examples/AsyncInvokeRunnableExampleTest.java | 7 +-
.../CatchingUnexpectedExceptionExampleTest.java | 8 +-
.../examples/DistributedTestRuleExampleTest.java | 4 +-
.../dunit/examples/InvokeRunnableExampleTest.java | 11 +-
.../examples/LocatorPortClusterExampleTest.java | 12 +-
.../test/dunit/internal/InternalBlackboard.java | 2 +-
.../apache/geode/test/dunit/rules/CacheRule.java | 6 +-
.../test/dunit/rules/DistributedDiskDirRule.java | 275 ++++++++++++++++++
.../test/dunit/rules/DistributedTestRule.java | 18 +-
.../geode/test/dunit/rules/SharedCountersRule.java | 4 +
...t.java => CacheRuleBuilderDistributedTest.java} | 53 ++--
...RuleTest.java => CacheRuleDistributedTest.java} | 171 ++++++-----
...dDisconnectRuleAsClassRuleDistributedTest.java} | 11 +-
... DistributedDisconnectRuleDistributedTest.java} | 16 +-
...ava => DistributedTestRuleDistributedTest.java} | 6 +-
...java => SharedCountersRuleDistributedTest.java} | 21 +-
...va => SharedErrorCollectorDistributedTest.java} | 31 +-
.../geode/test/dunit/standalone/DUnitLauncher.java | 2 +-
...st.java => GetCurrentVmNumDistributedTest.java} | 26 +-
.../GetPidAndIdAfterBounceDistributedTest.java | 23 +-
.../dunit/tests/GetPidAndIdDistributedTest.java | 11 +-
.../apache/geode/test/junit/rules/DiskDirRule.java | 188 +++++++++++++
.../apache/geode/test/junit/rules/VMProvider.java | 4 +
.../codeAnalysis/sanctionedDataSerializables.txt | 233 ++++++++-------
.../internal/cache/CacheServerWithZeroPort.xml | 24 ++
.../tier/sockets/DurableClientSimpleDUnitTest.java | 2 -
.../setting_up_a_multisite_system.html.md.erb | 5 +-
.../junit/rules/DescribedExternalResource.java | 23 +-
.../geode/test/junit/rules/gfsh/GfshRule.java | 31 +-
.../serializable/SerializableTemporaryFolder.java | 8 +-
.../rules/serializable/SerializableTestName.java | 2 +-
.../lucene/internal/LuceneResultStructImpl.java | 5 +-
.../lucene/internal/distributed/EntryScore.java | 3 +-
.../cache/lucene/internal/results/PageEntry.java | 5 +-
.../v1/LocatorMessageExecutionContext.java | 32 +--
.../protobuf/v1/MessageExecutionContext.java | 12 +-
.../protobuf/v1/ProtobufOperationContext.java | 34 +--
.../protocol/protobuf/v1/ProtobufOpsProcessor.java | 3 +
.../protobuf/v1/ProtobufProtocolService.java | 9 +-
.../protobuf/v1/ProtobufSerializationService.java | 7 +
.../protobuf/v1/ServerMessageExecutionContext.java | 32 +--
.../protobuf/v1/authentication/Authorizer.java | 21 +-
.../v1/authentication/AuthorizingCache.java | 60 ++++
.../v1/authentication/AuthorizingCacheImpl.java | 194 +++++++++++++
.../authentication/AuthorizingFunctionService.java | 21 +-
.../AuthorizingFunctionServiceImpl.java | 123 ++++++++
.../v1/authentication/AuthorizingLocator.java | 17 +-
.../v1/authentication/AuthorizingLocatorImpl.java | 59 ++++
.../v1/authentication/NoSecurityAuthorizer.java | 21 +-
.../v1/authentication/NotLoggedInAuthorizer.java | 18 +-
.../v1/authentication/ShiroAuthorizer.java | 26 +-
.../AbstractFunctionRequestOperationHandler.java | 146 ----------
.../operations/ClearRequestOperationHandler.java | 15 +-
...cuteFunctionOnGroupRequestOperationHandler.java | 82 ++----
...uteFunctionOnMemberRequestOperationHandler.java | 92 ++----
...uteFunctionOnRegionRequestOperationHandler.java | 86 +++---
.../operations/GetAllRequestOperationHandler.java | 114 ++------
.../GetRegionNamesRequestOperationHandler.java | 8 +-
.../v1/operations/GetRequestOperationHandler.java | 34 +--
.../v1/operations/GetServerOperationHandler.java | 15 +-
.../operations/GetSizeRequestOperationHandler.java | 9 +-
.../v1/operations/KeySetOperationHandler.java | 19 +-
.../OqlQueryRequestOperationHandler.java | 31 +-
.../operations/PutAllRequestOperationHandler.java | 104 ++-----
.../PutIfAbsentRequestOperationHandler.java | 25 +-
.../v1/operations/PutRequestOperationHandler.java | 22 +-
.../operations/RemoveRequestOperationHandler.java | 16 +-
.../AuthenticationRequestOperationHandler.java | 3 +-
.../registry/ProtobufOperationContextRegistry.java | 94 ++-----
...obufConnectionAuthenticatingStateProcessor.java | 7 +-
...rotobufConnectionAuthorizingStateProcessor.java | 31 +-
.../ProtobufConnectionHandshakeStateProcessor.java | 7 +-
.../OutputCapturingServerConnectionTest.java | 7 +-
.../tier/sockets/ProtobufServerConnectionTest.java | 7 +-
.../internal/protocol/TestExecutionContext.java | 5 +-
.../v1/acceptance/CacheOperationsJUnitTest.java | 2 +-
.../authentication/AuthorizingCacheImplTest.java | 312 +++++++++++++++++++++
.../AuthorizingFunctionServiceImplTest.java | 109 +++++++
.../ClearRequestOperationHandlerJUnitTest.java | 11 +-
...ionOnGroupRequestOperationHandlerJUnitTest.java | 59 ++--
...onOnMemberRequestOperationHandlerJUnitTest.java | 47 ++--
...onOnRegionRequestOperationHandlerJUnitTest.java | 43 ++-
.../GetAllRequestOperationHandlerJUnitTest.java | 23 +-
.../GetAndPutJsonDocumentsDUnitTest.java | 52 ++--
...egionNamesRequestOperationHandlerJUnitTest.java | 6 +-
.../GetRequestOperationHandlerJUnitTest.java | 11 +-
.../GetSizeRequestOperationHandlerJUnitTest.java | 12 +-
...ueryRequestOperationHandlerIntegrationTest.java | 5 +-
.../OqlQueryRequestOperationHandlerJUnitTest.java | 7 +-
.../PutAllRequestOperationHandlerJUnitTest.java | 17 +-
...utIfAbsentRequestOperationHandlerJUnitTest.java | 35 +--
.../PutRequestOperationHandlerJUnitTest.java | 14 +-
.../RemoveRequestOperationHandlerJUnitTest.java | 12 +-
.../tools/pulse/internal/data/PulseConstants.java | 16 +-
.../internal/service/ClusterDetailsService.java | 6 +-
.../service/ClusterMembersRGraphService.java | 13 +-
.../internal/service/ClusterRegionService.java | 7 +-
.../internal/service/ClusterRegionsService.java | 7 +-
.../service/ClusterSelectedRegionService.java | 15 +-
.../internal/service/MemberDetailsService.java | 9 +-
.../internal/service/MemberRegionsService.java | 7 +-
.../geode/tools/pulse/tests/ui/PulseBase.java | 7 +-
.../GatewayLegacyAuthenticationRegressionTest.java | 12 +-
.../cli/commands/ConnectCommandWithSSLTest.java | 4 +-
255 files changed, 4386 insertions(+), 2501 deletions(-)
create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirs.java
create mode 100644 geode-core/src/main/java/org/apache/geode/management/cli/Disabled.java
delete mode 100755 geode-core/src/test/java/org/apache/geode/cache/CacheRegionClearStatsDUnitTest.java
create mode 100755 geode-core/src/test/java/org/apache/geode/cache/RegionClearStatsDistributedTest.java
rename geode-core/src/test/java/org/apache/geode/cache/{RegionExpirationDUnitTest.java => RegionExpirationDistributedTest.java} (96%)
create mode 100644 geode-core/src/test/java/org/apache/geode/distributed/internal/DlockAndTxlockRegressionTest.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/{BucketRegionSizeWithOverflowRegressionTest.java => PRAccessorWithOverflowRegressionTest.java} (79%)
rename geode-core/src/test/java/org/apache/geode/internal/cache/{PRCustomPartitioningDUnitTest.java => PRCustomPartitioningDistributedTest.java} (96%)
rename geode-core/src/test/java/org/apache/geode/internal/cache/{RegionListenerDUnitTest.java => RegionListenerDistributedTest.java} (85%)
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/StartServerWithXmlDUnitTest.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/execute/{FunctionExecution_ExceptionDUnitTest.java => FunctionExecutionWithExceptionDistributedTest.java} (98%)
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsIntegrationTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DefaultDiskDirsTest.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/{AcceptorImplClientQueueDUnitTest.java => AcceptorImplClientQueueDistributedTest.java} (84%)
create mode 100644 geode-core/src/test/java/org/apache/geode/pdx/PdxSerializerJUnitTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/pdx/PdxSerializerRegressionTest.java
create mode 100644 geode-core/src/test/java/org/apache/geode/test/dunit/rules/DistributedDiskDirRule.java
copy geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/{CacheRuleTest.java => CacheRuleBuilderDistributedTest.java} (86%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/{CacheRuleTest.java => CacheRuleDistributedTest.java} (58%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/{DistributedDisconnectRuleAsClassRuleTest.java => DistributedDisconnectRuleAsClassRuleDistributedTest.java} (95%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/{DistributedDisconnectRuleTest.java => DistributedDisconnectRuleDistributedTest.java} (94%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/{DistributedTestRuleTest.java => DistributedTestRuleDistributedTest.java} (89%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/{SharedCountersRuleTest.java => SharedCountersRuleDistributedTest.java} (90%)
rename geode-core/src/test/java/org/apache/geode/test/dunit/rules/tests/{SharedErrorCollectorTest.java => SharedErrorCollectorDistributedTest.java} (92%)
copy geode-core/src/test/java/org/apache/geode/test/dunit/tests/{GetPidAndIdDistributedTest.java => GetCurrentVmNumDistributedTest.java} (64%)
create mode 100644 geode-core/src/test/java/org/apache/geode/test/junit/rules/DiskDirRule.java
create mode 100755 geode-core/src/test/resources/org/apache/geode/internal/cache/CacheServerWithZeroPort.xml
copy geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java => geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/Authorizer.java (58%)
mode change 100755 => 100644
create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingCache.java
create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingCacheImpl.java
copy geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java => geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionService.java (58%)
mode change 100755 => 100644
create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImpl.java
copy geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java => geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingLocator.java (63%)
mode change 100755 => 100644
create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingLocatorImpl.java
copy geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java => geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/NoSecurityAuthorizer.java (62%)
mode change 100755 => 100644
copy geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java => geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/NotLoggedInAuthorizer.java (63%)
mode change 100755 => 100644
copy geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockLessorDepartureHandler.java => geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/ShiroAuthorizer.java (55%)
mode change 100755 => 100644
delete mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/AbstractFunctionRequestOperationHandler.java
create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingCacheImplTest.java
create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/authentication/AuthorizingFunctionServiceImplTest.java
--
To stop receiving notification emails like this one, please contact
ladyvader@apache.org.
[geode] 01/01: GEODE-4909: Additional lucene reindex tests with
security
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-4909
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 647a004e6093c9ae064d773be2a5c0209608f69e
Author: Lynn Hughes-Godfrey <lh...@pivotal.io>
AuthorDate: Tue Mar 27 15:23:07 2018 -0700
GEODE-4909: Additional lucene reindex tests with security
* Extended existing tests with and without gfsh to create region prior to creating lucene index.
---
.../lucene/LuceneClientSecurityDUnitTest.java | 19 +++--
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 64 +++++++++++++++++
.../lucene/LuceneCommandsSecurityDUnitTest.java | 8 +--
...urityWithRegionCreatedBeforeIndexDUnitTest.java | 84 ++++++++++++++++++++++
4 files changed, 161 insertions(+), 14 deletions(-)
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
index 0ae60a9..06cf7c1 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityDUnitTest.java
@@ -21,8 +21,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANA
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.List;
@@ -31,7 +29,6 @@ import java.util.concurrent.TimeUnit;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
-import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -43,7 +40,6 @@ import org.apache.geode.cache.client.ClientCache;
import org.apache.geode.cache.client.ClientCacheFactory;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.cache.client.ServerOperationException;
-import org.apache.geode.cache.lucene.test.TestObject;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.security.NotAuthorizedException;
@@ -63,6 +59,7 @@ public class LuceneClientSecurityDUnitTest extends LuceneQueriesAccessorBase {
LuceneCommandsSecurityDUnitTest.UserNameAndExpectedResponse user) {
// Start server
int serverPort = dataStore1.invoke(() -> startCacheServer());
+ dataStore1.invoke(() -> createRegionIndexAndData());
// Start client
accessor.invoke(() -> startClient(user.getUserName(), serverPort));
@@ -72,6 +69,14 @@ public class LuceneClientSecurityDUnitTest extends LuceneQueriesAccessorBase {
() -> executeTextSearch(user.getExpectAuthorizationError(), user.getExpectedResponse()));
}
+ protected void createRegionIndexAndData() {
+ Cache cache = getCache();
+ LuceneService luceneService = LuceneServiceProvider.get(cache);
+ luceneService.createIndexFactory().addField("field1").create(INDEX_NAME, REGION_NAME);
+ Region region = cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
+ region.put("key", new org.apache.geode.cache.lucene.test.TestObject("hello", "world"));
+ }
+
private int startCacheServer() throws IOException {
Properties props = new Properties();
props.put(ConfigurationProperties.SERIALIZABLE_OBJECT_FILTER,
@@ -81,12 +86,6 @@ public class LuceneClientSecurityDUnitTest extends LuceneQueriesAccessorBase {
final CacheServer server = cache.addCacheServer();
server.setPort(0);
server.start();
- LuceneService luceneService = LuceneServiceProvider.get(cache);
- luceneService.createIndexFactory().addField("field1").create(INDEX_NAME, REGION_NAME);
- Region region = cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
-
- region.put("key", new org.apache.geode.cache.lucene.test.TestObject("hello", "world"));
-
return server.getPort();
}
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java
new file mode 100644
index 0000000..7afcb36
--- /dev/null
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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 junitparams.JUnitParamsRunner;
+import org.junit.After;
+import org.junit.Before;
+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.RegionShortcut;
+import org.apache.geode.cache.lucene.internal.LuceneIndexFactoryImpl;
+import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+
+@Category({DistributedTest.class, SecurityTest.class})
+@RunWith(JUnitParamsRunner.class)
+public class LuceneClientSecurityWithRegionCreatedBeforeIndexDUnitTest
+ extends LuceneClientSecurityDUnitTest {
+
+ @Before
+ public void setLuceneReindexFlag() {
+ dataStore1.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ dataStore2.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ accessor.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ }
+
+ @After
+ public void clearLuceneReindexFlag() {
+ dataStore1.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ dataStore2.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ accessor.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ }
+
+ @Override
+ protected void createRegionIndexAndData() {
+ Cache cache = getCache();
+ Region region = cache.createRegionFactory(RegionShortcut.PARTITION).create(REGION_NAME);
+
+ region.put("key", new org.apache.geode.cache.lucene.test.TestObject("hello", "world"));
+
+ LuceneService luceneService = LuceneServiceProvider.get(cache);
+ ((LuceneIndexFactoryImpl) luceneService.createIndexFactory()).addField("field1")
+ .create(INDEX_NAME, REGION_NAME, LuceneServiceImpl.LUCENE_REINDEX);
+ }
+}
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
index be99c15..01258bc 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityDUnitTest.java
@@ -57,7 +57,7 @@ public class LuceneCommandsSecurityDUnitTest {
@Rule
public GfshCommandRule gfshShell = new GfshCommandRule();
- private MemberVM locator;
+ protected MemberVM locator;
@Before
public void before() throws Exception {
@@ -192,7 +192,7 @@ public class LuceneCommandsSecurityDUnitTest {
verifyResult(user, result);
}
- private void createIndexAndRegion() throws Exception {
+ protected void createIndexAndRegion() throws Exception {
// Connect gfsh to locator with permissions necessary to create an index and region
this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
"cluster,data", "cluster,data");
@@ -218,7 +218,7 @@ public class LuceneCommandsSecurityDUnitTest {
assertTrue(this.gfshShell.getGfshOutput().contains(user.getExpectedResponse()));
}
- private String getCreateIndexCommand() {
+ protected String getCreateIndexCommand() {
CommandStringBuilder csb = new CommandStringBuilder(LuceneCliStrings.LUCENE_CREATE_INDEX);
csb.addOption(LuceneCliStrings.LUCENE__INDEX_NAME, INDEX_NAME);
csb.addOption(LuceneCliStrings.LUCENE__REGION_PATH, REGION_NAME);
@@ -226,7 +226,7 @@ public class LuceneCommandsSecurityDUnitTest {
return csb.toString();
}
- private String getCreateRegionCommand() {
+ protected String getCreateRegionCommand() {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_REGION);
csb.addOption(CliStrings.CREATE_REGION__REGION, REGION_NAME);
csb.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT,
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java
new file mode 100644
index 0000000..cf285a8
--- /dev/null
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest.java
@@ -0,0 +1,84 @@
+/*
+ * 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 static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.lucene.internal.LuceneServiceImpl;
+import org.apache.geode.cache.lucene.internal.cli.LuceneCliStrings;
+import org.apache.geode.management.cli.Result;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.result.CommandResult;
+import org.apache.geode.management.internal.cli.result.ErrorResultData;
+import org.apache.geode.management.internal.cli.result.ResultBuilder;
+import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.LuceneTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+
+@Category({DistributedTest.class, SecurityTest.class, LuceneTest.class})
+@RunWith(JUnitParamsRunner.class)
+public class LuceneCommandsSecurityWithRegionCreatedBeforeIndexDUnitTest
+ extends LuceneCommandsSecurityDUnitTest {
+
+ @Before
+ public void setLuceneReindexFlag() {
+ MemberVM server = this.locatorServer.getMember(1);
+ server.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = true);
+ }
+
+ @After
+ public void clearLuceneReindexFlag() {
+ MemberVM server = this.locatorServer.getMember(1);
+ server.invoke(() -> LuceneServiceImpl.LUCENE_REINDEX = false);
+ }
+
+ @Override
+ protected void createIndexAndRegion() throws Exception {
+ // Connect gfsh to locator with permissions necessary to create an index and region
+ this.gfshShell.secureConnectAndVerify(this.locator.getPort(), GfshCommandRule.PortType.locator,
+ "cluster,data", "cluster,data");
+
+ // Create region
+ this.gfshShell.executeAndAssertThat(getCreateRegionCommand()).statusIsSuccess();
+
+ // Create lucene index
+ this.gfshShell.executeAndAssertThat(getCreateIndexCommand()).statusIsSuccess();
+
+ // Disconnect gfsh
+ this.gfshShell.disconnect();
+ }
+}
--
To stop receiving notification emails like this one, please contact
ladyvader@apache.org.