You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/29 01:10:29 UTC
[50/50] [abbrv] incubator-geode git commit: Merge remote-tracking
branch 'origin/develop' into feature/GEODE-1255
Merge remote-tracking branch 'origin/develop' into feature/GEODE-1255
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/68ddd58b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/68ddd58b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/68ddd58b
Branch: refs/heads/feature/GEODE-1255
Commit: 68ddd58be03f079b7cabb98876382aa80cb94913
Parents: 5044001 a254c42
Author: Kirk Lund <kl...@apache.org>
Authored: Thu Apr 28 16:09:16 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Apr 28 16:09:16 2016 -0700
----------------------------------------------------------------------
LICENSE | 60 +
extensions/geode-modules-assembly/build.gradle | 1 +
.../SessionReplicationIntegrationJUnitTest.java | 10 +-
geode-assembly/build.gradle | 4 +-
geode-assembly/src/main/dist/LICENSE | 8 +-
geode-assembly/src/main/dist/NOTICE | 36 +-
geode-core/build.gradle | 22 -
.../gemfire/cache/AttributesFactory.java | 58 -
.../gemfire/cache/AttributesMutator.java | 14 -
.../gemfire/cache/CustomEvictionAttributes.java | 78 -
.../com/gemstone/gemfire/cache/DataPolicy.java | 11 -
.../gemfire/cache/EvictionCriteria.java | 57 -
.../com/gemstone/gemfire/cache/Operation.java | 13 -
.../gemfire/cache/RegionAttributes.java | 23 -
.../gemstone/gemfire/cache/RegionFactory.java | 24 -
.../internal/AsyncEventQueueFactoryImpl.java | 5 -
.../client/internal/ServerRegionProxy.java | 3 +-
.../gemfire/cache/hdfs/HDFSIOException.java | 52 -
.../gemstone/gemfire/cache/hdfs/HDFSStore.java | 341 --
.../gemfire/cache/hdfs/HDFSStoreFactory.java | 203 -
.../gemfire/cache/hdfs/HDFSStoreMutator.java | 196 -
.../cache/hdfs/StoreExistsException.java | 32 -
.../cache/hdfs/internal/FailureTracker.java | 96 -
.../cache/hdfs/internal/FlushObserver.java | 53 -
.../hdfs/internal/HDFSBucketRegionQueue.java | 1232 ------
.../cache/hdfs/internal/HDFSEntriesSet.java | 329 --
.../cache/hdfs/internal/HDFSEventListener.java | 179 -
.../hdfs/internal/HDFSEventQueueFilter.java | 73 -
.../hdfs/internal/HDFSGatewayEventImpl.java | 180 -
.../hdfs/internal/HDFSIntegrationUtil.java | 117 -
.../HDFSParallelGatewaySenderQueue.java | 471 ---
.../hdfs/internal/HDFSStoreConfigHolder.java | 559 ---
.../cache/hdfs/internal/HDFSStoreCreation.java | 198 -
.../hdfs/internal/HDFSStoreFactoryImpl.java | 77 -
.../cache/hdfs/internal/HDFSStoreImpl.java | 638 ---
.../hdfs/internal/HDFSStoreMutatorImpl.java | 200 -
.../HDFSWriteOnlyStoreEventListener.java | 184 -
.../hdfs/internal/HoplogListenerForRegion.java | 72 -
.../cache/hdfs/internal/PersistedEventImpl.java | 202 -
.../hdfs/internal/QueuedPersistentEvent.java | 27 -
.../hdfs/internal/SignalledFlushObserver.java | 122 -
.../internal/SortedHDFSQueuePersistedEvent.java | 86 -
.../internal/SortedHoplogPersistedEvent.java | 114 -
.../UnsortedHDFSQueuePersistedEvent.java | 76 -
.../internal/UnsortedHoplogPersistedEvent.java | 92 -
.../hdfs/internal/hoplog/AbstractHoplog.java | 357 --
.../hoplog/AbstractHoplogOrganizer.java | 430 --
.../cache/hdfs/internal/hoplog/BloomFilter.java | 36 -
.../hoplog/CloseTmpHoplogsTimerTask.java | 108 -
.../hdfs/internal/hoplog/CompactionStatus.java | 72 -
.../cache/hdfs/internal/hoplog/FlushStatus.java | 72 -
.../internal/hoplog/HDFSCompactionManager.java | 330 --
.../internal/hoplog/HDFSFlushQueueArgs.java | 93 -
.../internal/hoplog/HDFSFlushQueueFunction.java | 287 --
.../hoplog/HDFSForceCompactionArgs.java | 107 -
.../hoplog/HDFSForceCompactionFunction.java | 129 -
.../HDFSForceCompactionResultCollector.java | 131 -
.../hoplog/HDFSLastCompactionTimeFunction.java | 56 -
.../internal/hoplog/HDFSRegionDirector.java | 480 ---
.../hdfs/internal/hoplog/HDFSStoreDirector.java | 78 -
.../hoplog/HDFSUnsortedHoplogOrganizer.java | 447 ---
.../hdfs/internal/hoplog/HFileSortedOplog.java | 853 ----
.../hoplog/HdfsSortedOplogOrganizer.java | 2004 ----------
.../cache/hdfs/internal/hoplog/Hoplog.java | 263 --
.../hdfs/internal/hoplog/HoplogConfig.java | 74 -
.../hdfs/internal/hoplog/HoplogListener.java | 47 -
.../hdfs/internal/hoplog/HoplogOrganizer.java | 123 -
.../hdfs/internal/hoplog/HoplogSetIterator.java | 166 -
.../hdfs/internal/hoplog/HoplogSetReader.java | 114 -
.../internal/hoplog/SequenceFileHoplog.java | 395 --
.../hoplog/mapred/AbstractGFRecordReader.java | 106 -
.../internal/hoplog/mapred/GFInputFormat.java | 95 -
.../internal/hoplog/mapred/GFOutputFormat.java | 75 -
.../mapreduce/AbstractGFRecordReader.java | 140 -
.../hoplog/mapreduce/GFInputFormat.java | 124 -
.../hdfs/internal/hoplog/mapreduce/GFKey.java | 72 -
.../hoplog/mapreduce/GFOutputFormat.java | 198 -
.../hoplog/mapreduce/HDFSSplitIterator.java | 197 -
.../internal/hoplog/mapreduce/HoplogUtil.java | 463 ---
.../hoplog/mapreduce/RWSplitIterator.java | 48 -
.../hoplog/mapreduce/StreamSplitIterator.java | 46 -
.../org/apache/hadoop/io/SequenceFile.java | 3726 ------------------
.../query/internal/index/DummyQRegion.java | 3 -
.../cache/query/internal/index/HashIndex.java | 1 -
.../query/internal/index/IndexManager.java | 8 -
.../gemfire/cache/wan/GatewaySender.java | 2 -
.../distributed/internal/InternalLocator.java | 19 +-
.../internal/WanLocatorDiscoverer.java | 4 +
.../membership/InternalDistributedMember.java | 68 +-
.../internal/membership/NetMember.java | 4 +-
.../internal/membership/gms/GMSMember.java | 36 +-
.../internal/membership/gms/ServiceConfig.java | 18 +
.../membership/gms/locator/GMSLocator.java | 2 +-
.../membership/gms/membership/GMSJoinLeave.java | 152 +-
.../gms/messenger/JGroupsMessenger.java | 7 +-
.../gemfire/internal/AvailablePort.java | 6 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 3 -
.../internal/DataSerializableFixedID.java | 1 -
.../gemfire/internal/HeapDataOutputStream.java | 3 -
.../internal/admin/ClientStatsManager.java | 3 +-
.../admin/remote/RemoteRegionAttributes.java | 25 -
.../cache/AbstractBucketRegionQueue.java | 21 +-
.../internal/cache/AbstractLRURegionMap.java | 4 +
.../gemfire/internal/cache/AbstractRegion.java | 147 -
.../internal/cache/AbstractRegionEntry.java | 38 +-
.../internal/cache/AbstractRegionMap.java | 99 +-
.../gemfire/internal/cache/BucketAdvisor.java | 1 -
.../gemfire/internal/cache/BucketRegion.java | 224 +-
.../internal/cache/BucketRegionQueue.java | 13 +-
.../cache/CacheDistributionAdvisor.java | 22 +-
.../gemfire/internal/cache/CachePerfStats.java | 75 -
.../internal/cache/ColocationHelper.java | 3 -
.../cache/CustomEvictionAttributesImpl.java | 35 -
.../internal/cache/DestroyOperation.java | 6 +-
.../gemfire/internal/cache/DiskEntry.java | 1 -
.../internal/cache/DistPeerTXStateStub.java | 2 +
.../gemfire/internal/cache/DistTXState.java | 11 +-
.../cache/DistTXStateOnCoordinator.java | 2 +
.../DistTXStateProxyImplOnCoordinator.java | 2 +
.../cache/DistributedCacheOperation.java | 11 +-
.../cache/DistributedPutAllOperation.java | 40 +-
.../internal/cache/DistributedRegion.java | 40 +-
.../cache/DistributedRemoveAllOperation.java | 25 +-
.../gemfire/internal/cache/EntryEventImpl.java | 96 +-
.../gemfire/internal/cache/EntryExpiryTask.java | 9 +-
.../gemfire/internal/cache/EventIDHolder.java | 35 +
.../gemfire/internal/cache/EvictorService.java | 284 --
.../gemfire/internal/cache/FilterProfile.java | 6 +-
.../internal/cache/GemFireCacheImpl.java | 99 -
.../gemfire/internal/cache/HARegion.java | 20 +-
.../internal/cache/HDFSLRURegionMap.java | 111 -
.../gemfire/internal/cache/HDFSRegionMap.java | 32 -
.../internal/cache/HDFSRegionMapDelegate.java | 540 ---
.../internal/cache/HDFSRegionMapImpl.java | 74 -
.../internal/cache/InitialImageOperation.java | 2 +-
.../gemfire/internal/cache/InternalCache.java | 4 -
.../internal/cache/InternalDataView.java | 28 +-
.../internal/cache/InternalRegionArguments.java | 16 -
.../internal/cache/InvalidateOperation.java | 5 +-
.../gemfire/internal/cache/LocalRegion.java | 383 +-
.../internal/cache/LocalRegionDataView.java | 35 +-
.../internal/cache/NonLocalRegionEntry.java | 20 -
.../gemstone/gemfire/internal/cache/Oplog.java | 14 -
.../gemfire/internal/cache/OverflowOplog.java | 1 -
.../internal/cache/PartitionedRegion.java | 495 +--
.../cache/PartitionedRegionDataStore.java | 49 +-
.../cache/PartitionedRegionDataView.java | 27 +-
.../gemfire/internal/cache/ProxyRegionMap.java | 28 +-
.../gemfire/internal/cache/QueuedOperation.java | 3 +-
.../gemfire/internal/cache/RegionEntry.java | 20 -
.../internal/cache/RegionMapFactory.java | 6 -
.../internal/cache/RemoteDestroyMessage.java | 5 +-
.../internal/cache/RemoteGetMessage.java | 2 +-
.../internal/cache/RemoteInvalidateMessage.java | 4 +-
.../internal/cache/RemotePutAllMessage.java | 5 +-
.../internal/cache/RemotePutMessage.java | 6 +-
.../internal/cache/RemoteRemoveAllMessage.java | 5 +-
.../cache/SearchLoadAndWriteProcessor.java | 6 +-
.../gemfire/internal/cache/TXCommitMessage.java | 4 +-
.../gemfire/internal/cache/TXEntry.java | 3 +-
.../gemfire/internal/cache/TXEntryState.java | 20 +-
.../gemfire/internal/cache/TXRegionState.java | 1 +
.../gemfire/internal/cache/TXRmtEvent.java | 9 +-
.../gemfire/internal/cache/TXState.java | 47 +-
.../internal/cache/TXStateInterface.java | 10 +-
.../internal/cache/TXStateProxyImpl.java | 30 +-
.../gemfire/internal/cache/TXStateStub.java | 32 +-
.../cache/TimestampedEntryEventImpl.java | 2 +
.../cache/UpdateEntryVersionOperation.java | 4 +-
.../gemfire/internal/cache/UpdateOperation.java | 11 +-
.../cache/UserSpecifiedRegionAttributes.java | 24 +-
.../cache/VMStatsDiskLRURegionEntryHeap.java | 2 +-
.../cache/VMStatsDiskLRURegionEntryOffHeap.java | 2 +-
.../cache/VMStatsDiskRegionEntryHeap.java | 2 +-
.../cache/VMStatsDiskRegionEntryOffHeap.java | 2 +-
.../cache/VMStatsLRURegionEntryHeap.java | 2 +-
.../cache/VMStatsLRURegionEntryOffHeap.java | 2 +-
.../internal/cache/VMStatsRegionEntryHeap.java | 2 +-
.../cache/VMStatsRegionEntryOffHeap.java | 2 +-
.../cache/VMThinDiskLRURegionEntryHeap.java | 2 +-
.../cache/VMThinDiskLRURegionEntryOffHeap.java | 2 +-
.../cache/VMThinDiskRegionEntryHeap.java | 2 +-
.../cache/VMThinDiskRegionEntryOffHeap.java | 2 +-
.../cache/VMThinLRURegionEntryHeap.java | 2 +-
.../cache/VMThinLRURegionEntryOffHeap.java | 2 +-
.../internal/cache/VMThinRegionEntryHeap.java | 2 +-
.../cache/VMThinRegionEntryOffHeap.java | 2 +-
.../internal/cache/ValidatingDiskRegion.java | 13 -
.../internal/cache/VersionTagHolder.java | 34 +
.../VersionedStatsDiskLRURegionEntryHeap.java | 2 +-
...VersionedStatsDiskLRURegionEntryOffHeap.java | 2 +-
.../VersionedStatsDiskRegionEntryHeap.java | 2 +-
.../VersionedStatsDiskRegionEntryOffHeap.java | 2 +-
.../cache/VersionedStatsLRURegionEntryHeap.java | 2 +-
.../VersionedStatsLRURegionEntryOffHeap.java | 2 +-
.../cache/VersionedStatsRegionEntryHeap.java | 2 +-
.../cache/VersionedStatsRegionEntryOffHeap.java | 2 +-
.../VersionedThinDiskLRURegionEntryHeap.java | 2 +-
.../VersionedThinDiskLRURegionEntryOffHeap.java | 2 +-
.../cache/VersionedThinDiskRegionEntryHeap.java | 2 +-
.../VersionedThinDiskRegionEntryOffHeap.java | 2 +-
.../cache/VersionedThinLRURegionEntryHeap.java | 2 +-
.../VersionedThinLRURegionEntryOffHeap.java | 2 +-
.../cache/VersionedThinRegionEntryHeap.java | 2 +-
.../cache/VersionedThinRegionEntryOffHeap.java | 2 +-
.../cache/control/InternalResourceManager.java | 10 -
.../cache/partitioned/DestroyMessage.java | 13 +-
.../partitioned/FetchBulkEntriesMessage.java | 6 +-
.../internal/cache/partitioned/GetMessage.java | 27 +-
.../cache/partitioned/InvalidateMessage.java | 3 +-
.../PRUpdateEntryVersionMessage.java | 1 +
.../cache/partitioned/PutAllPRMessage.java | 28 +-
.../internal/cache/partitioned/PutMessage.java | 23 +-
.../cache/partitioned/RemoveAllPRMessage.java | 13 +-
.../persistence/soplog/ByteComparator.java | 55 -
.../persistence/soplog/CursorIterator.java | 81 -
.../soplog/DelegatingSerializedComparator.java | 37 -
.../soplog/HFileStoreStatistics.java | 205 -
.../persistence/soplog/KeyValueIterator.java | 42 -
.../soplog/SortedOplogStatistics.java | 505 ---
.../cache/persistence/soplog/SortedReader.java | 255 --
.../persistence/soplog/TrackedReference.java | 153 -
.../cache/tier/sockets/BaseCommand.java | 23 +-
.../cache/tier/sockets/CacheClientUpdater.java | 3 +-
.../internal/cache/tier/sockets/Message.java | 16 -
.../cache/tier/sockets/command/Destroy.java | 3 +-
.../cache/tier/sockets/command/Destroy65.java | 5 +-
.../sockets/command/GatewayReceiverCommand.java | 11 +-
.../cache/tier/sockets/command/Get70.java | 19 +-
.../cache/tier/sockets/command/Invalidate.java | 3 +-
.../cache/tier/sockets/command/Put.java | 5 +-
.../cache/tier/sockets/command/Put61.java | 5 +-
.../cache/tier/sockets/command/Put65.java | 3 +-
.../cache/tier/sockets/command/Request.java | 4 +-
.../internal/cache/tx/ClientTXRegionStub.java | 4 +-
.../internal/cache/tx/DistTxEntryEvent.java | 13 +-
.../cache/tx/DistributedTXRegionStub.java | 14 +-
.../cache/tx/PartitionedTXRegionStub.java | 25 +-
.../gemfire/internal/cache/tx/TXRegionStub.java | 4 +-
.../cache/wan/AbstractGatewaySender.java | 27 +-
.../AbstractGatewaySenderEventProcessor.java | 2 +
.../cache/wan/GatewaySenderAttributes.java | 5 -
.../cache/wan/GatewaySenderEventImpl.java | 5 -
...rentParallelGatewaySenderEventProcessor.java | 3 -
.../ConcurrentParallelGatewaySenderQueue.java | 12 -
.../ParallelGatewaySenderEventProcessor.java | 22 +-
.../parallel/ParallelGatewaySenderQueue.java | 21 +-
.../cache/wan/serial/BatchDestroyOperation.java | 5 +-
...urrentSerialGatewaySenderEventProcessor.java | 3 +-
.../wan/serial/SerialGatewaySenderQueue.java | 2 +-
.../cache/xmlcache/AsyncEventQueueCreation.java | 9 -
.../internal/cache/xmlcache/CacheCreation.java | 39 +-
.../internal/cache/xmlcache/CacheXml.java | 31 -
.../internal/cache/xmlcache/CacheXmlParser.java | 170 -
.../xmlcache/RegionAttributesCreation.java | 55 +-
.../gemfire/internal/i18n/LocalizedStrings.java | 30 -
.../internal/i18n/ParentLocalizedStrings.java | 2 +-
.../internal/offheap/AbstractStoredObject.java | 1 -
.../internal/offheap/FreeListManager.java | 7 -
.../internal/offheap/OffHeapStoredObject.java | 6 -
.../internal/offheap/TinyStoredObject.java | 4 -
.../gemfire/internal/tcp/MsgStreamer.java | 11 -
.../management/DistributedRegionMXBean.java | 11 -
.../management/DistributedSystemMXBean.java | 8 -
.../gemfire/management/MemberMXBean.java | 7 -
.../gemfire/management/RegionMXBean.java | 10 -
.../internal/beans/DistributedRegionBridge.java | 5 -
.../internal/beans/DistributedRegionMBean.java | 5 -
.../internal/beans/DistributedSystemBridge.java | 19 -
.../internal/beans/DistributedSystemMBean.java | 7 -
.../internal/beans/HDFSRegionBridge.java | 173 -
.../management/internal/beans/MemberMBean.java | 5 -
.../internal/beans/MemberMBeanBridge.java | 27 -
.../internal/beans/PartitionedRegionBridge.java | 13 +-
.../management/internal/beans/RegionMBean.java | 5 -
.../internal/beans/RegionMBeanBridge.java | 5 -
.../beans/stats/RegionClusterStatsMonitor.java | 7 -
.../internal/cli/commands/ShellCommands.java | 2 +-
.../cli/domain/RegionAttributesInfo.java | 21 +-
.../functions/DescribeHDFSStoreFunction.java | 86 -
.../cli/functions/ShutDownFunction.java | 52 +-
.../cli/util/HDFSStoreNotFoundException.java | 47 -
.../cli/util/RegionAttributesNames.java | 4 +-
.../support/MemberMXBeanAdapter.java | 5 -
.../gemfire/pdx/internal/PdxReaderImpl.java | 3 -
.../geode.apache.org/schema/cache/cache-1.0.xsd | 31 -
.../com/gemstone/gemfire/TXExpiryJUnitTest.java | 6 +-
.../gemfire/cache/ConnectionPoolDUnitTest.java | 24 +-
.../pooling/ConnectionManagerJUnitTest.java | 8 +-
.../SignalledFlushObserverJUnitTest.java | 97 -
.../SortedListForAsyncQueueJUnitTest.java | 564 ---
.../management/MemoryThresholdsDUnitTest.java | 4 +
.../MemoryThresholdsOffHeapDUnitTest.java | 9 +-
.../management/ResourceManagerDUnitTest.java | 16 +-
.../GetOperationContextImplJUnitTest.java | 1 -
.../com/gemstone/gemfire/cache/query/Utils.java | 38 +
.../dunit/QueryDataInconsistencyDUnitTest.java | 14 +-
.../QueryUsingFunctionContextDUnitTest.java | 19 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 2714 ++++++-------
.../cache/query/dunit/RemoteQueryDUnitTest.java | 3 +
.../QueryREUpdateInProgressJUnitTest.java | 15 +-
...rrentIndexInitOnOverflowRegionDUnitTest.java | 27 +-
...ndexOperationsOnOverflowRegionDUnitTest.java | 97 +-
...pdateWithInplaceObjectModFalseDUnitTest.java | 55 +-
...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 48 +-
...itializeIndexEntryDestroyQueryDUnitTest.java | 110 +-
.../PRBasicIndexCreationDUnitTest.java | 302 +-
.../PRBasicIndexCreationDeadlockDUnitTest.java | 42 +-
.../PRBasicMultiIndexCreationDUnitTest.java | 267 +-
.../partitioned/PRBasicQueryDUnitTest.java | 36 +-
.../PRBasicRemoveIndexDUnitTest.java | 37 +-
.../PRColocatedEquiJoinDUnitTest.java | 106 +-
.../partitioned/PRInvalidQueryDUnitTest.java | 26 +-
.../partitioned/PRQueryCacheCloseDUnitTest.java | 52 +-
.../query/partitioned/PRQueryDUnitHelper.java | 818 +---
.../query/partitioned/PRQueryDUnitTest.java | 87 +-
.../query/partitioned/PRQueryPerfDUnitTest.java | 504 ---
.../PRQueryRegionCloseDUnitTest.java | 28 +-
.../PRQueryRegionDestroyedDUnitTest.java | 36 +-
.../PRQueryRemoteNodeExceptionDUnitTest.java | 48 +-
.../gemfire/cache30/Bug38741DUnitTest.java | 2 +-
.../gemfire/cache30/Bug44418JUnitTest.java | 10 +-
.../gemfire/cache30/CacheLogRollDUnitTest.java | 13 +-
.../cache30/ClientMembershipDUnitTest.java | 827 ++--
...iskDistributedNoAckAsyncRegionDUnitTest.java | 4 -
.../DiskDistributedNoAckRegionTestCase.java | 7 +-
...tributedAckPersistentRegionCCEDUnitTest.java | 80 +-
.../DistributedAckRegionCCEDUnitTest.java | 76 +-
.../cache30/DistributedAckRegionDUnitTest.java | 2 -
.../DistributedNoAckRegionCCEDUnitTest.java | 76 +-
.../DistributedNoAckRegionDUnitTest.java | 3 +-
.../gemfire/cache30/MultiVMRegionTestCase.java | 18 +-
.../cache30/PartitionedRegionDUnitTest.java | 6 +-
.../cache30/RegionReliabilityTestCase.java | 4 +
.../gemfire/cache30/RegionTestCase.java | 11 +-
.../gemfire/cache30/TXDistributedDUnitTest.java | 5 +-
.../gemfire/distributed/LocatorDUnitTest.java | 603 ++-
.../LocatorLauncherRemoteJUnitTest.java | 13 +-
.../ServerLauncherRemoteJUnitTest.java | 11 +-
.../internal/LocatorLoadSnapshotJUnitTest.java | 2 +
.../GemFireDeadlockDetectorDUnitTest.java | 12 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 7 +-
.../gms/membership/GMSJoinLeaveTestHelper.java | 7 +-
.../gemfire/disttx/DistTXExpiryJUnitTest.java | 1 -
...hreadPoolExecutorWithKeepAliveJUnitTest.java | 19 +-
.../cache/FixedPRSinglehopDUnitTest.java | 20 +
.../internal/cache/GIIDeltaDUnitTest.java | 9 +-
.../cache/NetSearchMessagingDUnitTest.java | 12 +-
.../gemfire/internal/cache/OplogJUnitTest.java | 13 +-
.../PartitionedRegionCreationDUnitTest.java | 17 +-
...rtitionedRegionDelayedRecoveryDUnitTest.java | 13 +-
.../PartitionedRegionSingleHopDUnitTest.java | 5 +
.../internal/cache/SingleHopStatsDUnitTest.java | 9 +-
.../internal/cache/UpdateVersionJUnitTest.java | 4 +-
...ributedRegionFunctionExecutionDUnitTest.java | 11 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 7 +-
.../PRFunctionExecutionTimeOutDUnitTest.java | 17 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 6 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 5 +-
.../cache/ha/HARegionQueueDUnitTest.java | 14 +-
...tentColocatedPartitionedRegionDUnitTest.java | 16 +-
.../PersistentPartitionedRegionDUnitTest.java | 15 +-
...tentPartitionedRegionOldConfigDUnitTest.java | 6 +-
.../fixed/FixedPartitioningDUnitTest.java | 12 +-
.../DestroyEntryPropagationDUnitTest.java | 19 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 21 +-
.../sockets/ReliableMessagingDUnitTest.java | 12 +-
.../sockets/UpdatePropagationDUnitTest.java | 17 +-
.../cache/wan/AsyncEventQueueTestBase.java | 12 -
.../asyncqueue/AsyncEventListenerDUnitTest.java | 1115 +++---
.../AsyncEventListenerOffHeapDUnitTest.java | 4 +-
.../AsyncEventQueueStatsDUnitTest.java | 186 +-
.../ConcurrentAsyncEventQueueDUnitTest.java | 168 +-
.../CommonParallelAsyncEventQueueDUnitTest.java | 8 +-
.../ParallelGatewaySenderQueueJUnitTest.java | 2 +-
.../management/DLockManagementDUnitTest.java | 22 +-
.../gemfire/management/QueryDataDUnitTest.java | 6 +-
...ersalMembershipListenerAdapterDUnitTest.java | 5 +-
.../cli/commands/CliCommandTestBase.java | 107 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 10 +-
.../commands/DiskStoreCommandsDUnitTest.java | 2 +
.../commands/GemfireDataCommandsDUnitTest.java | 2 +
.../cli/commands/IndexCommandsDUnitTest.java | 4 +-
.../ListAndDescribeRegionDUnitTest.java | 2 +
.../MiscellaneousCommandsDUnitTest.java | 3 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 2 +
.../cli/commands/ShellCommandsDUnitTest.java | 47 +-
.../SharedConfigurationUsingDirDUnitTest.java | 2 +
.../domain/CacheElementJUnitTest.java | 1 -
.../GemcachedDevelopmentJUnitTest.java | 2 +
.../pdx/DistributedSystemIdDUnitTest.java | 13 +-
.../gemfire/redis/RedisDistDUnitTest.java | 4 +
.../security/ClientAuthenticationDUnitTest.java | 2 +
.../security/ClientAuthorizationDUnitTest.java | 6 +-
.../security/ClientAuthorizationTestCase.java | 24 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 6 +-
.../security/P2PAuthenticationDUnitTest.java | 5 +-
.../internal/JUnit4DistributedTestCase.java | 5 +-
.../test/dunit/standalone/ProcessManager.java | 7 +-
.../sanctionedDataSerializables.txt | 92 +-
.../codeAnalysis/sanctionedSerializables.txt | 27 +-
.../cache/query/internal/cq/CqServiceImpl.java | 2 +-
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 5 +-
.../cq/dunit/CqPerfUsingPoolDUnitTest.java | 9 +-
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 2 +-
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 22 +-
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 18 +-
.../query/dunit/QueryMonitorDUnitTest.java | 8 +-
.../cache/RemoteCQTransactionDUnitTest.java | 17 +-
.../sockets/DurableClientSimpleDUnitTest.java | 203 +-
.../cli/commands/ClientCommandsDUnitTest.java | 1764 ++++-----
.../security/ClientAuthzObjectModDUnitTest.java | 40 +-
.../ClientCQPostAuthorizationDUnitTest.java | 8 +-
.../ClientPostAuthorizationDUnitTest.java | 20 +-
.../MultiUserDurableCQAuthzDUnitTest.java | 8 +-
geode-lucene/build.gradle | 4 -
.../LuceneIndexForPartitionedRegion.java | 123 +-
.../LuceneIndexForPartitionedRegionTest.java | 348 ++
.../LuceneIndexRecoveryHAJUnitTest.java | 5 +-
.../internal/LuceneServiceImplJUnitTest.java | 146 +-
.../tools/pulse/internal/data/Cluster.java | 9 -
.../pulse/internal/data/PulseConstants.java | 1 -
.../internal/service/ClusterRegionService.java | 11 -
.../internal/service/ClusterRegionsService.java | 11 -
.../service/ClusterSelectedRegionService.java | 6 -
geode-pulse/src/main/webapp/META-INF/NOTICE | 18 +-
.../scripts/pulsescript/PulseCallbacks.js | 2 -
.../webapp/scripts/pulsescript/clusterDetail.js | 7 +-
.../controllers/PulseControllerJUnitTest.java | 3 -
.../gemfire/tools/pulse/tests/Region.java | 9 +-
geode-pulse/src/test/resources/test.properties | 6 +-
geode-rebalancer/build.gradle | 7 -
geode-site/website/content/docs/index.html | 2 +-
geode-site/website/content/releases/index.html | 52 +
geode-spark-connector/doc/10_demos.md | 12 +-
geode-spark-connector/doc/1_building.md | 18 +-
geode-spark-connector/doc/2_quick.md | 26 +-
geode-spark-connector/doc/3_connecting.md | 38 +-
geode-spark-connector/doc/4_loading.md | 30 +-
geode-spark-connector/doc/5_rdd_join.md | 26 +-
geode-spark-connector/doc/6_save_rdd.md | 20 +-
geode-spark-connector/doc/7_save_dstream.md | 10 +-
geode-spark-connector/doc/8_oql.md | 8 +-
geode-spark-connector/doc/9_java_api.md | 36 +-
.../connector/internal/RegionMetadata.java | 93 -
.../gemfirefunctions/QueryFunction.java | 99 -
.../RetrieveRegionFunction.java | 208 -
.../RetrieveRegionMetadataFunction.java | 118 -
.../StructStreamingResultSender.java | 219 -
.../gemfire/spark/connector/Employee.java | 54 -
.../spark/connector/JavaApiIntegrationTest.java | 424 --
.../gemfire/spark/connector/Portfolio.java | 109 -
.../gemfire/spark/connector/Position.java | 73 -
.../src/it/resources/test-regions.xml | 49 -
.../src/it/resources/test-retrieve-regions.xml | 57 -
.../spark/connector/BasicIntegrationTest.scala | 598 ---
.../RDDJoinRegionIntegrationTest.scala | 300 --
.../RetrieveRegionIntegrationTest.scala | 253 --
.../gemfire/spark/connector/package.scala | 29 -
.../connector/testkit/GemFireCluster.scala | 47 -
.../spark/connector/testkit/GemFireRunner.scala | 148 -
.../spark/connector/testkit/IOUtils.scala | 94 -
.../spark/streaming/ManualClockHelper.scala | 28 -
.../spark/streaming/TestInputDStream.scala | 44 -
.../javaapi/GemFireJavaDStreamFunctions.java | 86 -
.../GemFireJavaPairDStreamFunctions.java | 77 -
.../javaapi/GemFireJavaPairRDDFunctions.java | 238 --
.../javaapi/GemFireJavaRDDFunctions.java | 178 -
.../javaapi/GemFireJavaSQLContextFunctions.java | 49 -
.../GemFireJavaSparkContextFunctions.java | 87 -
.../connector/javaapi/GemFireJavaUtil.java | 122 -
.../spark/connector/GemFireConnection.scala | 67 -
.../spark/connector/GemFireConnectionConf.scala | 73 -
.../connector/GemFireConnectionManager.scala | 31 -
.../connector/GemFireFunctionDeployer.scala | 81 -
.../connector/GemFireKryoRegistrator.scala | 29 -
.../connector/GemFirePairRDDFunctions.scala | 140 -
.../spark/connector/GemFireRDDFunctions.scala | 120 -
.../connector/GemFireSQLContextFunctions.scala | 42 -
.../GemFireSparkContextFunctions.scala | 39 -
.../internal/DefaultGemFireConnection.scala | 164 -
.../DefaultGemFireConnectionManager.scala | 77 -
.../connector/internal/LocatorHelper.scala | 135 -
.../StructStreamingResultCollector.scala | 152 -
.../connector/internal/oql/QueryParser.scala | 58 -
.../spark/connector/internal/oql/QueryRDD.scala | 83 -
.../internal/oql/QueryResultCollector.scala | 69 -
.../connector/internal/oql/RDDConverter.scala | 40 -
.../connector/internal/oql/RowBuilder.scala | 38 -
.../connector/internal/oql/SchemaBuilder.scala | 73 -
.../internal/oql/UndefinedSerializer.scala | 46 -
.../connector/internal/rdd/GemFireJoinRDD.scala | 67 -
.../internal/rdd/GemFireOuterJoinRDD.scala | 69 -
.../internal/rdd/GemFireRDDPartition.scala | 36 -
.../internal/rdd/GemFireRDDPartitioner.scala | 59 -
.../rdd/GemFireRDDPartitionerImpl.scala | 89 -
.../internal/rdd/GemFireRDDWriter.scala | 82 -
.../internal/rdd/GemFireRegionRDD.scala | 138 -
.../javaapi/GemFireJavaRegionRDD.scala | 26 -
.../spark/connector/javaapi/JavaAPIHelper.scala | 53 -
.../gemfire/spark/connector/package.scala | 69 -
.../streaming/GemFireDStreamFunctions.scala | 89 -
.../spark/connector/streaming/package.scala | 32 -
.../gemfire/spark/connector/JavaAPITest.java | 163 -
.../connector/GemFireFunctionDeployerTest.scala | 58 -
.../DefaultGemFireConnectionManagerTest.scala | 82 -
...tStreamingResultSenderAndCollectorTest.scala | 254 --
.../internal/oql/QueryParserTest.scala | 83 -
.../connector/ConnectorImplicitsTest.scala | 50 -
.../connector/GemFireConnectionConfTest.scala | 100 -
.../connector/GemFireDStreamFunctionsTest.scala | 79 -
.../connector/GemFireRDDFunctionsTest.scala | 139 -
.../spark/connector/LocatorHelperTest.scala | 168 -
.../rdd/GemFireRDDPartitionerTest.scala | 190 -
.../connector/rdd/GemFireRegionRDDTest.scala | 117 -
.../basic-demos/src/main/java/demo/Emp.java | 95 -
.../src/main/java/demo/OQLJavaDemo.java | 59 -
.../src/main/java/demo/PairRDDSaveJavaDemo.java | 86 -
.../src/main/java/demo/RDDSaveJavaDemo.java | 85 -
.../src/main/java/demo/RegionToRDDJavaDemo.java | 57 -
.../src/main/scala/demo/NetworkWordCount.scala | 75 -
.../connector/internal/RegionMetadata.java | 93 +
.../internal/geodefunctions/QueryFunction.java | 99 +
.../geodefunctions/RetrieveRegionFunction.java | 208 +
.../RetrieveRegionMetadataFunction.java | 118 +
.../StructStreamingResultSender.java | 219 +
.../pivotal/geode/spark/connector/Employee.java | 54 +
.../spark/connector/JavaApiIntegrationTest.java | 424 ++
.../geode/spark/connector/Portfolio.java | 109 +
.../pivotal/geode/spark/connector/Position.java | 73 +
.../src/it/resources/test-regions.xml | 49 +
.../src/it/resources/test-retrieve-regions.xml | 57 +
.../spark/connector/BasicIntegrationTest.scala | 598 +++
.../RDDJoinRegionIntegrationTest.scala | 300 ++
.../RetrieveRegionIntegrationTest.scala | 253 ++
.../pivotal/geode/spark/connector/package.scala | 29 +
.../spark/connector/testkit/GeodeCluster.scala | 47 +
.../spark/connector/testkit/GeodeRunner.scala | 148 +
.../geode/spark/connector/testkit/IOUtils.scala | 94 +
.../spark/streaming/ManualClockHelper.scala | 28 +
.../spark/streaming/TestInputDStream.scala | 44 +
.../javaapi/GeodeJavaDStreamFunctions.java | 86 +
.../javaapi/GeodeJavaPairDStreamFunctions.java | 77 +
.../javaapi/GeodeJavaPairRDDFunctions.java | 238 ++
.../javaapi/GeodeJavaRDDFunctions.java | 178 +
.../javaapi/GeodeJavaSQLContextFunctions.java | 49 +
.../javaapi/GeodeJavaSparkContextFunctions.java | 87 +
.../spark/connector/javaapi/GeodeJavaUtil.java | 122 +
.../geode/spark/connector/GeodeConnection.scala | 67 +
.../spark/connector/GeodeConnectionConf.scala | 73 +
.../connector/GeodeConnectionManager.scala | 31 +
.../spark/connector/GeodeFunctionDeployer.scala | 81 +
.../spark/connector/GeodeKryoRegistrator.scala | 29 +
.../spark/connector/GeodePairRDDFunctions.scala | 140 +
.../spark/connector/GeodeRDDFunctions.scala | 120 +
.../connector/GeodeSQLContextFunctions.scala | 42 +
.../connector/GeodeSparkContextFunctions.scala | 39 +
.../internal/DefaultGeodeConnection.scala | 164 +
.../DefaultGeodeConnectionManager.scala | 77 +
.../connector/internal/LocatorHelper.scala | 135 +
.../StructStreamingResultCollector.scala | 152 +
.../connector/internal/oql/QueryParser.scala | 58 +
.../spark/connector/internal/oql/QueryRDD.scala | 83 +
.../internal/oql/QueryResultCollector.scala | 69 +
.../connector/internal/oql/RDDConverter.scala | 40 +
.../connector/internal/oql/RowBuilder.scala | 38 +
.../connector/internal/oql/SchemaBuilder.scala | 73 +
.../internal/oql/UndefinedSerializer.scala | 46 +
.../connector/internal/rdd/GeodeJoinRDD.scala | 67 +
.../internal/rdd/GeodeOuterJoinRDD.scala | 69 +
.../internal/rdd/GeodeRDDPartition.scala | 36 +
.../internal/rdd/GeodeRDDPartitioner.scala | 59 +
.../internal/rdd/GeodeRDDPartitionerImpl.scala | 89 +
.../connector/internal/rdd/GeodeRDDWriter.scala | 82 +
.../connector/internal/rdd/GeodeRegionRDD.scala | 138 +
.../connector/javaapi/GeodeJavaRegionRDD.scala | 26 +
.../spark/connector/javaapi/JavaAPIHelper.scala | 53 +
.../pivotal/geode/spark/connector/package.scala | 69 +
.../streaming/GeodeDStreamFunctions.scala | 89 +
.../spark/connector/streaming/package.scala | 32 +
.../geode/spark/connector/JavaAPITest.java | 163 +
.../connector/GeodeFunctionDeployerTest.scala | 58 +
.../DefaultGeodeConnectionManagerTest.scala | 82 +
...tStreamingResultSenderAndCollectorTest.scala | 254 ++
.../internal/oql/QueryParserTest.scala | 83 +
.../connector/ConnectorImplicitsTest.scala | 50 +
.../connector/GeodeConnectionConfTest.scala | 100 +
.../connector/GeodeDStreamFunctionsTest.scala | 79 +
.../spark/connector/GeodeRDDFunctionsTest.scala | 139 +
.../spark/connector/LocatorHelperTest.scala | 168 +
.../connector/rdd/GeodeRDDPartitionerTest.scala | 190 +
.../connector/rdd/GeodeRegionRDDTest.scala | 117 +
.../basic-demos/src/main/java/demo/Emp.java | 95 +
.../src/main/java/demo/OQLJavaDemo.java | 59 +
.../src/main/java/demo/PairRDDSaveJavaDemo.java | 86 +
.../src/main/java/demo/RDDSaveJavaDemo.java | 85 +
.../src/main/java/demo/RegionToRDDJavaDemo.java | 57 +
.../src/main/scala/demo/NetworkWordCount.scala | 75 +
.../project/Dependencies.scala | 8 +-
.../project/GemFireSparkBuild.scala | 76 -
.../project/GeodeSparkBuild.scala | 76 +
geode-spark-connector/project/Settings.scala | 4 +-
.../internal/locator/wan/LocatorDiscovery.java | 16 +-
.../locator/wan/WanLocatorDiscovererImpl.java | 19 +-
.../cache/wan/GatewaySenderFactoryImpl.java | 4 -
.../cache/CacheXml70GatewayDUnitTest.java | 18 +-
.../internal/cache/UpdateVersionDUnitTest.java | 10 +-
.../cache/wan/CacheClientNotifierDUnitTest.java | 4 +
.../gemfire/internal/cache/wan/WANTestBase.java | 30 +-
...allelGatewaySenderOperation_1_DUnitTest.java | 7 +-
.../ConcurrentWANPropogation_2_DUnitTest.java | 10 +-
.../wan/misc/NewWanAuthenticationDUnitTest.java | 309 ++
.../wan/misc/WANConfigurationJUnitTest.java | 11 +-
.../cache/wan/misc/WANSSLDUnitTest.java | 4 +
.../wan/misc/WanAutoDiscoveryDUnitTest.java | 42 +-
.../cache/wan/misc/WanValidationsDUnitTest.java | 8 +-
.../ParallelWANPropogationOffHeapDUnitTest.java | 3 +-
.../SerialWANPropogationOffHeapDUnitTest.java | 3 +-
...ation_PartitionedRegionOffHeapDUnitTest.java | 3 +-
...arallelGatewaySenderOperationsDUnitTest.java | 6 +-
...ersistenceEnabledGatewaySenderDUnitTest.java | 7 +-
.../ParallelWANPropagationDUnitTest.java | 4 +
.../wan/parallel/ParallelWANStatsDUnitTest.java | 5 +
...rialGatewaySenderEventListenerDUnitTest.java | 10 +-
.../SerialWANPropagationLoopBackDUnitTest.java | 6 +-
.../serial/SerialWANPropogationDUnitTest.java | 13 +-
...NPropogation_PartitionedRegionDUnitTest.java | 8 +-
geode-web-api/src/main/webapp/META-INF/NOTICE | 12 +-
gradle/publish.gradle | 4 +-
gradle/utilities.gradle | 5 +
630 files changed, 15560 insertions(+), 40726 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/68ddd58b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
index f270fd0,63c7c74..7eabba6
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
@@@ -204,145 -204,7 +206,146 @@@ public class LocatorLauncherRemoteJUnit
}
}
+ private static class ToSystemOut implements ProcessStreamReader.InputListener {
+ @Override
+ public void notifyInputLine(String line) {
+ System.out.println(line);
+ }
+ }
+
+ @Test
+ public void testStartUsesCustomLoggingConfiguration() throws Throwable {
+ // TODO: create working dir, copy custom xml to that dir and point log4j at it
+
+ // build and start the locator
+ final List<String> jvmArguments = getJvmArguments();
+
+ final List<String> command = new ArrayList<String>();
+ command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getCanonicalPath());
+ for (String jvmArgument : jvmArguments) {
+ command.add(jvmArgument);
+ }
+ command.add("-Dlog4j.configurationFile=/Users/klund/dev/gemfire/open/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml");
+ //command.add("-D" + ConfigurationFactory.CONFIGURATION_FILE_PROPERTY + "=/Users/klund/dev/doesnotexist.xml");
+ command.add("-cp");
+ command.add(System.getProperty("java.class.path"));
+ command.add(LocatorLauncher.class.getName());
+ command.add(LocatorLauncher.Command.START.getName());
+ command.add(getUniqueName());
+ command.add("--port=" + this.locatorPort);
+ command.add("--redirect-output");
+
+ for (String line : command) {
+ System.out.println("KIRK:testStartUsesCustomLoggingConfiguration:stdout: " + line);
+ }
+
+ this.process = new ProcessBuilder(command).directory(this.temporaryFolder.getRoot()).start();
+ this.processOutReader = new ProcessStreamReader.Builder(this.process).inputStream(this.process.getInputStream()).inputListener(new ToSystemOut()).build().start();
+ this.processErrReader = new ProcessStreamReader.Builder(this.process).inputStream(this.process.getErrorStream()).inputListener(new ToSystemOut()).build().start();
+
+ int pid = 0;
+ String workingDirectory = this.temporaryFolder.getRoot().getCanonicalPath();
+ System.out.println("KIRK: workingDirectory=" + workingDirectory);
+ this.launcher = new LocatorLauncher.Builder()
+ .setWorkingDirectory(workingDirectory)
+ .build();
+ try {
+ waitForLocatorToStart(this.launcher);
+
+ // validate the pid file and its contents
+ this.pidFile = new File(this.temporaryFolder.getRoot(), ProcessType.LOCATOR.getPidFileName());
+ assertTrue(this.pidFile.exists());
+ pid = readPid(this.pidFile);
+ assertTrue(pid > 0);
+ assertTrue(ProcessUtils.isProcessAlive(pid));
+
+ final String logFileName = getUniqueName()+".log";
+ assertTrue("Log file should exist: " + logFileName, new File(this.temporaryFolder.getRoot(), logFileName).exists());
+
+ // check the status
+ final LocatorState locatorState = this.launcher.status();
+ assertNotNull(locatorState);
+ assertEquals(Status.ONLINE, locatorState.getStatus());
+ } catch (Throwable e) {
+ this.errorCollector.addError(e);
+ }
+
+ // stop the locator
+ try {
+ assertEquals(Status.STOPPED, this.launcher.stop().getStatus());
+ waitForPidToStop(pid);
+ } catch (Throwable e) {
+ this.errorCollector.addError(e);
+ }
+ }
+
+ @Test
+ public void testStartUsesCustomLoggingConfigurationWithLauncherLifecycleCommands() throws Throwable {
+ // TODO: create working dir, copy custom xml to that dir and point log4j at it
+
+ // build and start the locator
+ final List<String> jvmArguments = getJvmArguments();
+
+ final List<String> command = new ArrayList<String>();
+ command.add(new File(new File(System.getProperty("java.home"), "bin"), "java").getCanonicalPath());
+ for (String jvmArgument : jvmArguments) {
+ command.add(jvmArgument);
+ }
+ command.add("-Dlog4j.configurationFile=/Users/klund/dev/gemfire/open/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml");
+ //command.add("-D" + ConfigurationFactory.CONFIGURATION_FILE_PROPERTY + "=/Users/klund/dev/doesnotexist.xml");
+ command.add("-cp");
+ command.add(System.getProperty("java.class.path"));
+ command.add(LocatorLauncher.class.getName());
+ command.add(LocatorLauncher.Command.START.getName());
+ command.add(getUniqueName());
+ command.add("--port=" + this.locatorPort);
+ command.add("--redirect-output");
+
+ for (String line : command) {
+ System.out.println("KIRK:testStartUsesCustomLoggingConfiguration:stdout: " + line);
+ }
+
+ this.process = new ProcessBuilder(command).directory(this.temporaryFolder.getRoot()).start();
+ this.processOutReader = new ProcessStreamReader.Builder(this.process).inputStream(this.process.getInputStream()).inputListener(new ToSystemOut()).build().start();
+ this.processErrReader = new ProcessStreamReader.Builder(this.process).inputStream(this.process.getErrorStream()).inputListener(new ToSystemOut()).build().start();
+
+ int pid = 0;
+ String workingDirectory = this.temporaryFolder.getRoot().getCanonicalPath();
+ System.out.println("KIRK: workingDirectory=" + workingDirectory);
+ this.launcher = new LocatorLauncher.Builder()
+ .setWorkingDirectory(workingDirectory)
+ .build();
+ try {
+ waitForLocatorToStart(this.launcher);
+
+ // validate the pid file and its contents
+ this.pidFile = new File(this.temporaryFolder.getRoot(), ProcessType.LOCATOR.getPidFileName());
+ assertTrue(this.pidFile.exists());
+ pid = readPid(this.pidFile);
+ assertTrue(pid > 0);
+ assertTrue(ProcessUtils.isProcessAlive(pid));
+
+ final String logFileName = getUniqueName()+".log";
+ assertTrue("Log file should exist: " + logFileName, new File(this.temporaryFolder.getRoot(), logFileName).exists());
+
+ // check the status
+ final LocatorState locatorState = this.launcher.status();
+ assertNotNull(locatorState);
+ assertEquals(Status.ONLINE, locatorState.getStatus());
+ } catch (Throwable e) {
+ this.errorCollector.addError(e);
+ }
+
+ // stop the locator
+ try {
+ assertEquals(Status.STOPPED, this.launcher.stop().getStatus());
+ waitForPidToStop(pid);
+ } catch (Throwable e) {
+ this.errorCollector.addError(e);
+ }
+ }
+
+ @Category(FlakyTest.class) // GEODE-530: BindException, random ports
@Test
public void testStartDeletesStaleControlFiles() throws Throwable {
// create existing control files