GG-12192 Concurrent node join and snapshot restore cause to coordinator fail -fixing tests and compilation
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/afbade50 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/afbade50 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/afbade50 Branch: refs/heads/ignite-5398 Commit: afbade50e151d2aa793e9762637853ec6d6f2f93 Parents: db84a92 Author: EdShangGG <[email protected]> Authored: Thu May 18 19:30:00 2017 +0300 Committer: EdShangGG <[email protected]> Committed: Thu May 18 19:30:00 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteDiagnosticMessage.java | 2 +- .../internal/managers/communication/GridIoMessageFactory.java | 2 +- .../internal/processors/cache/IgniteCacheOffheapManagerImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/afbade50/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java index 8be571e..986357c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java @@ -217,7 +217,7 @@ public class IgniteDiagnosticMessage implements Message { /** {@inheritDoc} */ @Override public byte directType() { - return -46; + return -52; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/afbade50/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index f443f31..5555353 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@ -173,7 +173,7 @@ public class GridIoMessageFactory implements MessageFactory { Message msg = null; switch (type) { - case -46: + case -52: // -46 ... -51 - snapshot messages! msg = new IgniteDiagnosticMessage(); break; http://git-wip-us.apache.org/repos/asf/ignite/blob/afbade50/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index 5d1f7b9..68965c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -172,7 +172,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple @Override protected void stop0(final boolean cancel, final boolean destroy) { super.stop0(cancel, destroy); - if (destroy && cctx.affinityNode()) + if (cctx.affinityNode()) destroyCacheDataStructures(); }
