You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 12:05:36 UTC
[1/2] incubator-ignite git commit: #ignite-1109: Fix comments after
review.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1109 018022f39 -> 51cf92dcf
#ignite-1109: Fix comments after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d3646d2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3646d2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3646d2f
Branch: refs/heads/ignite-1109
Commit: d3646d2f1bd1f829ca9a9d45fededdae80eed98d
Parents: 018022f
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 12:45:52 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 12:45:52 2015 +0300
----------------------------------------------------------------------
.../AffinityNodeAddressHashResolver.java | 7 +++++-
.../affinity/AffinityNodeHashResolver.java | 3 +--
.../affinity/AffinityNodeIdHashResolver.java | 5 +++++
.../rendezvous/RendezvousAffinityFunction.java | 3 +--
.../configuration/IgniteConfiguration.java | 8 +++----
.../apache/ignite/internal/IgniteKernal.java | 3 ++-
.../processors/cache/GridCacheProcessor.java | 8 +++----
.../tcp/internal/TcpDiscoveryNode.java | 23 ++++++++++----------
8 files changed, 34 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
index 723693e..533174f 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeAddressHashResolver.java
@@ -18,10 +18,15 @@
package org.apache.ignite.cache.affinity;
import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import java.io.*;
+
/**
- * Node hash resolver which uses {@link org.apache.ignite.cluster.ClusterNode#consistentId()} as alternate hash value.
+ * Node hash resolver which uses {@link ClusterNode#consistentId()} as alternate hash value.
+ *
+ * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)} instead.
*/
@Deprecated
public class AffinityNodeAddressHashResolver implements AffinityNodeHashResolver {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
index cad4b55..f990951 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java
@@ -33,8 +33,7 @@ import java.io.*;
* Therefore you must ensure that server and clients can marshal and unmarshal this object in portable format,
* i.e. all parties have object class(es) configured as portable.
*
- * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)}
- * instead (refer to its JavaDoc for details).
+ * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)} instead.
*/
@Deprecated
public interface AffinityNodeHashResolver extends Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
index 5729b67..2580c69 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeIdHashResolver.java
@@ -18,11 +18,16 @@
package org.apache.ignite.cache.affinity;
import org.apache.ignite.cluster.*;
+import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import java.io.*;
+
/**
* Node hash resolver which uses generated node ID as node hash value. As new node ID is generated
* on each node start, this resolver do not provide ability to map keys to the same nodes after restart.
+ *
+ * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)} instead.
*/
@Deprecated
public class AffinityNodeIdHashResolver implements AffinityNodeHashResolver {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
index 862caa4..6736c4e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java
@@ -222,8 +222,7 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza
*
* @param hashIdRslvr Hash ID resolver.
*
- * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)}
- * instead (refer to its JavaDoc for details).
+ * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)} instead.
*/
@Deprecated
public void setHashIdResolver(AffinityNodeHashResolver hashIdRslvr) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 34995e5..823ddcd 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -446,6 +446,7 @@ public class IgniteConfiguration {
clientMode = cfg.isClientMode();
clockSyncFreq = cfg.getClockSyncFrequency();
clockSyncSamples = cfg.getClockSyncSamples();
+ consistentId = cfg.getConsistentId();
deployMode = cfg.getDeploymentMode();
discoStartupDelay = cfg.getDiscoveryStartupDelay();
pubPoolSize = cfg.getPublicThreadPoolSize();
@@ -495,7 +496,6 @@ public class IgniteConfiguration {
utilityCachePoolSize = cfg.getUtilityCacheThreadPoolSize();
waitForSegOnStart = cfg.isWaitForSegmentOnStart();
warmupClos = cfg.getWarmupClosure();
- consistentId = cfg.getConsistentId();
}
/**
@@ -565,7 +565,7 @@ public class IgniteConfiguration {
/**
* Sets consistent globally unique node ID which survives node restarts.
*
- * @param consistentId Node consistent id.
+ * @param consistentId Node consistent ID.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setConsistentId(Serializable consistentId) {
@@ -577,10 +577,10 @@ public class IgniteConfiguration {
/**
* Gets consistent globally unique node ID which survives node restarts.
*
- * @return Node consistent id.
+ * @return Node consistent ID.
*/
public Serializable getConsistentId() {
- return this.consistentId;
+ return consistentId;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 88aa4e4..d2f018a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1173,7 +1173,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
add(ATTR_CONSISTENCY_CHECK_SKIPPED, getBoolean(IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK));
- add(ATTR_NODE_CONSISTENT_ID, cfg.getConsistentId());
+ if (cfg.getConsistentId() != null)
+ add(ATTR_NODE_CONSISTENT_ID, cfg.getConsistentId());
// Build a string from JVM arguments, because parameters with spaces are split.
SB jvmArgs = new SB(512);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 6bae82e..a511e0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2501,12 +2501,12 @@ public class GridCacheProcessor extends GridProcessorAdapter {
aff.getHashIdResolver().getClass().getName();
String errMsg = "Failed to add node to topology because it has the same hash code for " +
- "partitioned affinity as one of existing nodes [cacheName=" + U.maskName(cfg.getName()) +
- hashIdRslvrName + ", existingNodeId=" + topNode.id() + ']';
+ "partitioned affinity as one of existing nodes [cacheName=" +
+ U.maskName(cfg.getName()) + hashIdRslvrName + ", existingNodeId=" + topNode.id() + ']';
String sndMsg = "Failed to add node to topology because it has the same hash code for " +
- "partitioned affinity as one of existing nodes [cacheName=" + U.maskName(cfg.getName()) +
- hashIdRslvrName + ", existingNodeId=" + topNode.id() + ']';
+ "partitioned affinity as one of existing nodes [cacheName=" +
+ U.maskName(cfg.getName()) + hashIdRslvrName + ", existingNodeId=" + topNode.id() + ']';
return new IgniteNodeValidationResult(topNode.id(), errMsg, sndMsg);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3646d2f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index e7562fc..142dbea 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -131,12 +131,15 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
* @param discPort Port.
* @param metricsProvider Metrics provider.
* @param ver Version.
- * @param consistentId Node consistent id.
+ * @param consistentId Node consistent ID.
*/
public TcpDiscoveryNode(UUID id,
Collection<String> addrs,
- Collection<String> hostNames, int discPort,
- DiscoveryMetricsProvider metricsProvider, IgniteProductVersion ver, Serializable consistentId)
+ Collection<String> hostNames,
+ int discPort,
+ DiscoveryMetricsProvider metricsProvider,
+ IgniteProductVersion ver,
+ Serializable consistentId)
{
assert id != null;
assert !F.isEmpty(addrs);
@@ -146,6 +149,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
this.id = id;
List<String> sortedAddrs = new ArrayList<>(addrs);
+
Collections.sort(sortedAddrs);
this.addrs = sortedAddrs;
@@ -154,10 +158,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
this.metricsProvider = metricsProvider;
this.ver = ver;
- if (consistentId != null)
- this.consistentId = consistentId;
- else
- this.consistentId = U.consistentId(sortedAddrs, discPort);
+ this.consistentId = consistentId != null ? consistentId : U.consistentId(sortedAddrs, discPort);
metrics = metricsProvider.metrics();
cacheMetrics = metricsProvider.cacheMetrics();
@@ -456,7 +457,8 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
* @return Copy of local node for client reconnect request.
*/
public TcpDiscoveryNode clientReconnectNode() {
- TcpDiscoveryNode node = new TcpDiscoveryNode(id, addrs, hostNames, discPort, metricsProvider, ver, null);
+ TcpDiscoveryNode node = new TcpDiscoveryNode(id, addrs, hostNames, discPort, metricsProvider, ver,
+ null);
node.attrs = attrs;
node.clientRouterNodeId = clientRouterNodeId;
@@ -528,10 +530,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
Object consistentIdAttr = attrs.get(ATTR_NODE_CONSISTENT_ID);
- if (consistentIdAttr != null)
- consistentId = consistentIdAttr;
- else
- consistentId = U.consistentId(addrs, discPort);
+ consistentId = consistentIdAttr != null ? consistentIdAttr : U.consistentId(addrs, discPort);
// Cluster metrics
byte[] mtr = U.readByteArray(in);
[2/2] incubator-ignite git commit: #ignite-1109: Fix comments after
review.
Posted by iv...@apache.org.
#ignite-1109: Fix comments after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51cf92dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51cf92dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51cf92dc
Branch: refs/heads/ignite-1109
Commit: 51cf92dcfbf412d7bb9a993bd2f8ffd7016b6cf3
Parents: d3646d2
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 13:05:29 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 13:05:29 2015 +0300
----------------------------------------------------------------------
.../ignite/configuration/CacheConfiguration.java | 1 -
.../processors/cache/GridCacheProcessor.java | 18 ++++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51cf92dc/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 614113c..3ad0f01 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -20,7 +20,6 @@ package org.apache.ignite.configuration;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.cache.store.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51cf92dc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index a511e0e..dc071f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2639,10 +2639,20 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (!((locHashIdResolver == null && rmtHashIdResolver == null) ||
(locHashIdResolver == null && rmtHashIdResolver.equals(defHashIdResolver)) ||
(rmtHashIdResolver == null && locHashIdResolver.equals(defHashIdResolver)))) {
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
- "Partitioned cache affinity hash ID resolver class",
- locAttr.affinityHashIdResolverClassName(), rmtAttr.affinityHashIdResolverClassName(),
- true);
+
+ try {
+ CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
+ "Partitioned cache affinity hash ID resolver class",
+ locHashIdResolver, rmtHashIdResolver, true);
+ }
+ catch (IgniteCheckedException e) {
+ if (locHashIdResolver == null && rmtHashIdResolver.equals(defHashIdResolver)) {
+ U.warn(log, "Set " + RendezvousAffinityFunction.class + " with " + defHashIdResolver +
+ " to CacheConfiguration to start node [cacheName=" + rmtAttr.cacheName() + "]");
+ }
+
+ throw e;
+ }
}
}
}