Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 53AEA200CC6 for ; Tue, 18 Jul 2017 20:26:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 523EA16759B; Tue, 18 Jul 2017 18:26:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 20FB2167596 for ; Tue, 18 Jul 2017 20:26:53 +0200 (CEST) Received: (qmail 56191 invoked by uid 500); 18 Jul 2017 18:26:52 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 55869 invoked by uid 99); 18 Jul 2017 18:26:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2017 18:26:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 714FDF4A48; Tue, 18 Jul 2017 18:26:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dschneider@apache.org To: commits@geode.apache.org Date: Tue, 18 Jul 2017 18:26:58 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [9/9] geode git commit: Merge branch 'develop' into feature/GEODE-3049 archived-at: Tue, 18 Jul 2017 18:26:55 -0000 Merge branch 'develop' into feature/GEODE-3049 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b788c0a2 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b788c0a2 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b788c0a2 Branch: refs/heads/feature/GEODE-3049 Commit: b788c0a29fda47bd4ce330c28a6e9f20b37bdff9 Parents: 38f2096 78900eb Author: Darrel Schneider Authored: Tue Jul 18 11:18:34 2017 -0700 Committer: Darrel Schneider Committed: Tue Jul 18 11:18:34 2017 -0700 ---------------------------------------------------------------------- .gitignore | 2 +- docker/Dockerfile | 4 +- docker/README.md | 2 +- extensions/geode-modules-assembly/build.gradle | 31 +- .../release/session/bin/modify_war | 5 +- .../geode-modules-session-internal/build.gradle | 4 +- .../session/internal/common/CacheProperty.java | 3 +- .../internal/filter/GemfireHttpSession.java | 4 + .../internal/filter/GemfireSessionManager.java | 8 +- .../DeltaQueuedSessionAttributes.java | 4 + .../attributes/DeltaSessionAttributes.java | 4 + .../attributes/ImmediateSessionAttributes.java | 64 -- .../attributes/QueuedSessionAttributes.java | 61 -- extensions/geode-modules-session/build.gradle | 2 + .../session/filter/SessionCachingFilter.java | 42 +- extensions/geode-modules-tomcat7/build.gradle | 2 + extensions/geode-modules-tomcat8/build.gradle | 2 + .../catalina/Tomcat8DeltaSessionManager.java | 4 +- extensions/geode-modules/build.gradle | 2 + .../gatewaydelta/GatewayDeltaCreateEvent.java | 8 - .../gatewaydelta/GatewayDeltaDestroyEvent.java | 8 - .../DeltaSessionDestroyAttributeEvent.java | 8 - .../geode/modules/session/CommandServlet.java | 1 + extensions/session-testing-war/build.gradle | 27 + .../geode/modules/session/CommandServlet.java | 94 +++ .../geode/modules/session/QueryCommand.java | 34 + .../src/main/webapp/WEB-INF/web.xml | 43 + geode-assembly/build.gradle | 26 +- .../cli/commands/GfshStartLocatorLogTest.java | 61 ++ .../cli/commands/StatusLocatorRealGfshTest.java | 22 +- .../geode/session/tests/CargoTestBase.java | 319 ++++++++ .../org/apache/geode/session/tests/Client.java | 286 +++++++ .../geode/session/tests/ContainerInstall.java | 539 +++++++++++++ .../geode/session/tests/ContainerManager.java | 232 ++++++ .../tests/GenericAppServerClientServerTest.java | 44 ++ .../tests/GenericAppServerContainer.java | 150 ++++ .../session/tests/GenericAppServerInstall.java | 141 ++++ .../session/tests/Jetty9ClientServerTest.java | 42 + .../apache/geode/session/tests/Jetty9Test.java | 42 + .../geode/session/tests/ServerContainer.java | 380 +++++++++ .../session/tests/Tomcat6ClientServerTest.java | 42 + .../apache/geode/session/tests/Tomcat6Test.java | 41 + .../session/tests/Tomcat7ClientServerTest.java | 44 ++ .../apache/geode/session/tests/Tomcat7Test.java | 41 + .../session/tests/Tomcat8ClientServerTest.java | 42 + .../apache/geode/session/tests/Tomcat8Test.java | 41 + .../session/tests/TomcatClientServerTest.java | 84 ++ .../geode/session/tests/TomcatContainer.java | 154 ++++ .../geode/session/tests/TomcatInstall.java | 311 ++++++++ .../test/dunit/rules/gfsh/GfshExecution.java | 50 ++ .../geode/test/dunit/rules/gfsh/GfshRule.java | 75 +- .../geode/test/dunit/rules/gfsh/GfshScript.java | 48 +- .../test/dunit/rules/gfsh/ProcessLogger.java | 90 +++ .../test/dunit/rules/gfsh/StreamGobbler.java | 38 + .../src/test/resources/expected_jars.txt | 4 +- geode-book/config.yml | 5 - .../source/subnavs/geode-subnav.erb | 3 + geode-book/redirects.rb | 2 - geode-core/build.gradle | 3 + .../admin/internal/DistributionLocatorImpl.java | 6 +- .../internal/AutoConnectionSourceImpl.java | 171 ++-- .../client/internal/ConnectionFactoryImpl.java | 2 +- .../geode/cache/client/internal/PoolImpl.java | 15 +- .../geode/cache/execute/FunctionContext.java | 4 + .../internal/AbstractDistributionConfig.java | 8 +- .../internal/InternalDistributedSystem.java | 6 +- .../distributed/internal/InternalLocator.java | 6 - .../membership/InternalDistributedMember.java | 160 ++-- .../internal/membership/gms/GMSUtil.java | 11 +- .../membership/gms/locator/GMSLocator.java | 14 +- .../membership/gms/membership/GMSJoinLeave.java | 25 +- .../membership/gms/membership/HostAddress.java | 118 +++ .../internal/tcpserver/TcpClient.java | 26 +- .../apache/geode/internal/AbstractConfig.java | 18 +- .../java/org/apache/geode/internal/Banner.java | 8 +- .../java/org/apache/geode/internal/Version.java | 2 +- .../admin/remote/DistributionLocatorId.java | 45 +- .../admin/remote/RemoteTransportConfig.java | 5 +- .../cache/AbstractOplogDiskRegionEntry.java | 8 +- .../internal/cache/AbstractRegionEntry.java | 9 +- .../geode/internal/cache/AbstractRegionMap.java | 30 +- .../geode/internal/cache/BucketRegion.java | 36 +- .../cache/ClusterConfigurationLoader.java | 2 +- .../internal/cache/CreateRegionProcessor.java | 22 +- .../apache/geode/internal/cache/DiskEntry.java | 8 +- .../internal/cache/DiskStoreFactoryImpl.java | 18 +- .../geode/internal/cache/DistributedRegion.java | 52 +- .../apache/geode/internal/cache/EventID.java | 91 ++- .../geode/internal/cache/EventStateHelper.java | 10 +- .../geode/internal/cache/EventTracker.java | 790 ------------------- .../internal/cache/FindVersionTagOperation.java | 2 +- .../geode/internal/cache/GemFireCacheImpl.java | 24 +- .../apache/geode/internal/cache/HARegion.java | 5 +- .../internal/cache/InitialImageOperation.java | 6 +- .../geode/internal/cache/InternalCache.java | 3 +- .../geode/internal/cache/LocalRegion.java | 169 +--- .../cache/MemberFunctionStreamingMessage.java | 7 +- .../internal/cache/NonLocalRegionEntry.java | 6 +- .../org/apache/geode/internal/cache/Oplog.java | 5 +- .../geode/internal/cache/PartitionedRegion.java | 26 +- .../cache/PartitionedRegionDataStore.java | 4 +- .../geode/internal/cache/PoolFactoryImpl.java | 28 +- .../geode/internal/cache/ProxyRegionMap.java | 6 +- .../geode/internal/cache/RegionEntry.java | 6 +- .../cache/TXSynchronizationRunnable.java | 15 +- .../internal/cache/ValidatingDiskRegion.java | 4 +- .../cache/event/BulkOperationHolder.java | 79 ++ .../cache/event/DistributedEventTracker.java | 523 ++++++++++++ .../cache/event/EventSequenceNumberHolder.java | 124 +++ .../internal/cache/event/EventTracker.java | 136 ++++ .../cache/event/EventTrackerExpiryTask.java | 97 +++ .../cache/event/NonDistributedEventTracker.java | 135 ++++ .../cache/execute/FunctionContextImpl.java | 20 +- .../cache/execute/MemberFunctionExecutor.java | 7 +- .../execute/MultiRegionFunctionContextImpl.java | 8 +- .../execute/MultiRegionFunctionExecutor.java | 5 +- .../execute/RegionFunctionContextImpl.java | 10 +- .../internal/cache/ha/ThreadIdentifier.java | 18 +- .../partitioned/EndBucketCreationMessage.java | 5 + .../cache/tier/sockets/AcceptorImpl.java | 99 ++- .../cache/tier/sockets/BaseCommand.java | 4 +- .../tier/sockets/ClientProxyMembershipID.java | 17 +- .../cache/tier/sockets/CommBufferPool.java | 36 + .../GenericProtocolServerConnection.java | 18 +- .../internal/cache/tier/sockets/HandShake.java | 8 +- .../cache/tier/sockets/ServerConnection.java | 6 +- .../tier/sockets/command/ExecuteFunction.java | 12 +- .../tier/sockets/command/ExecuteFunction65.java | 12 +- .../tier/sockets/command/ExecuteFunction66.java | 12 +- .../command/TXSynchronizationCommand.java | 3 +- .../wan/serial/SerialGatewaySenderQueue.java | 6 +- .../internal/cache/xmlcache/CacheCreation.java | 4 +- .../geode/internal/i18n/LocalizedStrings.java | 2 +- .../internal/logging/LogWriterFactory.java | 2 +- .../logging/log4j/LogWriterAppenders.java | 8 +- .../geode/internal/net/SocketCreator.java | 2 +- .../geode/internal/util/PasswordUtil.java | 49 +- .../internal/JmxManagerLocatorRequest.java | 5 +- .../cli/commands/LauncherLifecycleCommands.java | 1 + .../cli/functions/ExportLogsFunction.java | 2 +- .../ShowMissingDiskStoresFunction.java | 6 +- .../cli/functions/SizeExportLogsFunction.java | 2 +- .../internal/cli/util/CommandStringBuilder.java | 31 +- .../apache/geode/security/AuthInitialize.java | 14 +- .../internal/AutoConnectionSourceDUnitTest.java | 12 +- .../AutoConnectionSourceImplJUnitTest.java | 126 ++- .../internal/DistributionConfigJUnitTest.java | 4 +- .../internal/StartupMessageDataJUnitTest.java | 4 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 70 +- .../geode/internal/DeployedJarJUnitTest.java | 10 +- .../internal/cache/AbstractRegionMapTest.java | 48 ++ .../internal/cache/BucketRegionJUnitTest.java | 4 + .../cache/ClientServerTransactionDUnitTest.java | 13 +- .../cache/DiskStoreFactoryJUnitTest.java | 20 + .../cache/DistributedRegionJUnitTest.java | 11 +- .../internal/cache/EventTrackerDUnitTest.java | 486 ------------ .../geode/internal/cache/EventTrackerTest.java | 94 --- .../geode/internal/cache/IteratorDUnitTest.java | 2 +- .../cache/PartitionedRegionDUnitTestCase.java | 4 +- .../PartitionedRegionDataStoreJUnitTest.java | 26 + ...artitionedRegionLocalMaxMemoryDUnitTest.java | 229 ++---- ...onedRegionSingleNodeOperationsJUnitTest.java | 11 +- .../event/DistributedEventTrackerTest.java | 328 ++++++++ .../cache/event/EventTrackerDUnitTest.java | 489 ++++++++++++ .../cache/event/EventTrackerExpiryTaskTest.java | 94 +++ .../event/NonDistributedEventTrackerTest.java | 89 +++ .../cache/execute/FunctionServiceBase.java | 14 + ...unctionServiceMultipleOnMemberDUnitTest.java | 4 +- .../FunctionServiceSingleOnMemberDUnitTest.java | 12 +- .../cache/ha/EventIdOptimizationJUnitTest.java | 36 +- .../cache/ha/HARQueueNewImplDUnitTest.java | 20 +- .../cache/ha/ThreadIdentifierJUnitTest.java | 28 + .../PersistentPartitionedRegionDUnitTest.java | 5 +- .../PersistentPartitionedRegionTestBase.java | 10 +- .../RollingUpgrade2DUnitTest.java | 94 ++- .../rollingupgrade/RollingUpgradeDUnitTest.java | 6 +- .../tier/sockets/AcceptorImplJUnitTest.java | 16 +- .../sockets/ClientServerMiscBCDUnitTest.java | 135 ---- .../tier/sockets/ClientServerMiscDUnitTest.java | 112 ++- .../GenericProtocolServerConnectionTest.java | 62 ++ .../sockets/ServerConnectionFactoryTest.java | 1 + .../internal/jta/ClientServerJTADUnitTest.java | 68 +- .../internal/logging/TestLogWriterFactory.java | 4 +- .../OffHeapLRURecoveryRegressionTest.java | 10 +- .../ExportLogsFunctionIntegrationTest.java | 9 +- .../ShowMissingDiskStoresFunctionJUnitTest.java | 49 +- .../functions/SizeExportLogsFunctionTest.java | 12 +- .../cli/util/LogExporterIntegrationTest.java | 6 +- .../security/GfshCommandsSecurityTest.java | 93 ++- .../geode/test/dunit/SerializableCallable.java | 2 +- .../cache/internal/JUnit3CacheTestCase.java | 2 +- .../cache/internal/JUnit4CacheTestCase.java | 4 +- .../geode/test/dunit/standalone/ChildVM.java | 4 +- .../test/dunit/standalone/ProcessManager.java | 38 +- .../test/dunit/standalone/VersionManager.java | 2 + .../geode/codeAnalysis/excludedClasses.txt | 3 +- .../sanctionedDataSerializables.txt | 42 +- geode-cq/build.gradle | 1 + .../sockets/ClientServerMiscBCDUnitTest.java | 350 ++++++++ .../running/running_the_cacheserver.html.md.erb | 2 +- .../running/running_the_locator.html.md.erb | 4 +- .../set_join_redundancy_recovery.html.md.erb | 35 +- .../jmx_manager_operations.html.md.erb | 4 +- geode-docs/rest_apps/setup_config.html.md.erb | 9 +- geode-docs/rest_apps/using_swagger.html.md.erb | 7 +- .../gfsh/command-pages/destroy.html.md.erb | 48 ++ .../gfsh/command-pages/import.html.md.erb | 13 +- .../gfsh/command-pages/start.html.md.erb | 40 - .../gfsh/command-pages/status.html.md.erb | 44 +- .../gfsh/command-pages/stop.html.md.erb | 39 +- .../gfsh/configuring_gfsh.html.md.erb | 3 - .../gfsh/quick_ref_commands_by_area.html.md.erb | 1 + .../gfsh/starting_gfsh.html.md.erb | 2 - .../lucene_integration.html.md.erb | 17 +- .../geode/test/junit/rules/DiskDirRule.java | 60 -- .../geode/test/junit/rules/DiskDirRuleTest.java | 47 -- .../cache/lucene/internal/LuceneIndexImpl.java | 1 + .../lucene/internal/filesystem/FileSystem.java | 1 + .../lucene/LuceneCommandsSecurityDUnitTest.java | 2 + ...IndexCreationPersistenceIntegrationTest.java | 41 +- .../lucene/LuceneQueriesIntegrationTest.java | 17 +- ...LuceneQueriesPersistenceIntegrationTest.java | 29 +- .../cache/lucene/MixedObjectIndexDUnitTest.java | 20 +- .../RawLuceneRepositoryManagerJUnitTest.java | 28 +- .../DumpDirectoryFilesIntegrationTest.java | 27 +- .../filesystem/FileSystemJUnitTest.java | 23 +- .../IndexRepositoryImplPerformanceTest.java | 58 +- .../LuceneIndexMemoryOverheadTest.java | 129 +++ geode-old-versions/build.gradle | 1 + geode-protobuf/build.gradle | 2 +- .../InvalidProtocolMessageException.java | 2 +- .../protocol/operations/OperationHandler.java | 15 +- .../registry/OperationsHandlerRegistry.java | 8 - .../protobuf/EncodingTypeTranslator.java | 1 - .../protocol/protobuf/ProtobufOpsProcessor.java | 30 +- .../protobuf/ProtobufSerializationService.java | 3 + .../protobuf/ProtobufStreamProcessor.java | 63 +- .../protocol/protobuf/ProtobufUtilities.java | 34 - .../GetAllRequestOperationHandler.java | 75 ++ .../GetRegionNamesRequestOperationHandler.java | 34 + .../GetRegionRequestOperationHandler.java | 47 ++ .../operations/GetRequestOperationHandler.java | 65 +- .../PutAllRequestOperationHandler.java | 109 +++ .../operations/PutRequestOperationHandler.java | 71 ++ .../RemoveRequestOperationHandler.java | 64 ++ .../serializer/ProtobufProtocolSerializer.java | 2 +- .../utilities/ProtobufRequestUtilities.java | 110 +++ .../utilities/ProtobufResponseUtilities.java | 154 ++++ .../protobuf/utilities/ProtobufUtilities.java | 184 +++++ .../geode/serialization/codec/IntCodec.java | 1 - .../exception/TypeEncodingException.java | 21 - .../UnsupportedEncodingTypeException.java | 2 +- .../CodecNotRegisteredForTypeException.java | 4 +- geode-protobuf/src/main/proto/basicTypes.proto | 7 +- .../src/main/proto/clientProtocol.proto | 18 +- geode-protobuf/src/main/proto/region_API.proto | 21 +- .../geode/protocol/IntegrationJUnitTest.java | 16 +- .../org/apache/geode/protocol/MessageUtil.java | 44 +- .../RoundTripCacheConnectionJUnitTest.java | 385 ++++++++- .../OperationsHandlerRegistryJUnitTest.java | 8 +- ...eToSerializationTypeTranslatorJUnitTest.java | 6 +- .../protobuf/ProtobufOpsProcessorJUnitTest.java | 23 +- .../protobuf/ProtobufStreamProcessorTest.java | 41 + .../GetAllRequestOperationHandlerJUnitTest.java | 155 ++++ ...onNamesRequestOperationHandlerJUnitTest.java | 108 +++ ...tRegionRequestOperationHandlerJUnitTest.java | 108 +++ .../GetRequestOperationHandlerJUnitTest.java | 140 +++- .../operations/OperationHandlerJUnitTest.java | 37 + .../PutAllRequestOperationHandlerJUnitTest.java | 170 ++++ .../PutRequestOperationHandlerJUnitTest.java | 143 ++++ .../RemoveRequestOperationHandlerJUnitTest.java | 138 ++++ .../ProtobufProtocolSerializerJUnitTest.java | 2 +- .../codec/BinaryFormatJUnitTest.java | 6 +- .../org/apache/geode/protocol/default.keystore | Bin 0 -> 1115 bytes .../internal/locator/wan/LocatorDiscovery.java | 10 +- .../wan/LocatorMembershipListenerImpl.java | 8 +- .../cache/wan/AbstractRemoteGatewaySender.java | 4 +- .../cache/wan/WANRollingUpgradeDUnitTest.java | 596 +++++++++++++- .../geode/internal/cache/wan/WANTestBase.java | 2 +- ...oncurrentParallelGatewaySenderDUnitTest.java | 28 +- ...tewayLegacyAuthenticationRegressionTest.java | 423 ++++++++++ .../wan/misc/WanAutoDiscoveryDUnitTest.java | 7 +- .../wan/parallel/BatchRemovalThreadHelper.java | 22 + gradle/dependency-versions.properties | 1 + gradle/rat.gradle | 4 + gradle/test.gradle | 10 + settings.gradle | 1 + 287 files changed, 11945 insertions(+), 3473 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/b788c0a2/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java ----------------------------------------------------------------------