You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/12/19 09:20:18 UTC
ignite git commit: ignite-4450
Repository: ignite
Updated Branches:
refs/heads/ignite-4450 [created] c59f1f29f
ignite-4450
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c59f1f29
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c59f1f29
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c59f1f29
Branch: refs/heads/ignite-4450
Commit: c59f1f29f5d3b34073b7b27a971e7441b21cc809
Parents: fcf5d9a
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 19 12:20:11 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 19 12:20:11 2016 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c59f1f29/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 4f34401..2cfc0d0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -805,8 +805,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
}
catch (IgniteFutureTimeoutCheckedException ignored) {
if (dumpedObjects < DUMP_PENDING_OBJECTS_THRESHOLD) {
- U.warn(log, "Failed to wait for locks release future. " +
- "Dumping pending objects that might be the cause: " + cctx.localNodeId());
+ U.warn(log, "Failed to wait for locks release future. Dumping pending objects that might be the " +
+ "cause [topVer=" + topologyVersion() + ", nodeId=" + cctx.localNodeId() + "]: ");
U.warn(log, "Locked keys:");
@@ -1556,6 +1556,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
if (isDone() || !enterBusy())
return;
+ cctx.mvcc().removeExplicitNodeLocks(node.id(), topologyVersion());
+
try {
onDiscoveryEvent(new IgniteRunnable() {
@Override public void run() {