Repository: ignite Updated Branches: refs/heads/ignite-5578 f879b0ed4 -> 3dc2a17d6
ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3dc2a17d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3dc2a17d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3dc2a17d Branch: refs/heads/ignite-5578 Commit: 3dc2a17d6ec29e4a3b38ed170db2c4462366fbeb Parents: f879b0e Author: sboikov <[email protected]> Authored: Wed Aug 2 18:04:40 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Aug 2 18:04:40 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsFullMessage.java | 5 ++++- .../standbycluster/IgniteChangeGlobalStateTest.java | 11 +++-------- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3dc2a17d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java index 393cf0e..5ae4002 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java @@ -154,9 +154,12 @@ public class GridDhtPartitionsFullMessage extends GridDhtPartitionsAbstractMessa cp.partsToReload = partsToReload; cp.partsToReloadBytes = partsToReloadBytes; cp.topVer = topVer; + cp.errs = errs; + cp.errsBytes = errsBytes; + cp.compress = compress; + cp.resTopVer = resTopVer; cp.joinedNodeAff = joinedNodeAff; cp.idealAffDiff = idealAffDiff; - cp.resTopVer = resTopVer; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/3dc2a17d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java index 80bf1fb..cbf0ec9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateTest.java @@ -573,23 +573,18 @@ public class IgniteChangeGlobalStateTest extends IgniteChangeGlobalStateAbstract stopPrimary(0); - boolean exc = false; - try { ig3CB.active(true); + + fail("Activation should fail"); } catch (IgniteException e) { - exc = true; - - log.error("stack trace from remote node", e); + log.error("Stack trace from remote node", e); for (Throwable t : e.getSuppressed()) assertTrue(t.getMessage().contains("can't get lock during")); } - if (!exc) - fail(); - assertTrue(!ig1B.active()); assertTrue(!ig2B.active()); assertTrue(!ig3B.active());
