This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-3967 in repository https://gitbox.apache.org/repos/asf/geode.git.
omit fd25a67 GEODE-3967: when ConcurrentCacheModificationException happened. GatewaySenderEventImpl should save the status and notify gatewaysender anyway. SerialGatewaySender will handle it. In AbstractUpdateOperation's doPutOrCreate's 3 tries of basicUpdate, the 3rd one should allow both create and update. make event with CME to be ignored by dispatcher add 94049aa GEODE-4405: Move backup target and base line dirs to prepare backup message (#1377) add b22db64 Update NOTICE with 2018 copyright add 6011e09 GEODE-3127: add function execution to new client protocol. (#1357) add 80ad2d7 GEODE-4270: remove race condition where CacheClientProxy could be asked to (#1378) add c1b21c0 GEODE-4439 Refactor HandShake.java add 198b9e0 GEODE-4076: throw AuthenticationRequiredException when failed to find… (#1369) add 232d16c Update Dockerfile to: - use geode binary rather than building one on the fly - update to version 1.4.0 Updated Readme add 40a2ca0 GEODE-3966: Avoid singletons by passing distributed system and cache. (#1366) add 1c89fe1 GEODE-4397: refactor RegionMapDestroy destroy operation (#1370) add 158992b GEODE-4509: change uses of LocalRegion to InternalRegion (#1379) add c36a113 GEODE-4487: Remove singleton calls from offheap package (#1382) add e9b4bd5 GEODE-4442: Move abort of backups to separate message (#1381) new c67d100 GEODE-3967: when ConcurrentCacheModificationException happened. GatewaySenderEventImpl should save the status and notify gatewaysender anyway. SerialGatewaySender will handle it. In AbstractUpdateOperation's doPutOrCreate's 3 tries of basicUpdate, the 3rd one should allow both create and update. make event with CME to be ignored by dispatcher 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 (fd25a67) \ N -- N -- N refs/heads/feature/GEODE-3967 (c67d100) 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: NOTICE | 4 +- docker/Dockerfile | 18 +- docker/README.md | 4 +- geode-assembly/src/main/dist/NOTICE | 2 +- .../apache/geode/cache/DynamicRegionFactory.java | 7 +- .../java/org/apache/geode/cache/RegionFactory.java | 4 +- .../java/org/apache/geode/cache/RequiredRoles.java | 4 +- .../geode/cache/client/internal/AbstractOp.java | 5 +- .../cache/client/internal/AuthenticateUserOp.java | 15 +- .../client/internal/ClientMetadataService.java | 21 +- .../client/internal/ClientRegionFactoryImpl.java | 4 +- .../client/internal/ClientSideHandshakeImpl.java | 450 +++++ .../client/internal/ConnectionFactoryImpl.java | 53 +- .../cache/client/internal/ConnectionImpl.java | 24 +- .../geode/cache/client/internal/PoolImpl.java | 89 +- .../cache/client/internal/ProxyCacheCloseOp.java | 2 +- .../execute/internal/FunctionServiceManager.java | 5 +- .../org/apache/geode/cache/query/QueryService.java | 13 +- .../internal/InternalDistributedSystem.java | 9 +- .../membership/gms/auth/GMSAuthenticator.java | 4 +- .../distributed/internal/tcpserver/TcpServer.java | 5 +- .../org/apache/geode/internal/DSFIDFactory.java | 2 + .../geode/internal/DataSerializableFixedID.java | 1 + .../geode/internal/cache/AbstractRegion.java | 2 +- .../geode/internal/cache/AbstractRegionMap.java | 7 +- .../cache/AddCacheServerProfileMessage.java | 6 +- .../apache/geode/internal/cache/BucketRegion.java | 2 +- .../internal/cache/CacheDistributionAdvisor.java | 2 +- .../geode/internal/cache/CacheStatisticsImpl.java | 4 +- .../internal/cache/DistributedCacheOperation.java | 2 +- .../geode/internal/cache/DistributedRegion.java | 8 +- .../apache/geode/internal/cache/FilterProfile.java | 2 +- .../internal/cache/FindVersionTagOperation.java | 4 +- .../geode/internal/cache/GemFireCacheImpl.java | 124 +- .../org/apache/geode/internal/cache/HARegion.java | 4 +- .../internal/cache/InitialImageOperation.java | 6 +- .../apache/geode/internal/cache/InternalCache.java | 24 +- .../geode/internal/cache/InternalRegion.java | 43 + .../apache/geode/internal/cache/LocalRegion.java | 47 +- .../geode/internal/cache/PartitionedRegion.java | 4 +- .../geode/internal/cache/PoolFactoryImpl.java | 5 +- .../cache/RegionEntrySynchronizationListener.java | 2 +- .../internal/cache/RemoteOperationMessage.java | 2 +- .../geode/internal/cache/StateFlushOperation.java | 4 +- .../geode/internal/cache/TXCommitMessage.java | 2 +- .../AbortBackup.java} | 19 +- ...eBackupFactory.java => AbortBackupFactory.java} | 10 +- ...kupOperation.java => AbortBackupOperation.java} | 35 +- ...BackupResponse.java => AbortBackupRequest.java} | 51 +- .../cache/backup/BackupDataStoreHelper.java | 14 +- .../internal/cache/backup/BackupResponse.java | 3 +- .../geode/internal/cache/backup/BackupService.java | 22 +- .../geode/internal/cache/backup/BackupTask.java | 24 +- .../geode/internal/cache/backup/FinishBackup.java | 11 +- .../internal/cache/backup/FinishBackupFactory.java | 12 +- .../cache/backup/FinishBackupOperation.java | 17 +- .../internal/cache/backup/FinishBackupRequest.java | 34 +- .../geode/internal/cache/backup/PrepareBackup.java | 10 +- .../cache/backup/PrepareBackupFactory.java | 11 +- .../cache/backup/PrepareBackupOperation.java | 13 +- .../cache/backup/PrepareBackupRequest.java | 26 +- .../client/protocol/ClientProtocolService.java | 5 +- .../geode/internal/cache/ha/HARegionQueue.java | 24 +- .../geode/internal/cache/map/RegionMapDestroy.java | 1027 ++++++----- .../apache/geode/internal/cache/properties.html | 4 +- .../internal/cache/tier/ClientSideHandshake.java | 40 + .../Encryptor.java} | 17 +- ...ientHandShake.java => ServerSideHandshake.java} | 18 +- .../internal/cache/tier/sockets/AcceptorImpl.java | 14 +- .../cache/tier/sockets/CacheClientNotifier.java | 92 +- .../cache/tier/sockets/CacheClientProxy.java | 9 +- .../cache/tier/sockets/CacheClientUpdater.java | 11 +- .../tier/sockets/ClientUpdateMessageImpl.java | 4 +- .../internal/cache/tier/sockets/EncryptorImpl.java | 757 ++++++++ .../internal/cache/tier/sockets/HandShake.java | 1801 -------------------- .../internal/cache/tier/sockets/Handshake.java | 527 ++++++ .../cache/tier/sockets/MessageIdExtractor.java | 6 +- .../tier/sockets/OriginalServerConnection.java | 6 +- .../tier/sockets/ProtobufServerConnection.java | 2 +- .../cache/tier/sockets/ServerConnection.java | 74 +- ...rocessor.java => ServerHandshakeProcessor.java} | 85 +- .../cache/tier/sockets/ServerQueueStatus.java | 32 +- .../tier/sockets/ServerSideHandshakeImpl.java | 211 +++ .../tier/sockets/command/ExecuteFunction.java | 11 +- .../tier/sockets/command/ExecuteFunction65.java | 11 +- .../tier/sockets/command/ExecuteFunction66.java | 10 +- .../sockets/command/ExecuteRegionFunction.java | 11 +- .../sockets/command/ExecuteRegionFunction61.java | 11 +- .../sockets/command/ExecuteRegionFunction65.java | 11 +- .../sockets/command/ExecuteRegionFunction66.java | 11 +- .../command/ExecuteRegionFunctionSingleHop.java | 11 +- .../geode/internal/cache/tx/ClientTXStateStub.java | 3 +- .../internal/cache/wan/AbstractGatewaySender.java | 3 +- ...waySenderQueueEntrySynchronizationListener.java | 4 +- ...aySenderQueueEntrySynchronizationOperation.java | 7 +- ...currentParallelGatewaySenderEventProcessor.java | 5 +- .../ParallelGatewaySenderEventProcessor.java | 3 +- .../internal/cache/xmlcache/CacheCreation.java | 19 +- .../cache/xmlcache/ClientCacheCreation.java | 3 +- .../geode/internal/i18n/LocalizedStrings.java | 4 +- .../apache/geode/internal/offheap/DataType.java | 31 +- .../internal/offheap/MemoryAllocatorImpl.java | 10 +- .../security/IntegratedSecurityService.java | 2 +- .../org/apache/geode/internal/tcp/Connection.java | 12 +- .../internal/beans/MemberMBeanBridge.java | 16 +- .../functions/GetRegionNamesFunction.java | 4 +- .../client/internal/QueueManagerJUnitTest.java | 9 +- .../cache30/DistributedAckRegionCCEDUnitTest.java | 2 +- ...actoryTest.java => AbortBackupFactoryTest.java} | 23 +- .../cache/backup/AbortBackupOperationTest.java | 183 ++ ...actoryTest.java => AbortBackupRequestTest.java} | 61 +- .../cache/backup/BackupIntegrationTest.java | 25 +- .../backup/BackupPrepareAndFinishMsgDUnitTest.java | 14 +- .../internal/cache/backup/BackupServiceTest.java | 21 +- .../cache/backup/FinishBackupFactoryTest.java | 8 +- .../cache/backup/FinishBackupOperationTest.java | 14 +- .../cache/backup/FinishBackupRequestTest.java | 15 +- .../cache/backup/PrepareBackupFactoryTest.java | 7 +- .../cache/backup/PrepareBackupOperationTest.java | 15 +- .../cache/backup/PrepareBackupRequestTest.java | 15 +- .../ClientFunctionTimeoutRegressionTest.java | 4 +- .../internal/cache/map/RegionMapDestroyTest.java | 7 +- ...dCompatibilityHigherVersionClientDUnitTest.java | 5 +- .../{HandShakeTest.java => HandshakeTest.java} | 10 +- .../cache/tier/sockets/MessageIdExtractorTest.java | 9 +- .../cache/tier/sockets/ServerConnectionTest.java | 22 +- .../sockets/command/ExecuteFunction65Test.java | 5 +- .../sockets/command/ExecuteFunction66Test.java | 4 +- .../tier/sockets/command/ExecuteFunctionTest.java | 7 +- .../geode/internal/offheap/DataTypeJUnitTest.java | 106 +- .../offheap/OutOfOffHeapMemoryDUnitTest.java | 6 +- .../security/IntegratedSecurityServiceTest.java | 4 +- .../beans/DistributedSystemBridgeJUnitTest.java | 9 +- .../ClientRegisterInterestAuthDUnitTest.java | 39 +- .../apache/geode/security/SecurityTestUtil.java | 8 + .../generator/LdapUserCredentialGenerator.java | 20 +- .../codeAnalysis/sanctionedDataSerializables.txt | 6 +- .../src/main/proto/v1/clientProtocol.proto | 5 + .../src/main/proto/v1/function_API.proto | 20 +- .../v1/LocatorMessageExecutionContext.java | 4 +- .../protobuf/v1/MessageExecutionContext.java | 4 +- .../protobuf/v1/ProtobufProtocolService.java | 4 +- .../protobuf/v1/ProtobufSerializationService.java | 6 +- .../protobuf/v1/ServerMessageExecutionContext.java | 12 +- ...uteFunctionOnRegionRequestOperationHandler.java | 135 ++ .../registry/ProtobufOperationContextRegistry.java | 13 +- .../internal/protocol/TestExecutionContext.java | 4 +- .../v1/FunctionExecutionIntegrationTest.java | 360 ++++ ...onOnRegionRequestOperationHandlerJUnitTest.java | 161 ++ .../GetAllRequestOperationHandlerJUnitTest.java | 2 - ...egionNamesRequestOperationHandlerJUnitTest.java | 6 +- .../GetRegionRequestOperationHandlerJUnitTest.java | 6 +- .../GetRequestOperationHandlerJUnitTest.java | 2 - .../GetServerOperationHandlerJUnitTest.java | 2 - .../v1/operations/OperationHandlerJUnitTest.java | 5 +- .../PutAllRequestOperationHandlerJUnitTest.java | 1 - .../PutRequestOperationHandlerJUnitTest.java | 2 - .../RemoveRequestOperationHandlerJUnitTest.java | 2 - geode-pulse/src/main/webapp/META-INF/NOTICE | 2 +- .../geode/internal/cache/wan/WANTestBase.java | 5 +- .../cache/wan/wancommand/WANCommandUtils.java | 3 +- geode-web-api/src/main/webapp/META-INF/NOTICE | 2 +- geode-web/src/main/webapp/META-INF/NOTICE | 2 +- 163 files changed, 4441 insertions(+), 3354 deletions(-) create mode 100644 geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientSideHandshakeImpl.java copy geode-core/src/main/java/org/apache/geode/internal/cache/{RegionEntrySynchronizationListener.java => backup/AbortBackup.java} (69%) copy geode-core/src/main/java/org/apache/geode/internal/cache/backup/{PrepareBackupFactory.java => AbortBackupFactory.java} (83%) copy geode-core/src/main/java/org/apache/geode/internal/cache/backup/{PrepareBackupOperation.java => AbortBackupOperation.java} (65%) copy geode-core/src/main/java/org/apache/geode/internal/cache/backup/{BackupResponse.java => AbortBackupRequest.java} (50%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/tier/ClientSideHandshake.java copy geode-core/src/main/java/org/apache/geode/internal/cache/{RegionEntrySynchronizationListener.java => tier/Encryptor.java} (69%) rename geode-core/src/main/java/org/apache/geode/internal/cache/tier/{ClientHandShake.java => ServerSideHandshake.java} (73%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/EncryptorImpl.java delete mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/Handshake.java rename geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/{ServerHandShakeProcessor.java => ServerHandshakeProcessor.java} (89%) create mode 100644 geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerSideHandshakeImpl.java copy geode-core/src/test/java/org/apache/geode/internal/cache/backup/{PrepareBackupFactoryTest.java => AbortBackupFactoryTest.java} (77%) create mode 100644 geode-core/src/test/java/org/apache/geode/internal/cache/backup/AbortBackupOperationTest.java copy geode-core/src/test/java/org/apache/geode/internal/cache/backup/{PrepareBackupFactoryTest.java => AbortBackupRequestTest.java} (53%) rename geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/{HandShakeTest.java => HandshakeTest.java} (86%) copy geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntrySynchronizationListener.java => geode-protobuf-messages/src/main/proto/v1/function_API.proto (61%) create mode 100644 geode-protobuf/src/main/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnRegionRequestOperationHandler.java create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/FunctionExecutionIntegrationTest.java create mode 100644 geode-protobuf/src/test/java/org/apache/geode/internal/protocol/protobuf/v1/operations/ExecuteFunctionOnRegionRequestOperationHandlerJUnitTest.java -- To stop receiving notification emails like this one, please contact zho...@apache.org.