# Renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ef8f69b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ef8f69b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ef8f69b Branch: refs/heads/master Commit: 1ef8f69b04342e47ab2052e609e5445cec3dccdd Parents: cdb10bc Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 5 16:55:35 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 5 16:56:16 2014 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 4 +- examples/config/example-compute.xml | 4 +- examples/config/example-streamer.xml | 4 +- examples/config/filesystem/example-ggfs.xml | 4 +- .../failover/ComputeFailoverNodeStartup.java | 4 +- .../HibernateL2CacheExampleNodeStartup.java | 4 +- .../store/CacheNodeWithStoreStartup.java | 6 +- .../MemcacheRestExampleNodeStartup.java | 4 +- .../examples/misc/springbean/spring-bean.xml | 4 +- .../scalar/examples/ScalarJvmCloudExample.scala | 4 +- .../grid/gridify/GridAbstractAopTest.java | 2 +- .../singlesplit/GridSingleSplitsLoadTest.java | 2 +- .../gridify/GridifySingleSplitLoadTest.java | 4 +- .../GridExternalNonSpringAopSelfTest.java | 2 +- .../ipfinder/s3/GridTcpDiscoveryS3IpFinder.java | 312 ++ .../spi/discovery/tcp/ipfinder/s3/package.html | 15 + .../ipfinder/s3/GridTcpDiscoveryS3IpFinder.java | 312 -- .../spi/discovery/tcp/ipfinder/s3/package.html | 15 - .../s3/GridTcpDiscoveryS3IpFinderSelfTest.java | 64 + .../spi/discovery/tcp/ipfinder/s3/package.html | 15 + .../s3/GridTcpDiscoveryS3IpFinderSelfTest.java | 65 - .../spi/discovery/tcp/ipfinder/s3/package.html | 15 - .../testsuites/bamboo/GridS3TestSuite.java | 2 +- ...GridClientAbstractMultiThreadedSelfTest.java | 6 +- .../client/GridClientDefaultCacheSelfTest.java | 6 +- .../client/GridClientTopologyCacheSelfTest.java | 6 +- .../GridClientAbstractMultiNodeSelfTest.java | 6 +- .../integration/GridClientAbstractSelfTest.java | 6 +- .../GridClientPreferDirectSelfTest.java | 6 +- .../router/GridClientFailedInitSelfTest.java | 6 +- .../router/GridRouterFactorySelfTest.java | 6 +- .../rest/GridAbstractRestProcessorSelfTest.java | 6 +- .../rest/GridRestBinaryProtocolSelfTest.java | 6 +- .../rest/GridRestMemcacheProtocolSelfTest.java | 6 +- .../rest/GridRestProcessorStartSelfTest.java | 6 +- .../processors/rest/GridRestProcessorTest.java | 4 +- .../rest/GridTaskCommandHandlerSelfTest.java | 6 +- .../jdbc/GridJdbcComplexQuerySelfTest.java | 6 +- .../jdbc/GridJdbcConnectionSelfTest.java | 6 +- .../jdbc/GridJdbcEmptyCacheSelfTest.java | 6 +- .../jdbc/GridJdbcLocalCachesSelfTest.java | 6 +- .../gridgain/jdbc/GridJdbcMetadataSelfTest.java | 6 +- .../jdbc/GridJdbcPreparedStatementSelfTest.java | 6 +- .../jdbc/GridJdbcResultSetSelfTest.java | 6 +- .../jdbc/GridJdbcStatementSelfTest.java | 6 +- .../clients/src/test/resources/spring-cache.xml | 4 +- .../src/test/resources/spring-server-node.xml | 4 +- .../test/resources/spring-server-ssl-node.xml | 4 +- .../java/org/apache/ignite/IgniteCluster.java | 6 +- .../apache/ignite/IgniteSystemProperties.java | 4 +- .../org/apache/ignite/cluster/ClusterNode.java | 4 +- .../configuration/IgniteConfiguration.java | 8 +- .../org/apache/ignite/plugin/PluginContext.java | 8 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 22 +- .../spi/discovery/DiscoveryMetricsHelper.java | 360 ++ .../spi/discovery/DiscoveryMetricsProvider.java | 31 + .../discovery/DiscoveryNodeMetricsAdapter.java | 1060 ++++ .../ignite/spi/discovery/DiscoverySpi.java | 132 + .../spi/discovery/DiscoverySpiDataExchange.java | 36 + .../discovery/DiscoverySpiHistorySupport.java | 28 + .../spi/discovery/DiscoverySpiListener.java | 35 + .../DiscoverySpiNodeAuthenticator.java | 39 + .../spi/discovery/DiscoverySpiOrderSupport.java | 39 + .../apache/ignite/spi/discovery/package.html | 15 + .../discovery/tcp/TcpClientDiscoverySpi.java | 1219 +++++ .../tcp/TcpClientDiscoverySpiMBean.java | 156 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 5144 ++++++++++++++++++ .../discovery/tcp/TcpDiscoverySpiAdapter.java | 996 ++++ .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 267 + .../tcp/internal/TcpDiscoveryNode.java | 443 ++ .../tcp/internal/TcpDiscoveryNodesRing.java | 636 +++ .../tcp/internal/TcpDiscoverySpiState.java | 45 + .../tcp/internal/TcpDiscoveryStatistics.java | 639 +++ .../spi/discovery/tcp/internal/package.html | 15 + .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 90 + .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 77 + .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 361 ++ .../discovery/tcp/ipfinder/jdbc/package.html | 15 + .../TcpDiscoveryMulticastIpFinder.java | 752 +++ .../tcp/ipfinder/multicast/package.html | 15 + .../spi/discovery/tcp/ipfinder/package.html | 15 + .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 258 + .../tcp/ipfinder/sharedfs/package.html | 15 + .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 255 + .../spi/discovery/tcp/ipfinder/vm/package.html | 15 + .../messages/TcpDiscoveryAbstractMessage.java | 266 + .../messages/TcpDiscoveryAuthFailedMessage.java | 72 + .../TcpDiscoveryCheckFailedMessage.java | 71 + .../TcpDiscoveryClientReconnectMessage.java | 119 + .../messages/TcpDiscoveryDiscardMessage.java | 75 + .../TcpDiscoveryDuplicateIdMessage.java | 75 + .../messages/TcpDiscoveryEnsureDelivery.java | 23 + .../messages/TcpDiscoveryHandshakeRequest.java | 44 + .../messages/TcpDiscoveryHandshakeResponse.java | 82 + .../messages/TcpDiscoveryHeartbeatMessage.java | 308 ++ .../TcpDiscoveryJoinRequestMessage.java | 102 + .../TcpDiscoveryLoopbackProblemMessage.java | 87 + .../TcpDiscoveryNodeAddFinishedMessage.java | 75 + .../messages/TcpDiscoveryNodeAddedMessage.java | 246 + .../messages/TcpDiscoveryNodeFailedMessage.java | 93 + .../messages/TcpDiscoveryNodeLeftMessage.java | 47 + .../tcp/messages/TcpDiscoveryPingRequest.java | 65 + .../tcp/messages/TcpDiscoveryPingResponse.java | 66 + .../messages/TcpDiscoveryRedirectToClient.java | 23 + .../TcpDiscoveryStatusCheckMessage.java | 123 + .../spi/discovery/tcp/messages/package.html | 15 + .../ignite/spi/discovery/tcp/package.html | 15 + .../gridgain/grid/GridBasicWarmupClosure.java | 6 +- .../org/gridgain/grid/kernal/GridGainEx.java | 6 +- .../discovery/GridDiscoveryManager.java | 6 +- .../spi/discovery/DiscoveryMetricsHelper.java | 360 -- .../spi/discovery/DiscoveryMetricsProvider.java | 31 - .../discovery/DiscoveryNodeMetricsAdapter.java | 1060 ---- .../grid/spi/discovery/DiscoverySpi.java | 132 - .../spi/discovery/DiscoverySpiDataExchange.java | 36 - .../discovery/DiscoverySpiHistorySupport.java | 28 - .../spi/discovery/DiscoverySpiListener.java | 35 - .../DiscoverySpiNodeAuthenticator.java | 39 - .../spi/discovery/DiscoverySpiOrderSupport.java | 39 - .../gridgain/grid/spi/discovery/package.html | 15 - .../discovery/tcp/TcpClientDiscoverySpi.java | 1219 ----- .../tcp/TcpClientDiscoverySpiMBean.java | 156 - .../grid/spi/discovery/tcp/TcpDiscoverySpi.java | 5144 ------------------ .../discovery/tcp/TcpDiscoverySpiAdapter.java | 996 ---- .../spi/discovery/tcp/TcpDiscoverySpiMBean.java | 267 - .../tcp/internal/TcpDiscoveryNode.java | 443 -- .../tcp/internal/TcpDiscoveryNodesRing.java | 636 --- .../tcp/internal/TcpDiscoverySpiState.java | 45 - .../tcp/internal/TcpDiscoveryStatistics.java | 639 --- .../spi/discovery/tcp/internal/package.html | 15 - .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 90 - .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 77 - .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 361 -- .../discovery/tcp/ipfinder/jdbc/package.html | 15 - .../TcpDiscoveryMulticastIpFinder.java | 752 --- .../tcp/ipfinder/multicast/package.html | 15 - .../spi/discovery/tcp/ipfinder/package.html | 15 - .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 258 - .../tcp/ipfinder/sharedfs/package.html | 15 - .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java | 255 - .../spi/discovery/tcp/ipfinder/vm/package.html | 15 - .../messages/TcpDiscoveryAbstractMessage.java | 266 - .../messages/TcpDiscoveryAuthFailedMessage.java | 72 - .../TcpDiscoveryCheckFailedMessage.java | 71 - .../TcpDiscoveryClientReconnectMessage.java | 119 - .../messages/TcpDiscoveryDiscardMessage.java | 75 - .../TcpDiscoveryDuplicateIdMessage.java | 75 - .../messages/TcpDiscoveryEnsureDelivery.java | 23 - .../messages/TcpDiscoveryHandshakeRequest.java | 44 - .../messages/TcpDiscoveryHandshakeResponse.java | 82 - .../messages/TcpDiscoveryHeartbeatMessage.java | 308 -- .../TcpDiscoveryJoinRequestMessage.java | 102 - .../TcpDiscoveryLoopbackProblemMessage.java | 87 - .../TcpDiscoveryNodeAddFinishedMessage.java | 75 - .../messages/TcpDiscoveryNodeAddedMessage.java | 246 - .../messages/TcpDiscoveryNodeFailedMessage.java | 93 - .../messages/TcpDiscoveryNodeLeftMessage.java | 47 - .../tcp/messages/TcpDiscoveryPingRequest.java | 65 - .../tcp/messages/TcpDiscoveryPingResponse.java | 66 - .../messages/TcpDiscoveryRedirectToClient.java | 23 - .../TcpDiscoveryStatusCheckMessage.java | 123 - .../spi/discovery/tcp/messages/package.html | 15 - .../grid/spi/discovery/tcp/package.html | 15 - .../adaptive/GridAdaptiveLoadBalancingSpi.java | 2 +- .../java/org/gridgain/grid/util/GridUtils.java | 2 +- .../spring-cache-client-benchmark-1.xml | 4 +- .../spring-cache-client-benchmark-2.xml | 4 +- .../spring-cache-client-benchmark-3.xml | 4 +- .../core/src/test/config/discovery-stress.xml | 4 +- modules/core/src/test/config/example-cache.xml | 4 +- modules/core/src/test/config/ggfs-loopback.xml | 4 +- .../core/src/test/config/ggfs-no-endpoint.xml | 4 +- modules/core/src/test/config/ggfs-shmem.xml | 4 +- .../src/test/config/io-manager-benchmark.xml | 4 +- .../src/test/config/job-loadtest/client.xml | 4 +- .../src/test/config/job-loadtest/server.xml | 4 +- modules/core/src/test/config/jobs-load-base.xml | 4 +- .../src/test/config/load/cache-benchmark.xml | 4 +- .../test/config/load/cache-client-benchmark.xml | 4 +- .../core/src/test/config/load/dsi-load-base.xml | 4 +- .../src/test/config/load/merge-sort-base.xml | 4 +- .../test/config/load/mongo-multinode-foster.xml | 4 +- .../test/config/loaders/grid-cfg-2-grids.xml | 8 +- .../core/src/test/config/loaders/grid-cfg.xml | 8 +- .../core/src/test/config/spring-cache-load.xml | 4 +- .../config/spring-cache-put-remove-load.xml | 4 +- .../core/src/test/config/spring-cache-swap.xml | 4 +- .../src/test/config/spring-cache-teststore.xml | 4 +- .../core/src/test/config/spring-multicache.xml | 4 +- .../src/test/config/spring-start-nodes-attr.xml | 4 +- .../core/src/test/config/spring-start-nodes.xml | 4 +- .../config/streamer/spring-streamer-base.xml | 8 +- .../test/config/websession/spring-cache-1.xml | 4 +- .../test/config/websession/spring-cache-2.xml | 4 +- .../test/config/websession/spring-cache-3.xml | 4 +- .../optimized/GridOptimizedMarshallerTest.java | 4 +- .../GridTestTcpDiscoveryIpFinderAdapter.java | 2 +- ...idCacheCheckpointSpiSecondCacheSelfTest.java | 6 +- ...bStealingCollisionSpiAttributesSelfTest.java | 2 +- ...alingCollisionSpiCustomTopologySelfTest.java | 2 +- .../GridJobStealingCollisionSpiSelfTest.java | 2 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 6 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 6 +- ...ridAbstractDiscoveryRandomStartStopTest.java | 205 + .../GridAbstractDiscoverySelfTest.java | 488 ++ .../discovery/GridAbstractDiscoveryTest.java | 145 + .../GridDiscoveryMetricsHelperSelfTest.java | 141 + .../apache/ignite/spi/discovery/package.html | 15 + .../tcp/GridTcpClientDiscoverySelfTest.java | 683 +++ .../GridTcpDiscoveryConcurrentStartTest.java | 110 + ...GridTcpDiscoveryMarshallerCheckSelfTest.java | 94 + .../tcp/GridTcpDiscoveryMultiThreadedTest.java | 199 + .../discovery/tcp/GridTcpDiscoverySelfTest.java | 983 ++++ .../GridTcpDiscoverySnapshotHistoryTest.java | 166 + .../tcp/GridTcpDiscoverySpiConfigSelfTest.java | 37 + .../GridTcpDiscoverySpiRandomStartStopTest.java | 37 + .../tcp/GridTcpDiscoverySpiSelfTest.java | 35 + .../GridTcpDiscoverySpiStartStopSelfTest.java | 74 + .../GridTcpDiscoverySpiWildcardSelfTest.java | 55 + ...ridTcpDiscoveryIpFinderAbstractSelfTest.java | 117 + .../GridTcpDiscoveryJdbcIpFinderSelfTest.java | 82 + .../discovery/tcp/ipfinder/jdbc/package.html | 15 + ...idTcpDiscoveryMulticastIpFinderSelfTest.java | 107 + .../spi/discovery/tcp/ipfinder/package.html | 15 + ...ridTcpDiscoverySharedFsIpFinderSelfTest.java | 48 + .../tcp/ipfinder/sharedfs/package.html | 15 + .../vm/GridTcpDiscoveryVmIpFinderSelfTest.java | 185 + .../spi/discovery/tcp/ipfinder/vm/package.html | 15 + .../ignite/spi/discovery/tcp/package.html | 15 + .../GridCacheStoreValueBytesNode.java | 4 +- ...CachePartitionFairAffinityNodesSelfTest.java | 6 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 6 +- .../ggfs/GridGgfsEventsAbstractSelfTest.java | 4 +- .../GridGgfsFragmentizerAbstractSelfTest.java | 6 +- .../grid/kernal/GridAffinityMappedTest.java | 6 +- .../grid/kernal/GridAffinityP2PSelfTest.java | 6 +- .../grid/kernal/GridAffinitySelfTest.java | 6 +- .../kernal/GridCancelUnusedJobSelfTest.java | 4 +- .../GridCancelledJobsMetricsSelfTest.java | 4 +- .../grid/kernal/GridDiscoveryEventSelfTest.java | 6 +- .../grid/kernal/GridDiscoverySelfTest.java | 6 +- .../kernal/GridJobMasterLeaveAwareSelfTest.java | 6 +- .../grid/kernal/GridManagementJobSelfTest.java | 6 +- .../grid/kernal/GridMultipleJobsSelfTest.java | 6 +- .../kernal/GridProjectionForCachesSelfTest.java | 8 +- ...ectionLocalJobMultipleArgumentsSelfTest.java | 6 +- .../grid/kernal/GridReleaseTypeSelfTest.java | 6 +- .../grid/kernal/GridTaskMapAsyncSelfTest.java | 4 +- .../GridTopologyBuildVersionSelfTest.java | 6 +- .../managers/GridManagerStopSelfTest.java | 4 +- .../GridCheckpointManagerAbstractSelfTest.java | 6 +- .../checkpoint/GridCheckpointTaskSelfTest.java | 8 +- .../GridCommunicationSendMessageSelfTest.java | 6 +- .../GridDeploymentMessageCountSelfTest.java | 6 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +- .../GridDiscoveryManagerAttributesSelfTest.java | 6 +- .../discovery/GridDiscoveryManagerSelfTest.java | 6 +- .../GridAffinityProcessorAbstractSelfTest.java | 6 +- ...ridCacheAbstractByteArrayValuesSelfTest.java | 6 +- .../cache/GridCacheAbstractSelfTest.java | 6 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 6 +- .../GridCacheAtomicMessageCountSelfTest.java | 6 +- .../cache/GridCacheBasicApiAbstractTest.java | 4 +- .../cache/GridCacheBasicStoreAbstractTest.java | 6 +- ...acheBasicStoreMultithreadedAbstractTest.java | 4 +- .../GridCacheBasicStoreNoBatchAbstractTest.java | 4 +- .../cache/GridCacheClearAllSelfTest.java | 6 +- .../cache/GridCacheConcurrentMapSelfTest.java | 6 +- .../GridCacheConcurrentTxMultiNodeTest.java | 6 +- ...idCacheConfigurationConsistencySelfTest.java | 6 +- ...ridCacheConfigurationValidationSelfTest.java | 6 +- .../GridCacheDaemonNodeAbstractSelfTest.java | 6 +- .../cache/GridCacheDeploymentSelfTest.java | 6 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 6 +- .../cache/GridCacheEntryVersionSelfTest.java | 6 +- .../GridCacheEvictionEventAbstractTest.java | 6 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 6 +- ...idCacheGetAndTransformStoreAbstractTest.java | 6 +- .../cache/GridCacheGlobalClearAllSelfTest.java | 6 +- .../GridCacheGroupLockAbstractSelfTest.java | 6 +- .../GridCacheGroupLockFailoverSelfTest.java | 6 +- .../cache/GridCacheIncrementTransformTest.java | 6 +- .../cache/GridCacheIteratorPerformanceTest.java | 6 +- .../cache/GridCacheKeyCheckSelfTest.java | 6 +- .../processors/cache/GridCacheLeakTest.java | 6 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheLuceneQueryIndexTest.java | 6 +- .../GridCacheMarshallerTxAbstractTest.java | 6 +- .../cache/GridCacheMemoryModeSelfTest.java | 6 +- .../GridCacheMissingCommitVersionSelfTest.java | 4 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 6 +- .../cache/GridCacheMvccManagerSelfTest.java | 6 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 6 +- .../cache/GridCacheNestedTxAbstractTest.java | 6 +- .../cache/GridCacheObjectToStringSelfTest.java | 6 +- .../cache/GridCacheOffHeapSelfTest.java | 6 +- .../processors/cache/GridCacheOffHeapTest.java | 6 +- .../GridCacheOrderedPreloadingSelfTest.java | 6 +- .../cache/GridCacheP2PUndeploySelfTest.java | 6 +- .../cache/GridCachePartitionedGetSelfTest.java | 8 +- ...hePartitionedProjectionAffinitySelfTest.java | 6 +- .../cache/GridCachePartitionedWritesTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 6 +- .../cache/GridCachePutAllFailoverSelfTest.java | 6 +- .../GridCacheReferenceCleanupSelfTest.java | 6 +- .../GridCacheRefreshAheadAbstractSelfTest.java | 6 +- .../cache/GridCacheReloadSelfTest.java | 4 +- ...ridCacheReplicatedSynchronousCommitTest.java | 6 +- .../cache/GridCacheSlowTxWarnTest.java | 6 +- .../processors/cache/GridCacheStopSelfTest.java | 4 +- .../cache/GridCacheStorePutxSelfTest.java | 6 +- .../cache/GridCacheStoreValueBytesSelfTest.java | 6 +- .../cache/GridCacheSwapPreloadSelfTest.java | 6 +- .../cache/GridCacheSwapReloadSelfTest.java | 6 +- .../cache/GridCacheTtlManagerSelfTest.java | 6 +- .../cache/GridCacheTxAbstractTest.java | 6 +- .../GridCacheTxConcurrentGetAbstractTest.java | 6 +- .../cache/GridCacheTxMultiNodeAbstractTest.java | 6 +- .../GridCacheTxReentryAbstractSelfTest.java | 6 +- .../GridCacheVariableTopologySelfTest.java | 6 +- .../GridCacheWriteBehindStoreAbstractTest.java | 4 +- ...BehindStorePartitionedMultiNodeSelfTest.java | 6 +- .../GridCacheAtomicLongApiSelfTest.java | 6 +- ...CacheAtomicReferenceApiSelfAbstractTest.java | 6 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 6 +- ...idCacheAtomicStampedApiSelfAbstractTest.java | 6 +- .../GridCacheCountDownLatchSelfTest.java | 6 +- .../GridCacheQueueApiSelfAbstractTest.java | 6 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 6 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 6 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 6 +- ...CacheQueueRotativeMultiNodeAbstractTest.java | 6 +- .../GridCacheSequenceApiSelfAbstractTest.java | 6 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 6 +- ...titionedAtomicSequenceMultiThreadedTest.java | 6 +- ...GridCachePartitionedNodeRestartSelfTest.java | 6 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 6 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 6 +- .../GridCacheAbstractJobExecutionTest.java | 6 +- .../GridCacheAbstractNodeRestartSelfTest.java | 6 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 6 +- .../GridCacheBasicOpAbstractTest.java | 6 +- .../distributed/GridCacheLockAbstractTest.java | 6 +- .../GridCacheMultiNodeAbstractTest.java | 6 +- .../GridCacheMultiNodeLockAbstractTest.java | 6 +- ...dCacheMultithreadedFailoverAbstractTest.java | 6 +- .../GridCacheNodeFailureAbstractTest.java | 6 +- ...dCachePartitionedAffinityFilterSelfTest.java | 6 +- ...chePartitionedReloadAllAbstractSelfTest.java | 6 +- .../GridCachePreloadEventsAbstractSelfTest.java | 6 +- .../GridCachePreloadLifecycleAbstractTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 6 +- .../GridCacheTransformEventSelfTest.java | 6 +- ...cheTxConsistencyRestartAbstractSelfTest.java | 6 +- ...heAbstractTransformWriteThroughSelfTest.java | 6 +- .../dht/GridCacheColocatedDebugTest.java | 6 +- ...eColocatedOptimisticTransactionSelfTest.java | 6 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 6 +- .../dht/GridCacheDhtEntrySelfTest.java | 6 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 6 +- .../dht/GridCacheDhtEvictionSelfTest.java | 6 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 6 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 6 +- .../dht/GridCacheDhtMappingSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 6 +- .../GridCacheDhtPreloadDisabledSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java | 6 +- ...ridCacheDhtPreloadMultiThreadedSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadSelfTest.java | 6 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 6 +- ...dCachePartitionedTopologyChangeSelfTest.java | 6 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 8 +- .../near/GridCacheGetStoreErrorSelfTest.java | 6 +- .../near/GridCacheNearEvictionSelfTest.java | 6 +- .../near/GridCacheNearMultiGetSelfTest.java | 6 +- .../near/GridCacheNearMultiNodeSelfTest.java | 6 +- .../near/GridCacheNearOneNodeSelfTest.java | 4 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 6 +- .../GridCacheNearReaderPreloadSelfTest.java | 6 +- .../near/GridCacheNearReadersSelfTest.java | 6 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 6 +- ...AffinityExcludeNeighborsPerformanceTest.java | 6 +- ...rtitionedAffinityHashIdResolverSelfTest.java | 6 +- .../GridCachePartitionedAffinitySelfTest.java | 6 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 6 +- .../GridCachePartitionedEvictionSelfTest.java | 6 +- ...titionedExplicitLockNodeFailureSelfTest.java | 6 +- ...GridCachePartitionedFilteredPutSelfTest.java | 8 +- .../GridCachePartitionedLoadCacheSelfTest.java | 6 +- ...achePartitionedMultiNodeCounterSelfTest.java | 6 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 6 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 6 +- .../GridCachePartitionedStorePutSelfTest.java | 8 +- ...CachePartitionedTxMultiThreadedSelfTest.java | 6 +- .../GridCachePartitionedTxSalvageSelfTest.java | 6 +- ...achePartitionedTxSingleThreadedSelfTest.java | 6 +- .../GridCachePartitionedTxTimeoutSelfTest.java | 6 +- .../near/GridPartitionedBackupLoadSelfTest.java | 8 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...dCacheReplicatedTxMultiThreadedSelfTest.java | 6 +- ...CacheReplicatedTxSingleThreadedSelfTest.java | 6 +- .../GridCacheReplicatedTxTimeoutSelfTest.java | 6 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 6 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 6 +- .../GridCacheReplicatedPreloadSelfTest.java | 6 +- ...eplicatedPreloadStartStopEventsSelfTest.java | 6 +- ...heConcurrentEvictionConsistencySelfTest.java | 6 +- .../GridCacheConcurrentEvictionsSelfTest.java | 6 +- .../GridCacheDistributedEvictionsSelfTest.java | 6 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 6 +- .../eviction/GridCacheEvictionAbstractTest.java | 6 +- .../GridCacheEvictionFilterSelfTest.java | 6 +- .../GridCacheEvictionLockUnlockSelfTest.java | 6 +- .../GridCacheEvictionTouchSelfTest.java | 6 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 6 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 6 +- .../local/GridCacheLocalLoadAllSelfTest.java | 4 +- .../cache/local/GridCacheLocalLockSelfTest.java | 4 +- .../GridCacheLocalMultithreadedSelfTest.java | 4 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 4 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 6 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 6 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 8 +- .../clock/GridTimeSyncProcessorSelfTest.java | 6 +- .../closure/GridClosureProcessorRemoteTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 6 +- .../dataload/GridDataLoaderImplSelfTest.java | 6 +- .../dataload/GridDataLoaderPerformanceTest.java | 6 +- .../GridDataLoaderProcessorSelfTest.java | 6 +- ...heGgfsPerBlockLruEvictionPolicySelfTest.java | 4 +- .../ggfs/GridGgfsAbstractSelfTest.java | 4 +- .../processors/ggfs/GridGgfsCacheSelfTest.java | 4 +- .../ggfs/GridGgfsDataManagerSelfTest.java | 6 +- .../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +- .../ggfs/GridGgfsMetricsSelfTest.java | 6 +- .../processors/ggfs/GridGgfsModesSelfTest.java | 4 +- .../ggfs/GridGgfsProcessorSelfTest.java | 6 +- .../GridGgfsProcessorValidationSelfTest.java | 6 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 6 +- .../processors/ggfs/GridGgfsSizeSelfTest.java | 6 +- .../ggfs/GridGgfsStreamsSelfTest.java | 6 +- .../processors/ggfs/GridGgfsTaskSelfTest.java | 6 +- .../GridGgfsAbstractRecordResolverSelfTest.java | 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 4 +- .../GridServiceProcessorAbstractSelfTest.java | 6 +- .../streamer/GridStreamerEvictionSelfTest.java | 6 +- .../streamer/GridStreamerFailoverSelfTest.java | 6 +- .../streamer/GridStreamerSelfTest.java | 6 +- .../gridgain/grid/lang/GridFuncSelfTest.java | 4 +- .../grid/messaging/GridMessagingSelfTest.java | 6 +- .../GridP2PContinuousDeploymentSelfTest.java | 6 +- .../p2p/GridP2PDoubleDeploymentSelfTest.java | 6 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 6 +- .../p2p/GridP2PSameClassLoaderSelfTest.java | 2 +- ...SessionCancelSiblingsFromFutureSelfTest.java | 4 +- ...ridSessionCancelSiblingsFromJobSelfTest.java | 4 +- ...idSessionCancelSiblingsFromTaskSelfTest.java | 4 +- ...GridSessionJobWaitTaskAttributeSelfTest.java | 4 +- .../GridSessionSetFutureAttributeSelfTest.java | 4 +- ...nSetFutureAttributeWaitListenerSelfTest.java | 4 +- .../GridSessionSetJobAttributeSelfTest.java | 4 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 4 +- .../GridSessionWaitAttributeSelfTest.java | 4 +- .../grid/spi/GridSpiLocalHostInjectionTest.java | 4 +- .../grid/spi/GridTcpSpiForwardingSelfTest.java | 8 +- ...ridAbstractDiscoveryRandomStartStopTest.java | 205 - .../GridAbstractDiscoverySelfTest.java | 488 -- .../discovery/GridAbstractDiscoveryTest.java | 145 - .../GridDiscoveryMetricsHelperSelfTest.java | 141 - .../gridgain/grid/spi/discovery/package.html | 15 - .../tcp/GridTcpClientDiscoverySelfTest.java | 683 --- .../GridTcpDiscoveryConcurrentStartTest.java | 110 - ...GridTcpDiscoveryMarshallerCheckSelfTest.java | 94 - .../tcp/GridTcpDiscoveryMultiThreadedTest.java | 199 - .../discovery/tcp/GridTcpDiscoverySelfTest.java | 983 ---- .../GridTcpDiscoverySnapshotHistoryTest.java | 166 - .../tcp/GridTcpDiscoverySpiConfigSelfTest.java | 37 - .../GridTcpDiscoverySpiRandomStartStopTest.java | 37 - .../tcp/GridTcpDiscoverySpiSelfTest.java | 35 - .../GridTcpDiscoverySpiStartStopSelfTest.java | 74 - .../GridTcpDiscoverySpiWildcardSelfTest.java | 55 - ...ridTcpDiscoveryIpFinderAbstractSelfTest.java | 117 - .../GridTcpDiscoveryJdbcIpFinderSelfTest.java | 82 - .../discovery/tcp/ipfinder/jdbc/package.html | 15 - ...idTcpDiscoveryMulticastIpFinderSelfTest.java | 107 - .../spi/discovery/tcp/ipfinder/package.html | 15 - ...ridTcpDiscoverySharedFsIpFinderSelfTest.java | 48 - .../tcp/ipfinder/sharedfs/package.html | 15 - .../vm/GridTcpDiscoveryVmIpFinderSelfTest.java | 185 - .../spi/discovery/tcp/ipfinder/vm/package.html | 15 - .../grid/spi/discovery/tcp/package.html | 15 - .../noop/GridNoopSwapSpaceSpiSelfTest.java | 4 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 6 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 6 +- .../grid/util/GridTopologyHeapSizeSelfTest.java | 8 +- .../shmem/GridIpcSharedMemoryNodeStartup.java | 4 +- .../loadtests/GridCacheMultiNodeLoadTest.java | 6 +- ...ridCacheAffinityTransactionsOffHeapTest.java | 6 +- .../cache/GridCacheSingleNodeLoadTest.java | 4 +- .../GridCacheWriteBehindStoreLoadTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 4 +- .../loadtests/colocation/spring-colocation.xml | 4 +- .../communication/GridIoManagerBenchmark0.java | 6 +- .../GridCachePartitionedAtomicLongLoadTest.java | 6 +- .../multisplit/GridMultiSplitsLoadTest.java | 4 +- ...ridSingleSplitsNewNodesAbstractLoadTest.java | 2 +- ...idSingleSplitsNewNodesMulticastLoadTest.java | 4 +- .../GridSingleSplitsRedeployLoadTest.java | 4 +- .../direct/stealing/GridStealingLoadTest.java | 4 +- .../swap/GridSwapEvictAllBenchmark.java | 6 +- .../testframework/GridSpiTestContext.java | 2 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../junits/spi/GridSpiAbstractConfigTest.java | 2 +- .../junits/spi/GridSpiAbstractTest.java | 10 +- .../testframework/junits/spi/GridSpiTest.java | 6 +- .../GridSpiDiscoverySelfTestSuite.java | 10 +- .../testsuites/GridUtilSelfTestSuite.java | 2 +- .../core/src/test/webapp/META-INF/gg-config.xml | 4 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 6 +- .../GridGgfsHadoopDualAbstractSelfTest.java | 4 +- ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 6 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 4 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 6 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 6 +- ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 4 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 4 +- .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java | 6 +- ...idHibernateL2CacheConfigurationSelfTest.java | 4 +- .../hibernate/GridHibernateL2CacheSelfTest.java | 6 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 8 +- .../cache/GridCacheAbstractQuerySelfTest.java | 6 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 6 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 6 +- .../cache/GridCacheQueryLoadSelfTest.java | 6 +- .../cache/GridCacheQueryMetricsSelfTest.java | 6 +- .../GridCacheQueryMultiThreadedSelfTest.java | 6 +- .../GridCacheQueryUserResourceSelfTest.java | 8 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 6 +- .../processors/cache/GridCacheSwapSelfTest.java | 6 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 6 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 6 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 6 +- .../h2indexing/GridH2IndexingSpiLoadTest.java | 4 +- .../GridTmLookupLifecycleAwareSelfTest.java | 2 +- .../scalar/src/test/resources/spring-cache.xml | 4 +- .../test/resources/spring-ping-pong-partner.xml | 4 +- .../spring/GridSpringCacheManagerSelfTest.java | 6 +- .../grid/kernal/GridFactorySelfTest.java | 2 +- .../GridSpringBeanSerializationSelfTest.java | 6 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 6 +- .../grid/p2p/GridP2PDisabledSelfTest.java | 2 +- .../commands/alert/VisorAlertCommandSpec.scala | 6 +- .../cache/VisorCacheClearCommandSpec.scala | 4 +- .../cache/VisorCacheCompactCommandSpec.scala | 4 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- pom.xml | 4 +- 563 files changed, 20859 insertions(+), 20860 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-cache.xml b/examples/config/example-cache.xml index ebc9920..6e95de4 100644 --- a/examples/config/example-cache.xml +++ b/examples/config/example-cache.xml @@ -171,7 +171,7 @@ <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> <property name="discoverySpi"> - <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> <!-- GridGain provides several options for automatic discovery that can be used @@ -180,7 +180,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/config/example-compute.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-compute.xml b/examples/config/example-compute.xml index f87567d..141faac 100644 --- a/examples/config/example-compute.xml +++ b/examples/config/example-compute.xml @@ -43,7 +43,7 @@ <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> <property name="discoverySpi"> - <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> <!-- GridGain provides several options for automatic discovery that can be used @@ -52,7 +52,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/config/example-streamer.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-streamer.xml b/examples/config/example-streamer.xml index 429edbd..74efd38 100644 --- a/examples/config/example-streamer.xml +++ b/examples/config/example-streamer.xml @@ -266,7 +266,7 @@ <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> <property name="discoverySpi"> - <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> <!-- GridGain provides several options for automatic discovery that can be used @@ -275,7 +275,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/config/filesystem/example-ggfs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-ggfs.xml b/examples/config/filesystem/example-ggfs.xml index a4f19f6..bfa228e 100644 --- a/examples/config/filesystem/example-ggfs.xml +++ b/examples/config/filesystem/example-ggfs.xml @@ -138,7 +138,7 @@ <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> <property name="discoverySpi"> - <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> <!-- GridGain provides several options for automatic discovery that can be used @@ -147,7 +147,7 @@ --> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java index 7950ec2..eb25eca 100644 --- a/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/compute/failover/ComputeFailoverNodeStartup.java @@ -13,8 +13,8 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.*; import org.apache.ignite.spi.checkpoint.sharedfs.*; -import org.gridgain.grid.spi.discovery.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java index 76d7b15..e7d5a97 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/hibernate/HibernateL2CacheExampleNodeStartup.java @@ -13,8 +13,8 @@ import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.spi.discovery.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java index 9035376..0737c05 100644 --- a/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java +++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/CacheNodeWithStoreStartup.java @@ -14,9 +14,9 @@ import org.apache.ignite.configuration.*; import org.gridgain.examples.datagrid.store.dummy.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.spi.discovery.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java index 4de9148..dc5d4a2 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java +++ b/examples/src/main/java/org/gridgain/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java @@ -14,8 +14,8 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.marshaller.optimized.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.spi.discovery.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.spi.indexing.h2.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml index 1d463fd..497b0df 100644 --- a/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml +++ b/examples/src/main/java/org/gridgain/examples/misc/springbean/spring-bean.xml @@ -46,11 +46,11 @@ <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> <property name="discoverySpi"> - <bean class="org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi"> + <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> <!-- Uncomment multicast IP finder to enable multicast-based discovery of initial nodes. --> <!--<bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.multicast.GridTcpDiscoveryMulticastIpFinder">--> - <bean class="org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala index e4b603e..f10bb2a 100644 --- a/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala +++ b/examples/src/main/scala/org/gridgain/scalar/examples/ScalarJvmCloudExample.scala @@ -4,8 +4,8 @@ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit._ import javax.swing.{JComponent, JLabel, JOptionPane} import org.apache.ignite.configuration.IgniteConfiguration -import org.gridgain.grid.spi.discovery.tcp.TcpDiscoverySpi -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder import org.gridgain.grid.util.scala.impl import org.gridgain.scalar.scalar http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java index f2922de..7b9489a 100644 --- a/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java +++ b/modules/aop/src/test/java/org/gridgain/grid/gridify/GridAbstractAopTest.java @@ -15,7 +15,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.deployment.local.*; -import org.gridgain.grid.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java index 61975dc..76355f3 100644 --- a/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java +++ b/modules/aop/src/test/java/org/gridgain/loadtests/direct/singlesplit/GridSingleSplitsLoadTest.java @@ -17,7 +17,7 @@ import org.apache.log4j.*; import org.gridgain.grid.*; import org.gridgain.grid.loadtest.*; import org.apache.ignite.spi.communication.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.config.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java index 9e9f908..42a4c99 100644 --- a/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java +++ b/modules/aop/src/test/java/org/gridgain/loadtests/gridify/GridifySingleSplitLoadTest.java @@ -16,8 +16,8 @@ import org.apache.log4j.*; import org.gridgain.grid.loadtest.*; import org.apache.ignite.spi.communication.*; import org.apache.ignite.spi.communication.tcp.*; -import org.gridgain.grid.spi.discovery.*; -import org.gridgain.grid.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.*; +import org.apache.ignite.spi.discovery.tcp.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.*; import org.gridgain.testframework.config.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aop/src/test/java/org/test/gridify/GridExternalNonSpringAopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/test/gridify/GridExternalNonSpringAopSelfTest.java b/modules/aop/src/test/java/org/test/gridify/GridExternalNonSpringAopSelfTest.java index 0a078bd..101cacc 100644 --- a/modules/aop/src/test/java/org/test/gridify/GridExternalNonSpringAopSelfTest.java +++ b/modules/aop/src/test/java/org/test/gridify/GridExternalNonSpringAopSelfTest.java @@ -12,7 +12,7 @@ package org.test.gridify; import org.apache.ignite.configuration.*; import org.gridgain.grid.gridify.*; import org.apache.ignite.spi.deployment.local.*; -import org.gridgain.grid.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java new file mode 100644 index 0000000..0eb38f1 --- /dev/null +++ b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java @@ -0,0 +1,312 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; + +import com.amazonaws.*; +import com.amazonaws.auth.*; +import com.amazonaws.services.s3.*; +import com.amazonaws.services.s3.model.*; +import org.apache.ignite.*; +import org.apache.ignite.resources.*; +import org.apache.ignite.spi.*; +import org.gridgain.grid.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.gridgain.grid.util.typedef.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.grid.util.tostring.*; + +import java.io.*; +import java.net.*; +import java.util.*; +import java.util.concurrent.*; +import java.util.concurrent.atomic.*; + +/** + * AWS S3-based IP finder. + * <p> + * For information about Amazon S3 visit <a href="http://aws.amazon.com";>aws.amazon.com</a>. + * <h1 class="header">Configuration</h1> + * <h2 class="header">Mandatory</h2> + * <ul> + * <li>AWS credentials (see {@link #setAwsCredentials(AWSCredentials)})</li> + * <li>Bucket name (see {@link #setBucketName(String)})</li> + * </ul> + * <h2 class="header">Optional</h2> + * <ul> + * <li>Client configuration (see {@link #setClientConfiguration(ClientConfiguration)})</li> + * <li>Shared flag (see {@link #setShared(boolean)})</li> + * </ul> + * <p> + * The finder will create S3 bucket with configured name. The bucket will contain entries named + * like the following: {@code 192.168.1.136#1001}. + * <p> + * Note that storing data in AWS S3 service will result in charges to your AWS account. + * Choose another implementation of {@link org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} for local + * or home network tests. + * <p> + * Note that this finder is shared by default (see {@link org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder#isShared()}. + */ +public class GridTcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter { + /** Delimiter to use in S3 entries name. */ + public static final String DELIM = "#"; + + /** Entry content. */ + private static final byte[] ENTRY_CONTENT = new byte[] {1}; + + /** Entry metadata with content length set. */ + private static final ObjectMetadata ENTRY_METADATA; + + static { + ENTRY_METADATA = new ObjectMetadata(); + + ENTRY_METADATA.setContentLength(ENTRY_CONTENT.length); + } + + /** Grid logger. */ + @IgniteLoggerResource + private IgniteLogger log; + + /** Client to interact with S3 storage. */ + @GridToStringExclude + private AmazonS3 s3; + + /** Bucket name. */ + private String bucketName; + + /** Init guard. */ + @GridToStringExclude + private final AtomicBoolean initGuard = new AtomicBoolean(); + + /** Init latch. */ + @GridToStringExclude + private final CountDownLatch initLatch = new CountDownLatch(1); + + /** Amazon client configuration. */ + private ClientConfiguration cfg; + + /** AWS Credentials. */ + @GridToStringExclude + private AWSCredentials cred; + + /** + * Constructor. + */ + public GridTcpDiscoveryS3IpFinder() { + setShared(true); + } + + /** {@inheritDoc} */ + @Override public Collection<InetSocketAddress> getRegisteredAddresses() throws IgniteSpiException { + initClient(); + + Collection<InetSocketAddress> addrs = new LinkedList<>(); + + try { + ObjectListing list = s3.listObjects(bucketName); + + while (true) { + for (S3ObjectSummary sum : list.getObjectSummaries()) { + String key = sum.getKey(); + + StringTokenizer st = new StringTokenizer(key, DELIM); + + if (st.countTokens() != 2) + U.error(log, "Failed to parse S3 entry due to invalid format: " + key); + else { + String addrStr = st.nextToken(); + String portStr = st.nextToken(); + + int port = -1; + + try { + port = Integer.parseInt(portStr); + } + catch (NumberFormatException e) { + U.error(log, "Failed to parse port for S3 entry: " + key, e); + } + + if (port != -1) + try { + addrs.add(new InetSocketAddress(addrStr, port)); + } + catch (IllegalArgumentException e) { + U.error(log, "Failed to parse port for S3 entry: " + key, e); + } + } + } + + if (list.isTruncated()) + list = s3.listNextBatchOfObjects(list); + else + break; + } + } + catch (AmazonClientException e) { + throw new IgniteSpiException("Failed to list objects in the bucket: " + bucketName, e); + } + + return addrs; + } + + /** {@inheritDoc} */ + @Override public void registerAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException { + assert !F.isEmpty(addrs); + + initClient(); + + for (InetSocketAddress addr : addrs) { + String key = key(addr); + + try { + s3.putObject(bucketName, key, new ByteArrayInputStream(ENTRY_CONTENT), ENTRY_METADATA); + } + catch (AmazonClientException e) { + throw new IgniteSpiException("Failed to put entry [bucketName=" + bucketName + + ", entry=" + key + ']', e); + } + } + } + + /** {@inheritDoc} */ + @Override public void unregisterAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException { + assert !F.isEmpty(addrs); + + initClient(); + + for (InetSocketAddress addr : addrs) { + String key = key(addr); + + try { + s3.deleteObject(bucketName, key); + } + catch (AmazonClientException e) { + throw new IgniteSpiException("Failed to delete entry [bucketName=" + bucketName + + ", entry=" + key + ']', e); + } + } + } + + /** + * Gets S3 key for provided address. + * + * @param addr Node address. + * @return Key. + */ + private String key(InetSocketAddress addr) { + assert addr != null; + + SB sb = new SB(); + + sb.a(addr.getAddress().getHostAddress()) + .a(DELIM) + .a(addr.getPort()); + + return sb.toString(); + } + + /** + * Amazon s3 client initialization. + * + * @throws org.apache.ignite.spi.IgniteSpiException In case of error. + */ + @SuppressWarnings({"BusyWait"}) + private void initClient() throws IgniteSpiException { + if (initGuard.compareAndSet(false, true)) + try { + if (cred == null) + throw new IgniteSpiException("AWS credentials are not set."); + + if (cfg == null) + U.warn(log, "Amazon client configuration is not set (will use default)."); + + if (F.isEmpty(bucketName)) + throw new IgniteSpiException("Bucket name is null or empty (provide bucket name and restart)."); + + s3 = cfg != null ? new AmazonS3Client(cred, cfg) : new AmazonS3Client(cred); + + if (!s3.doesBucketExist(bucketName)) { + try { + s3.createBucket(bucketName); + + if (log.isDebugEnabled()) + log.debug("Created S3 bucket: " + bucketName); + + while (!s3.doesBucketExist(bucketName)) + try { + U.sleep(200); + } + catch (GridInterruptedException e) { + throw new IgniteSpiException("Thread has been interrupted.", e); + } + } + catch (AmazonClientException e) { + if (!s3.doesBucketExist(bucketName)) { + s3 = null; + + throw new IgniteSpiException("Failed to create bucket: " + bucketName, e); + } + } + } + } + finally { + initLatch.countDown(); + } + else { + try { + U.await(initLatch); + } + catch (GridInterruptedException e) { + throw new IgniteSpiException("Thread has been interrupted.", e); + } + + if (s3 == null) + throw new IgniteSpiException("Ip finder has not been initialized properly."); + } + } + + /** + * Sets bucket name for IP finder. + * + * @param bucketName Bucket name. + */ + @IgniteSpiConfiguration(optional = false) + public void setBucketName(String bucketName) { + this.bucketName = bucketName; + } + + /** + * Sets Amazon client configuration. + * <p> + * For details refer to Amazon S3 API reference. + * + * @param cfg Amazon client configuration. + */ + @IgniteSpiConfiguration(optional = true) + public void setClientConfiguration(ClientConfiguration cfg) { + this.cfg = cfg; + } + + /** + * Sets AWS credentials. + * <p> + * For details refer to Amazon S3 API reference. + * + * @param cred AWS credentials. + */ + @IgniteSpiConfiguration(optional = false) + public void setAwsCredentials(AWSCredentials cred) { + this.cred = cred; + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(GridTcpDiscoveryS3IpFinder.class, this, "super", super.toString()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html new file mode 100644 index 0000000..e1b4f6d --- /dev/null +++ b/modules/aws/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<!-- + @html.file.header + _________ _____ __________________ _____ + __ ____/___________(_)______ /__ ____/______ ____(_)_______ + _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +--> +<html> +<body> + <!-- Package description. --> + Contains AWS S3-based IP finder. +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java deleted file mode 100644 index 69f9aa6..0000000 --- a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinder.java +++ /dev/null @@ -1,312 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.discovery.tcp.ipfinder.s3; - -import com.amazonaws.*; -import com.amazonaws.auth.*; -import com.amazonaws.services.s3.*; -import com.amazonaws.services.s3.model.*; -import org.apache.ignite.*; -import org.apache.ignite.resources.*; -import org.apache.ignite.spi.*; -import org.gridgain.grid.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; -import org.gridgain.grid.util.typedef.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.grid.util.tostring.*; - -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.concurrent.*; -import java.util.concurrent.atomic.*; - -/** - * AWS S3-based IP finder. - * <p> - * For information about Amazon S3 visit <a href="http://aws.amazon.com";>aws.amazon.com</a>. - * <h1 class="header">Configuration</h1> - * <h2 class="header">Mandatory</h2> - * <ul> - * <li>AWS credentials (see {@link #setAwsCredentials(AWSCredentials)})</li> - * <li>Bucket name (see {@link #setBucketName(String)})</li> - * </ul> - * <h2 class="header">Optional</h2> - * <ul> - * <li>Client configuration (see {@link #setClientConfiguration(ClientConfiguration)})</li> - * <li>Shared flag (see {@link #setShared(boolean)})</li> - * </ul> - * <p> - * The finder will create S3 bucket with configured name. The bucket will contain entries named - * like the following: {@code 192.168.1.136#1001}. - * <p> - * Note that storing data in AWS S3 service will result in charges to your AWS account. - * Choose another implementation of {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder} for local - * or home network tests. - * <p> - * Note that this finder is shared by default (see {@link org.gridgain.grid.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder#isShared()}. - */ -public class GridTcpDiscoveryS3IpFinder extends TcpDiscoveryIpFinderAdapter { - /** Delimiter to use in S3 entries name. */ - public static final String DELIM = "#"; - - /** Entry content. */ - private static final byte[] ENTRY_CONTENT = new byte[] {1}; - - /** Entry metadata with content length set. */ - private static final ObjectMetadata ENTRY_METADATA; - - static { - ENTRY_METADATA = new ObjectMetadata(); - - ENTRY_METADATA.setContentLength(ENTRY_CONTENT.length); - } - - /** Grid logger. */ - @IgniteLoggerResource - private IgniteLogger log; - - /** Client to interact with S3 storage. */ - @GridToStringExclude - private AmazonS3 s3; - - /** Bucket name. */ - private String bucketName; - - /** Init guard. */ - @GridToStringExclude - private final AtomicBoolean initGuard = new AtomicBoolean(); - - /** Init latch. */ - @GridToStringExclude - private final CountDownLatch initLatch = new CountDownLatch(1); - - /** Amazon client configuration. */ - private ClientConfiguration cfg; - - /** AWS Credentials. */ - @GridToStringExclude - private AWSCredentials cred; - - /** - * Constructor. - */ - public GridTcpDiscoveryS3IpFinder() { - setShared(true); - } - - /** {@inheritDoc} */ - @Override public Collection<InetSocketAddress> getRegisteredAddresses() throws IgniteSpiException { - initClient(); - - Collection<InetSocketAddress> addrs = new LinkedList<>(); - - try { - ObjectListing list = s3.listObjects(bucketName); - - while (true) { - for (S3ObjectSummary sum : list.getObjectSummaries()) { - String key = sum.getKey(); - - StringTokenizer st = new StringTokenizer(key, DELIM); - - if (st.countTokens() != 2) - U.error(log, "Failed to parse S3 entry due to invalid format: " + key); - else { - String addrStr = st.nextToken(); - String portStr = st.nextToken(); - - int port = -1; - - try { - port = Integer.parseInt(portStr); - } - catch (NumberFormatException e) { - U.error(log, "Failed to parse port for S3 entry: " + key, e); - } - - if (port != -1) - try { - addrs.add(new InetSocketAddress(addrStr, port)); - } - catch (IllegalArgumentException e) { - U.error(log, "Failed to parse port for S3 entry: " + key, e); - } - } - } - - if (list.isTruncated()) - list = s3.listNextBatchOfObjects(list); - else - break; - } - } - catch (AmazonClientException e) { - throw new IgniteSpiException("Failed to list objects in the bucket: " + bucketName, e); - } - - return addrs; - } - - /** {@inheritDoc} */ - @Override public void registerAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException { - assert !F.isEmpty(addrs); - - initClient(); - - for (InetSocketAddress addr : addrs) { - String key = key(addr); - - try { - s3.putObject(bucketName, key, new ByteArrayInputStream(ENTRY_CONTENT), ENTRY_METADATA); - } - catch (AmazonClientException e) { - throw new IgniteSpiException("Failed to put entry [bucketName=" + bucketName + - ", entry=" + key + ']', e); - } - } - } - - /** {@inheritDoc} */ - @Override public void unregisterAddresses(Collection<InetSocketAddress> addrs) throws IgniteSpiException { - assert !F.isEmpty(addrs); - - initClient(); - - for (InetSocketAddress addr : addrs) { - String key = key(addr); - - try { - s3.deleteObject(bucketName, key); - } - catch (AmazonClientException e) { - throw new IgniteSpiException("Failed to delete entry [bucketName=" + bucketName + - ", entry=" + key + ']', e); - } - } - } - - /** - * Gets S3 key for provided address. - * - * @param addr Node address. - * @return Key. - */ - private String key(InetSocketAddress addr) { - assert addr != null; - - SB sb = new SB(); - - sb.a(addr.getAddress().getHostAddress()) - .a(DELIM) - .a(addr.getPort()); - - return sb.toString(); - } - - /** - * Amazon s3 client initialization. - * - * @throws org.apache.ignite.spi.IgniteSpiException In case of error. - */ - @SuppressWarnings({"BusyWait"}) - private void initClient() throws IgniteSpiException { - if (initGuard.compareAndSet(false, true)) - try { - if (cred == null) - throw new IgniteSpiException("AWS credentials are not set."); - - if (cfg == null) - U.warn(log, "Amazon client configuration is not set (will use default)."); - - if (F.isEmpty(bucketName)) - throw new IgniteSpiException("Bucket name is null or empty (provide bucket name and restart)."); - - s3 = cfg != null ? new AmazonS3Client(cred, cfg) : new AmazonS3Client(cred); - - if (!s3.doesBucketExist(bucketName)) { - try { - s3.createBucket(bucketName); - - if (log.isDebugEnabled()) - log.debug("Created S3 bucket: " + bucketName); - - while (!s3.doesBucketExist(bucketName)) - try { - U.sleep(200); - } - catch (GridInterruptedException e) { - throw new IgniteSpiException("Thread has been interrupted.", e); - } - } - catch (AmazonClientException e) { - if (!s3.doesBucketExist(bucketName)) { - s3 = null; - - throw new IgniteSpiException("Failed to create bucket: " + bucketName, e); - } - } - } - } - finally { - initLatch.countDown(); - } - else { - try { - U.await(initLatch); - } - catch (GridInterruptedException e) { - throw new IgniteSpiException("Thread has been interrupted.", e); - } - - if (s3 == null) - throw new IgniteSpiException("Ip finder has not been initialized properly."); - } - } - - /** - * Sets bucket name for IP finder. - * - * @param bucketName Bucket name. - */ - @IgniteSpiConfiguration(optional = false) - public void setBucketName(String bucketName) { - this.bucketName = bucketName; - } - - /** - * Sets Amazon client configuration. - * <p> - * For details refer to Amazon S3 API reference. - * - * @param cfg Amazon client configuration. - */ - @IgniteSpiConfiguration(optional = true) - public void setClientConfiguration(ClientConfiguration cfg) { - this.cfg = cfg; - } - - /** - * Sets AWS credentials. - * <p> - * For details refer to Amazon S3 API reference. - * - * @param cred AWS credentials. - */ - @IgniteSpiConfiguration(optional = false) - public void setAwsCredentials(AWSCredentials cred) { - this.cred = cred; - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(GridTcpDiscoveryS3IpFinder.class, this, "super", super.toString()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html ---------------------------------------------------------------------- diff --git a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html b/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html deleted file mode 100644 index e1b4f6d..0000000 --- a/modules/aws/src/main/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains AWS S3-based IP finder. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java new file mode 100644 index 0000000..6cfc7b0 --- /dev/null +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java @@ -0,0 +1,64 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.apache.ignite.spi.discovery.tcp.ipfinder.s3; + +import com.amazonaws.auth.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.gridgain.testsuites.bamboo.*; + +import java.net.*; +import java.util.*; + +/** + * GridTcpDiscoveryS3IpFinder test. + */ +public class GridTcpDiscoveryS3IpFinderSelfTest + extends GridTcpDiscoveryIpFinderAbstractSelfTest<GridTcpDiscoveryS3IpFinder> { + /** + * Constructor. + * + * @throws Exception If any error occurs. + */ + public GridTcpDiscoveryS3IpFinderSelfTest() throws Exception { + // No-op. + } + + /** {@inheritDoc} */ + @Override protected GridTcpDiscoveryS3IpFinder ipFinder() throws Exception { + GridTcpDiscoveryS3IpFinder finder = new GridTcpDiscoveryS3IpFinder(); + + injectLogger(finder); + + assert finder.isShared() : "Ip finder should be shared by default."; + + finder.setAwsCredentials(new BasicAWSCredentials(GridS3TestSuite.getAccessKey(), + GridS3TestSuite.getSecretKey())); + + // Bucket name should be unique for the host to parallel test run on one bucket. + finder.setBucketName("ip-finder-test-bucket-" + InetAddress.getLocalHost().getAddress()[3]); + + for (int i = 0; i < 5; i++) { + Collection<InetSocketAddress> addrs = finder.getRegisteredAddresses(); + + if (!addrs.isEmpty()) + finder.unregisterAddresses(addrs); + else + return finder; + + U.sleep(1000); + } + + if (!finder.getRegisteredAddresses().isEmpty()) + throw new Exception("Failed to initialize IP finder."); + + return finder; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html new file mode 100644 index 0000000..5cad80a --- /dev/null +++ b/modules/aws/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/s3/package.html @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<!-- + @html.file.header + _________ _____ __________________ _____ + __ ____/___________(_)______ /__ ____/______ ____(_)_______ + _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ +--> +<html> +<body> + <!-- Package description. --> + Contains internal tests or test related classes and interfaces. +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java b/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java deleted file mode 100644 index 74b18eb..0000000 --- a/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/GridTcpDiscoveryS3IpFinderSelfTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.spi.discovery.tcp.ipfinder.s3; - -import com.amazonaws.auth.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.gridgain.testframework.config.*; -import org.gridgain.testsuites.bamboo.*; - -import java.net.*; -import java.util.*; - -/** - * GridTcpDiscoveryS3IpFinder test. - */ -public class GridTcpDiscoveryS3IpFinderSelfTest - extends GridTcpDiscoveryIpFinderAbstractSelfTest<GridTcpDiscoveryS3IpFinder> { - /** - * Constructor. - * - * @throws Exception If any error occurs. - */ - public GridTcpDiscoveryS3IpFinderSelfTest() throws Exception { - // No-op. - } - - /** {@inheritDoc} */ - @Override protected GridTcpDiscoveryS3IpFinder ipFinder() throws Exception { - GridTcpDiscoveryS3IpFinder finder = new GridTcpDiscoveryS3IpFinder(); - - injectLogger(finder); - - assert finder.isShared() : "Ip finder should be shared by default."; - - finder.setAwsCredentials(new BasicAWSCredentials(GridS3TestSuite.getAccessKey(), - GridS3TestSuite.getSecretKey())); - - // Bucket name should be unique for the host to parallel test run on one bucket. - finder.setBucketName("ip-finder-test-bucket-" + InetAddress.getLocalHost().getAddress()[3]); - - for (int i = 0; i < 5; i++) { - Collection<InetSocketAddress> addrs = finder.getRegisteredAddresses(); - - if (!addrs.isEmpty()) - finder.unregisterAddresses(addrs); - else - return finder; - - U.sleep(1000); - } - - if (!finder.getRegisteredAddresses().isEmpty()) - throw new Exception("Failed to initialize IP finder."); - - return finder; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html b/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html deleted file mode 100644 index 5cad80a..0000000 --- a/modules/aws/src/test/java/org/gridgain/grid/spi/discovery/tcp/ipfinder/s3/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains internal tests or test related classes and interfaces. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/aws/src/test/java/org/gridgain/testsuites/bamboo/GridS3TestSuite.java ---------------------------------------------------------------------- diff --git a/modules/aws/src/test/java/org/gridgain/testsuites/bamboo/GridS3TestSuite.java b/modules/aws/src/test/java/org/gridgain/testsuites/bamboo/GridS3TestSuite.java index fa62d3e..11e32bd 100644 --- a/modules/aws/src/test/java/org/gridgain/testsuites/bamboo/GridS3TestSuite.java +++ b/modules/aws/src/test/java/org/gridgain/testsuites/bamboo/GridS3TestSuite.java @@ -11,7 +11,7 @@ package org.gridgain.testsuites.bamboo; import junit.framework.*; import org.apache.ignite.spi.checkpoint.s3.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.s3.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.s3.*; /** * S3 integration tests. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java index 567398f..9518858 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientAbstractMultiThreadedSelfTest.java @@ -23,9 +23,9 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.affinity.*; -import org.gridgain.grid.spi.discovery.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java index 2d50d1e..a4e7157 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientDefaultCacheSelfTest.java @@ -12,9 +12,9 @@ package org.gridgain.client; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.spi.discovery.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.testframework.junits.common.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ef8f69b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java index 0779306..a047215 100644 --- a/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/GridClientTopologyCacheSelfTest.java @@ -12,9 +12,9 @@ package org.gridgain.client; import org.apache.ignite.configuration.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.spi.discovery.tcp.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.*; -import org.gridgain.grid.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.gridgain.testframework.junits.common.*; import java.util.*;
