Merge remote-tracking branch 'remotes/origin/master' into ignite-752
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3531341a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3531341a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3531341a Branch: refs/heads/ignite-752 Commit: 3531341a7121e12ef80694daee33c5b98c4dddc9 Parents: 49098e9 73a2b14 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Jul 21 15:39:57 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Jul 21 15:39:57 2015 +0300 ---------------------------------------------------------------------- modules/apache-license-gen/pom.xml | 13 --- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../AffinityNodeAddressHashResolver.java | 8 +- .../affinity/AffinityNodeHashResolver.java | 5 + .../affinity/AffinityNodeIdHashResolver.java | 6 + .../rendezvous/RendezvousAffinityFunction.java | 22 +++- .../configuration/CacheConfiguration.java | 4 +- .../configuration/IgniteConfiguration.java | 26 +++++ .../apache/ignite/internal/IgniteKernal.java | 3 + .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/cache/GridCacheAttributes.java | 8 +- .../processors/cache/GridCacheProcessor.java | 113 ++++++++++++------- .../processors/cache/IgniteInternalCache.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 21 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 58 ++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +- .../tcp/internal/TcpDiscoveryNode.java | 18 ++- ...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++++++++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 1 + 19 files changed, 294 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3531341a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 50f78a5,823ddcd..c636255 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@@ -448,9 -446,10 +452,10 @@@ public class IgniteConfiguration clientMode = cfg.isClientMode(); clockSyncFreq = cfg.getClockSyncFrequency(); clockSyncSamples = cfg.getClockSyncSamples(); + consistentId = cfg.getConsistentId(); deployMode = cfg.getDeploymentMode(); discoStartupDelay = cfg.getDiscoveryStartupDelay(); - pubPoolSize = cfg.getPublicThreadPoolSize(); + failureDetectionThreshold = cfg.getFailureDetectionThreshold(); ggHome = cfg.getIgniteHome(); ggWork = cfg.getWorkDirectory(); gridName = cfg.getGridName(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3531341a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3531341a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3531341a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3531341a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java index a78ab25,b7014ad..2e35c73 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java @@@ -55,9 -54,9 +55,10 @@@ public class IgniteSpiDiscoverySelfTest suite.addTest(new TestSuite(TcpClientDiscoverySpiSelfTest.class)); suite.addTest(new TestSuite(TcpClientDiscoveryMarshallerCheckSelfTest.class)); suite.addTest(new TestSuite(TcpClientDiscoverySpiMulticastTest.class)); + suite.addTest(new TestSuite(TcpClientDiscoverySpiFailureThresholdSelfTest.class)); suite.addTest(new TestSuite(TcpDiscoveryNodeConsistentIdSelfTest.class)); + suite.addTest(new TestSuite(TcpDiscoveryNodeConfigConsistentIdSelfTest.class)); suite.addTest(new TestSuite(TcpDiscoveryRestartTest.class)); suite.addTest(new TestSuite(TcpDiscoveryMultiThreadedTest.class));
