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 2017/10/27 11:29:58 UTC
ignite git commit: ignite-3478 Fix tests
Repository: ignite
Updated Branches:
refs/heads/ignite-3478 f8c5cc5dc -> b04849ea6
ignite-3478 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b04849ea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b04849ea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b04849ea
Branch: refs/heads/ignite-3478
Commit: b04849ea6e1313b0e9d8b2646b08914f8cfa3a7b
Parents: f8c5cc5
Author: sboikov <sb...@gridgain.com>
Authored: Fri Oct 27 13:40:26 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Oct 27 14:27:54 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCachePartitionExchangeManager.java | 2 ++
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 5 +++--
.../cache/distributed/near/GridNearTxFastFinishFuture.java | 6 ++++++
.../cache/distributed/near/GridNearTxFinishAndAckFuture.java | 5 +++++
.../cache/distributed/near/GridNearTxFinishFuture.java | 5 +++++
.../processors/cache/distributed/near/GridNearTxLocal.java | 5 +++++
.../processors/cache/distributed/near/NearTxFinishFuture.java | 6 ++++++
.../processors/cache/mvcc/CacheCoordinatorsProcessor.java | 2 ++
8 files changed, 34 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 097d90f..417f205 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -1999,12 +1999,14 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
break;
}
+
if (!curFut.context().supportsMergeExchanges(node)) {
if (log.isInfoEnabled())
log.info("Stop merge, node does not support merge: " + node);
break;
}
+
if (evt.type() == EVT_NODE_JOINED && cctx.cache().hasCachesReceivedFromJoin(node)) {
if (log.isInfoEnabled())
log.info("Stop merge, received caches from node: " + node);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/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 85b38a5..2648ed9 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
@@ -577,6 +577,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (exchLog.isInfoEnabled()) {
exchLog.info("Started exchange init [topVer=" + topVer +
", mvccCrd=" + mvccCrd +
+ ", mvccCrdChange=" + mvccCrdChange +
", crd=" + crdNode +
", evt=" + IgniteUtils.gridEventName(firstDiscoEvt.type()) +
", evtNode=" + firstDiscoEvt.eventNode().id() +
@@ -2263,7 +2264,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
}
- if (exchCtx.mergeExchanges() && !exchCtx.newMvccCoordinator()) {
+ if (exchCtx.mergeExchanges()) {
if (log.isInfoEnabled())
log.info("Coordinator received all messages, try merge [ver=" + initialVersion() + ']');
@@ -2338,7 +2339,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
if (exchCtx.newMvccCoordinator())
exchCtx.addActiveQueries(e.getKey(), msg.activeQueries());
else
- assert msg.activeQueries() == null;
+ assert msg.activeQueries() == null : msg;
// Apply update counters after all single messages are received.
for (Map.Entry<Integer, GridDhtPartitionMap> entry : msg.partitions().entrySet()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFastFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFastFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFastFinishFuture.java
index de30090..0d8bdd9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFastFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFastFinishFuture.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
+import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -77,4 +78,9 @@ public class GridNearTxFastFinishFuture extends GridFutureAdapter<IgniteInternal
onDone(tx);
}
}
+
+ /** {@inheritDoc} */
+ @Override public void onNodeStop(IgniteCheckedException e) {
+ onDone(tx, e);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishAndAckFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishAndAckFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishAndAckFuture.java
index 36efe2f..f38b48a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishAndAckFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishAndAckFuture.java
@@ -110,6 +110,11 @@ public class GridNearTxFinishAndAckFuture extends GridFutureAdapter<IgniteIntern
}
}
+ /** {@inheritDoc} */
+ @Override public void onNodeStop(IgniteCheckedException e) {
+ super.onDone(finishFut.tx(), e);
+ }
+
/**
* @param fut Future.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 14536e4..fb838c8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -492,6 +492,11 @@ public final class GridNearTxFinishFuture<K, V> extends GridCacheCompoundIdentit
}
}
+ /** {@inheritDoc} */
+ @Override public void onNodeStop(IgniteCheckedException e) {
+ super.onDone(tx, e);
+ }
+
/**
*
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index f3aec5f..710d303 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -3274,6 +3274,9 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
commitNearTxLocalAsync().get();
}
+ /**
+ * @return Transaction commit future.
+ */
private NearTxFinishFuture commitFuture() {
GridNearTxFinishFuture fut = new GridNearTxFinishFuture<>(cctx, this, true);
@@ -3330,6 +3333,8 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter implements GridTimeou
if (!(e instanceof NodeStoppingException))
fut0.finish(false, true);
+ else
+ fut0.onNodeStop(e);
}
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/NearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/NearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/NearTxFinishFuture.java
index 19dca86..4e51ebc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/NearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/NearTxFinishFuture.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
+import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
@@ -34,4 +35,9 @@ public interface NearTxFinishFuture extends IgniteInternalFuture<IgniteInternalT
* @param clearThreadMap If {@code true} removes {@link GridNearTxLocal} from thread map.
*/
public void finish(boolean commit, boolean clearThreadMap);
+
+ /**
+ * @param e Error.
+ */
+ public void onNodeStop(IgniteCheckedException e);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b04849ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsProcessor.java
index c88ca1c..8e831b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CacheCoordinatorsProcessor.java
@@ -227,6 +227,8 @@ public class CacheCoordinatorsProcessor extends GridProcessorAdapter {
@Override public void onGridDataReceived(DiscoveryDataBag.GridDiscoveryData data) {
discoData = (CacheCoordinatorsDiscoveryData)data.commonData();
+ log.info("Received mvcc coordinator on node join: " + discoData.coordinator());
+
assert discoData != null;
}