Repository: ignite Updated Branches: refs/heads/ignite-6149 fcf4e3037 -> 3554b0f16
ignite-6149 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3554b0f1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3554b0f1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3554b0f1 Branch: refs/heads/ignite-6149 Commit: 3554b0f168e3ac59d78aa9b442f2ffcf5f3d0619 Parents: fcf4e30 Author: sboikov <[email protected]> Authored: Fri Sep 15 14:21:59 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 15 14:21:59 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/communication/GridIoManager.java | 2 +- .../internal/processors/cache/mvcc/CoordinatorFutureResponse.java | 2 +- .../internal/processors/cache/mvcc/CoordinatorQueryAckRequest.java | 2 +- .../processors/cache/mvcc/CoordinatorQueryVersionRequest.java | 2 +- .../internal/processors/cache/mvcc/CoordinatorTxAckRequest.java | 2 +- .../processors/cache/mvcc/CoordinatorTxCounterRequest.java | 2 +- .../internal/processors/cache/mvcc/CoordinatorWaitTxsRequest.java | 2 +- .../internal/processors/cache/mvcc/MvccCoordinatorMessage.java | 2 +- .../processors/cache/mvcc/MvccCoordinatorVersionResponse.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 5c2dfd7..c1f6672 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -1116,7 +1116,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa if (msg.topicOrdinal() == TOPIC_CACHE_COORDINATOR.ordinal()) { MvccCoordinatorMessage msg0 = (MvccCoordinatorMessage)msg.message(); - if (msg0.processedOnCoordinator()) + if (msg0.processedFromNioThread()) c.run(); else ctx.getStripedExecutorService().execute(-1, c); http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorFutureResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorFutureResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorFutureResponse.java index 3bea674..e7eff42 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorFutureResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorFutureResponse.java @@ -57,7 +57,7 @@ public class CoordinatorFutureResponse implements MvccCoordinatorMessage { } /** {@inheritDoc} */ - @Override public boolean processedOnCoordinator() { + @Override public boolean processedFromNioThread() { return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryAckRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryAckRequest.java index bf7eea1..602d3b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryAckRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryAckRequest.java @@ -53,7 +53,7 @@ public class CoordinatorQueryAckRequest implements MvccCoordinatorMessage { } /** {@inheritDoc} */ - @Override public boolean processedOnCoordinator() { + @Override public boolean processedFromNioThread() { return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryVersionRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryVersionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryVersionRequest.java index 7229e3a..2f86461 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryVersionRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorQueryVersionRequest.java @@ -53,7 +53,7 @@ public class CoordinatorQueryVersionRequest implements MvccCoordinatorMessage { } /** {@inheritDoc} */ - @Override public boolean processedOnCoordinator() { + @Override public boolean processedFromNioThread() { return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxAckRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxAckRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxAckRequest.java index cdc9c02..071a411 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxAckRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxAckRequest.java @@ -65,7 +65,7 @@ public class CoordinatorTxAckRequest implements MvccCoordinatorMessage { } /** {@inheritDoc} */ - @Override public boolean processedOnCoordinator() { + @Override public boolean processedFromNioThread() { return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxCounterRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxCounterRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxCounterRequest.java index 4b48c12..038c062 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxCounterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorTxCounterRequest.java @@ -61,7 +61,7 @@ public class CoordinatorTxCounterRequest implements MvccCoordinatorMessage { } /** {@inheritDoc} */ - @Override public boolean processedOnCoordinator() { + @Override public boolean processedFromNioThread() { return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorWaitTxsRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorWaitTxsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorWaitTxsRequest.java index f87a8ff..f40df72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorWaitTxsRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/CoordinatorWaitTxsRequest.java @@ -71,7 +71,7 @@ public class CoordinatorWaitTxsRequest implements MvccCoordinatorMessage { } /** {@inheritDoc} */ - @Override public boolean processedOnCoordinator() { + @Override public boolean processedFromNioThread() { return true; } http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorMessage.java index 1e11ac1..22cd8d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorMessage.java @@ -25,5 +25,5 @@ import org.apache.ignite.plugin.extensions.communication.Message; public interface MvccCoordinatorMessage extends Message { public boolean waitForCoordinatorInit(); - public boolean processedOnCoordinator(); + public boolean processedFromNioThread(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/3554b0f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorVersionResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorVersionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorVersionResponse.java index 15c9005..07f8cf3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorVersionResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/MvccCoordinatorVersionResponse.java @@ -71,7 +71,7 @@ public class MvccCoordinatorVersionResponse implements MvccCoordinatorMessage, M } /** {@inheritDoc} */ - @Override public boolean processedOnCoordinator() { + @Override public boolean processedFromNioThread() { return false; }
