Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/06639287 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/06639287 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/06639287 Branch: refs/heads/ignite-929 Commit: 0663928735be013d9a03abd643c4334b162c662f Parents: 9fd491e ab20fd9 Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Jun 5 21:00:37 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Jun 5 21:00:37 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 11 + .../configuration/CacheConfiguration.java | 13 +- .../apache/ignite/internal/IgniteKernal.java | 3 + .../managers/communication/GridIoManager.java | 117 ++++---- .../affinity/GridAffinityProcessor.java | 23 +- .../processors/cache/GridCacheAdapter.java | 17 +- .../processors/cache/GridCacheContext.java | 3 - .../processors/cache/GridCacheProxyImpl.java | 14 +- .../processors/cache/IgniteCacheProxy.java | 23 ++ .../processors/cache/IgniteInternalCache.java | 11 +- .../dht/GridClientPartitionTopology.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 +- .../GridDhtPartitionsExchangeFuture.java | 29 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../datastreamer/DataStreamerImpl.java | 92 ++++-- .../processors/hadoop/HadoopTaskContext.java | 14 +- .../processors/igfs/IgfsMetaManager.java | 2 +- .../igfs/IgfsSecondaryFileSystemImpl.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../VisorCacheConfigurationCollectorJob.java | 6 +- .../internal/visor/cache/VisorCacheMetrics.java | 19 +- .../cache/VisorCacheMetricsCollectorTask.java | 10 +- .../cache/VisorCacheStoreConfiguration.java | 5 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 3 + .../ignite/spi/discovery/tcp/ServerImpl.java | 31 -- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 56 +++- .../tcp/ipfinder/TcpDiscoveryIpFinder.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 47 +++- .../cache/GridCacheAbstractFullApiSelfTest.java | 83 ++++++ .../GridCacheExAbstractFullApiSelfTest.java | 103 ------- .../cache/IgniteDynamicCacheStartSelfTest.java | 62 ++++ ...niteDynamicCacheWithConfigStartSelfTest.java | 97 +++++++ .../GridCacheExColocatedFullApiSelfTest.java | 33 --- .../near/GridCacheExNearFullApiSelfTest.java | 39 --- .../GridCacheExReplicatedFullApiSelfTest.java | 33 --- .../local/GridCacheExLocalFullApiSelfTest.java | 30 -- .../DataStreamerMultiThreadedSelfTest.java | 59 +++- .../igfs/IgfsClientCacheSelfTest.java | 9 +- .../IgniteMessagingWithClientTest.java | 166 +++++++++++ .../tcp/TcpClientDiscoverySpiMulticastTest.java | 129 +++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheFullApiSelfTestSuite.java | 6 - .../testsuites/IgniteCacheTestSuite4.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 1 + .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 43 +-- .../fs/IgniteHadoopFileSystemCounterWriter.java | 14 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 70 ++--- .../hadoop/fs/v2/IgniteHadoopFileSystem.java | 2 +- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../internal/processors/hadoop/HadoopUtils.java | 282 ++++++++++++++++++- .../hadoop/SecondaryFileSystemProvider.java | 4 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 20 +- .../processors/hadoop/v2/HadoopV2Job.java | 31 +- .../hadoop/v2/HadoopV2JobResourceManager.java | 26 +- .../hadoop/v2/HadoopV2TaskContext.java | 48 +++- .../hadoop/HadoopClientProtocolSelfTest.java | 6 +- .../hadoop/HadoopAbstractSelfTest.java | 14 +- .../hadoop/HadoopCommandLineTest.java | 14 +- .../processors/hadoop/HadoopMapReduceTest.java | 176 +++++++++++- .../hadoop/HadoopTaskExecutionSelfTest.java | 2 +- .../hadoop/HadoopTasksAllVersionsTest.java | 15 +- .../processors/hadoop/HadoopTasksV1Test.java | 5 +- .../processors/hadoop/HadoopTasksV2Test.java | 5 +- .../processors/hadoop/HadoopV2JobSelfTest.java | 6 +- .../collections/HadoopAbstractMapTest.java | 12 + ...acheConfigurationPrimitiveTypesSelfTest.java | 104 +++++++ .../IgniteCacheWithIndexingTestSuite.java | 2 + .../commands/cache/VisorCacheScanCommand.scala | 2 +- 69 files changed, 1752 insertions(+), 590 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06639287/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06639287/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06639287/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06639287/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06639287/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java index 0b12e42,db9e6a8..bec0ce5 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java @@@ -1010,24 -1016,74 +1020,76 @@@ public class IgniteDynamicCacheStartSel * @throws Exception If failed. */ public void testAwaitPartitionMapExchange() throws Exception { - try (IgniteCache ignored = grid(0).getOrCreateCache(new CacheConfiguration(DYNAMIC_CACHE_NAME))) { - awaitPartitionMapExchange(); + IgniteCache cache = grid(0).getOrCreateCache(new CacheConfiguration(DYNAMIC_CACHE_NAME)); - startGrid(nodeCount()); + awaitPartitionMapExchange(); - awaitPartitionMapExchange(); + startGrid(nodeCount()); - startGrid(nodeCount() + 1); + awaitPartitionMapExchange(); - awaitPartitionMapExchange(); + startGrid(nodeCount() + 1); - stopGrid(nodeCount() + 1); + awaitPartitionMapExchange(); - awaitPartitionMapExchange(); + stopGrid(nodeCount() + 1); - stopGrid(nodeCount()); - } + awaitPartitionMapExchange(); + + stopGrid(nodeCount()); + + cache.destroy(); } + + /** + * @throws Exception If failed. + */ + public void testStartStopWithClientJoin() throws Exception { + Ignite ignite1 = ignite(1); + + final AtomicBoolean stop = new AtomicBoolean(); + + IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() { + @Override public Object call() throws Exception { + client = true; + + int iter = 0; + + while (!stop.get()) { + if (iter % 10 == 0) + log.info("Client start/stop iteration: " + iter); + + iter++; + + try (Ignite ignite = startGrid(nodeCount())) { + assertTrue(ignite.configuration().isClientMode()); + } + } + + return null; + } + }, 1, "client-start-stop"); + + try { + long stopTime = U.currentTimeMillis() + 30_000; + + int iter = 0; + + while (System.currentTimeMillis() < stopTime) { + if (iter % 10 == 0) + log.info("Cache start/stop iteration: " + iter); + + try (IgniteCache<Object, Object> cache = ignite1.getOrCreateCache("cache-" + iter)) { + assertNotNull(cache); + } + + iter++; + } + } + finally { + stop.set(true); + } + + fut.get(); + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06639287/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ----------------------------------------------------------------------
