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/12 11:24:21 UTC
[07/10] ignite git commit: ignite-3478 Fixed query ack
ignite-3478 Fixed query ack
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f29d4bc5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f29d4bc5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f29d4bc5
Branch: refs/heads/ignite-5932
Commit: f29d4bc50801c530ef856d168fb637b0fad1c27b
Parents: 2374296
Author: sboikov <sb...@gridgain.com>
Authored: Thu Oct 12 13:43:07 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Oct 12 13:43:07 2017 +0300
----------------------------------------------------------------------
.../cache/mvcc/CacheCoordinatorsProcessor.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f29d4bc5/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 9f9a7a3..85dde15 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
@@ -261,7 +261,7 @@ public class CacheCoordinatorsProcessor extends GridProcessorAdapter {
}
crd = crdNode != null ? new
- MvccCoordinator(crdNode.id(), topVer, new AffinityTopologyVersion(topVer, 0)) : null;
+ MvccCoordinator(crdNode.id(), coordinatorVersion(topVer), new AffinityTopologyVersion(topVer, 0)) : null;
if (crd != null)
log.info("Assigned mvcc coordinator [crd=" + crd + ", crdNode=" + crdNode +']');
@@ -274,6 +274,14 @@ public class CacheCoordinatorsProcessor extends GridProcessorAdapter {
}
/**
+ * @param topVer Topology version.
+ * @return Coordinator version.
+ */
+ private long coordinatorVersion(long topVer) {
+ return topVer + ctx.discovery().gridStartTime();
+ }
+
+ /**
* @param log Logger.
*/
public void dumpStatistics(IgniteLogger log) {
@@ -1022,7 +1030,7 @@ public class CacheCoordinatorsProcessor extends GridProcessorAdapter {
log.info("Initialize local node as mvcc coordinator [node=" + ctx.localNodeId() +
", topVer=" + topVer + ']');
- crdVer = topVer.topologyVersion() + ctx.discovery().gridStartTime();
+ crdVer = coordinatorVersion(topVer.topologyVersion());
prevCrdQueries.init(activeQueries, discoCache, ctx.discovery());