Repository: ignite Updated Branches: refs/heads/master 4af036ef5 -> 955090d94
IGNITE-6403: Fixed a bug causing to early completion of DDL operations on client node. This closes #2688. This closes #2691. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/955090d9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/955090d9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/955090d9 Branch: refs/heads/master Commit: 955090d945f9cee2822ca5a8e0abd0d19432bbb8 Parents: 4af036e Author: devozerov <ppoze...@gmail.com> Authored: Mon Sep 18 23:10:45 2017 +0300 Committer: devozerov <ppoze...@gmail.com> Committed: Mon Sep 18 23:10:45 2017 +0300 ---------------------------------------------------------------------- .../processors/query/GridQueryProcessor.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/955090d9/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 593a3b2..e791101 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -554,16 +554,6 @@ public class GridQueryProcessor extends GridProcessorAdapter { // Clean stale IO messages from just-joined nodes. cleanStaleStatusMessages(opId); } - - // Complete client future (if any). - SchemaOperationClientFuture cliFut = schemaCliFuts.remove(opId); - - if (cliFut != null) { - if (msg.hasError()) - cliFut.onDone(msg.error()); - else - cliFut.onDone(); - } } /** @@ -2718,6 +2708,16 @@ private IgniteInternalFuture<Object> rebuildIndexesFromHash(@Nullable final Stri assert op != null; assert F.eq(op.id(), opId); + // Complete client future (if any). + SchemaOperationClientFuture cliFut = schemaCliFuts.remove(opId); + + if (cliFut != null) { + if (finishMsg.hasError()) + cliFut.onDone(finishMsg.error()); + else + cliFut.onDone(); + } + // Chain to the next operation (if any). final SchemaOperation nextOp = op.next();
