IGNITE-709 Rename DiscoveryCustomMessage.forwardMinorVersion() to incrementMinorTopologyVersion()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ba45875 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ba45875 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ba45875 Branch: refs/heads/ignite-709_3 Commit: 0ba45875fd49439b2ff487eee6106ae630df840d Parents: 7ee19cd Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri May 15 14:12:59 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri May 15 14:12:59 2015 +0300 ---------------------------------------------------------------------- .../internal/managers/discovery/DiscoveryCustomMessage.java | 4 +++- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +- .../internal/processors/cache/DynamicCacheChangeBatch.java | 2 +- .../processors/continuous/StartRoutineAckDiscoveryMessage.java | 2 +- .../processors/continuous/StartRoutineDiscoveryMessage.java | 3 +-- .../processors/continuous/StopRoutineAckDiscoveryMessage.java | 2 +- .../processors/continuous/StopRoutineDiscoveryMessage.java | 3 +-- 7 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ba45875/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java index e702ee4..13c0b9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryCustomMessage.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.managers.discovery; +import org.apache.ignite.internal.processors.affinity.*; import org.jetbrains.annotations.*; import java.io.*; @@ -29,8 +30,9 @@ public interface DiscoveryCustomMessage extends Serializable { * Whether or not minor version of topology should be increased on message receive. * * @return {@code true} if minor topology version should be increased. + * @see AffinityTopologyVersion#minorTopVer */ - public boolean forwardMinorVersion(); + public boolean incrementMinorTopologyVersion(); /** * Called when custom message has been handled by all nodes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ba45875/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 2678b02..5d5275f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -359,7 +359,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { if (type == EVT_NODE_METRICS_UPDATED) verChanged = false; else if (type == DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT) { - if (customMsg != null && customMsg.forwardMinorVersion()) { + if (customMsg != null && customMsg.incrementMinorTopologyVersion()) { minorTopVer++; verChanged = true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ba45875/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java index 744f6e8..ca257a9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeBatch.java @@ -75,7 +75,7 @@ public class DynamicCacheChangeBatch implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Override public boolean forwardMinorVersion() { + @Override public boolean incrementMinorTopologyVersion() { return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ba45875/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java index ca9e4a0..66892b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineAckDiscoveryMessage.java @@ -46,7 +46,7 @@ public class StartRoutineAckDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Override public boolean forwardMinorVersion() { + @Override public boolean incrementMinorTopologyVersion() { return false; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ba45875/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java index 5669433..2199fd0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StartRoutineDiscoveryMessage.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.continuous; import org.apache.ignite.*; import org.apache.ignite.internal.managers.discovery.*; import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.spi.*; import java.util.*; @@ -50,7 +49,7 @@ public class StartRoutineDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Override public boolean forwardMinorVersion() { + @Override public boolean incrementMinorTopologyVersion() { return false; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ba45875/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java index 16507a1..a640222 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineAckDiscoveryMessage.java @@ -40,7 +40,7 @@ public class StopRoutineAckDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Override public boolean forwardMinorVersion() { + @Override public boolean incrementMinorTopologyVersion() { return false; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ba45875/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java index 00515f1..e8a43a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/StopRoutineDiscoveryMessage.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.continuous; import org.apache.ignite.internal.managers.discovery.*; -import org.apache.ignite.spi.*; import org.jetbrains.annotations.*; import java.util.*; @@ -41,7 +40,7 @@ public class StopRoutineDiscoveryMessage implements DiscoveryCustomMessage { } /** {@inheritDoc} */ - @Override public boolean forwardMinorVersion() { + @Override public boolean incrementMinorTopologyVersion() { return false; }
