Merge ignite-1.7.9 into master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84880a81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84880a81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84880a81 Branch: refs/heads/ignite-1192 Commit: 84880a8108a586604ab00d7bf48ba6c9f8f658ee Parents: 94c1e7c bcb1398 Author: nikolay_tikhonov <[email protected]> Authored: Thu Mar 16 16:34:28 2017 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Thu Mar 16 16:34:36 2017 +0300 ---------------------------------------------------------------------- .../internal/managers/GridManagerAdapter.java | 4 + .../cache/DynamicCacheChangeBatch.java | 14 ++ .../service/GridServiceProcessor.java | 49 ++--- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../ignite/spi/discovery/tcp/ClientImpl.java | 32 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 19 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 5 + .../tcp/internal/TcpDiscoveryNode.java | 6 +- .../GridServiceContinuousQueryRedeploy.java | 167 +++++++++++++++++ ...veryNodeAttributesUpdateOnReconnectTest.java | 110 +++++++++++ .../TcpDiscoverySslSecuredUnsecuredTest.java | 185 +++++++++++++++++++ .../tcp/TestReconnectPluginProvider.java | 111 +++++++++++ .../discovery/tcp/TestReconnectProcessor.java | 93 ++++++++++ .../testframework/GridSpiTestContext.java | 5 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + .../org.apache.ignite.plugin.PluginProvider | 1 + .../processors/query/h2/IgniteH2Indexing.java | 1 + parent/pom.xml | 1 + 20 files changed, 793 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java index 99146aa,4eeafed..74cca8e --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java @@@ -1586,16 -1576,19 +1576,22 @@@ public class GridServiceProcessor exten if (!((CacheAffinityChangeMessage)msg).exchangeNeeded()) return; } + else if (msg instanceof DynamicCacheChangeBatch) { + if (!((DynamicCacheChangeBatch)msg).exchangeNeeded()) + return; + } + else + return; } else - topVer = new AffinityTopologyVersion(((DiscoveryEvent)evt).topologyVersion(), 0); + topVer = new AffinityTopologyVersion((evt).topologyVersion(), 0); - depExe.submit(new BusyRunnable() { + depExe.execute(new BusyRunnable() { @Override public void run0() { - ClusterNode oldest = ctx.discovery().oldestAliveCacheServerNode(topVer); + // In case the cache instance isn't tracked by DiscoveryManager anymore. + discoCache.updateAlives(ctx.discovery()); + + ClusterNode oldest = discoCache.oldestAliveServerNodeWithCache(); if (oldest != null && oldest.isLocal()) { final Collection<GridServiceDeployment> retries = new ConcurrentLinkedQueue<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/core/src/test/java/org/apache/ignite/testframework/GridSpiTestContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index 41035ec,5977702..df27868 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@@ -141,7 -144,7 +142,8 @@@ public class IgniteKernalSelfTestSuite suite.addTestSuite(GridServiceProxyClientReconnectSelfTest.class); suite.addTestSuite(IgniteServiceReassignmentTest.class); suite.addTestSuite(IgniteServiceProxyTimeoutInitializedTest.class); + suite.addTestSuite(IgniteServiceDynamicCachesSelfTest.class); + suite.addTestSuite(GridServiceContinuousQueryRedeploy.class); suite.addTestSuite(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class); suite.addTestSuite(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 46fbb9e,62b47b8..7b188bf --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@@ -83,9 -80,7 +83,10 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.QueryCursorImpl; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshallable; import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery; +import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode; +import org.apache.ignite.internal.processors.query.GridQueryCacheObjectsIterator; +import org.apache.ignite.internal.processors.query.GridRunningQueryInfo; + import org.apache.ignite.internal.processors.query.GridRunningQueryInfo; import org.apache.ignite.internal.processors.query.GridQueryCancel; import org.apache.ignite.internal.processors.query.GridQueryFieldMetadata; import org.apache.ignite.internal.processors.query.GridQueryFieldsResult; http://git-wip-us.apache.org/repos/asf/ignite/blob/84880a81/parent/pom.xml ----------------------------------------------------------------------
