Repository: ignite Updated Branches: refs/heads/master e1bf8d7ba -> 3ab523cd0
ignite-6124 DataStreamerImpl: do not wait for exchange future inside cache gateway. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ab523cd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ab523cd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ab523cd Branch: refs/heads/master Commit: 3ab523cd0f9c8bf962e6069596002204bcc49886 Parents: e1bf8d7 Author: sboikov <[email protected]> Authored: Thu Aug 24 14:09:12 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Aug 24 14:09:12 2017 +0300 ---------------------------------------------------------------------- .../processors/datastreamer/DataStreamerImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3ab523cd/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index aee0d26..6ed552a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -764,6 +764,13 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed GridCacheGateway gate = null; + AffinityTopologyVersion topVer; + + if (!cctx.isLocal()) + topVer = ctx.cache().context().exchange().lastTopologyFuture().get(); + else + topVer = ctx.cache().context().exchange().readyAffinityVersion(); + if (!allowOverwrite() && !cctx.isLocal()) { // Cases where cctx required. gate = cctx.gate(); @@ -771,13 +778,6 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed } try { - AffinityTopologyVersion topVer; - - if (!cctx.isLocal()) - topVer = ctx.cache().context().exchange().lastTopologyFuture().get(); - else - topVer = ctx.cache().context().exchange().readyAffinityVersion(); - for (DataStreamerEntry entry : entries) { List<ClusterNode> nodes;
