Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-24
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8bef53e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8bef53e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8bef53e6
Branch: refs/heads/ignite-86
Commit: 8bef53e6456c9cd8691d81f50d7034b6711c7bd1
Parents: a4d5dc6
Author: Yakov Zhdanov <[email protected]>
Authored: Tue Jan 27 10:09:29 2015 +0300
Committer: Yakov Zhdanov <[email protected]>
Committed: Tue Jan 27 10:09:29 2015 +0300
----------------------------------------------------------------------
.../managers/communication/GridIoManager.java | 27 ++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8bef53e6/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 538fa93..8e17cb1 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
@@ -964,6 +964,33 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
}
/**
+ * @param nodeId Destination node.
+ * @param topic Topic to send the message to.
+ * @param msg Message to send.
+ * @param plc Type of processing.
+ * @param timeout Timeout to keep a message on receiving queue.
+ * @param skipOnTimeout Whether message can be skipped on timeout.
+ * @throws IgniteCheckedException Thrown in case of any errors.
+ */
+ public void sendOrderedMessage(
+ UUID nodeId,
+ Object topic,
+ GridTcpCommunicationMessageAdapter msg,
+ GridIoPolicy plc,
+ long timeout,
+ boolean skipOnTimeout
+ ) throws IgniteCheckedException {
+ assert timeout > 0 || skipOnTimeout;
+
+ ClusterNode node = ctx.discovery().node(nodeId);
+
+ if (node == null)
+ throw new IgniteCheckedException("Failed to send message to node
(has node left grid?): " + nodeId);
+
+ send(node, topic, (byte)-1, msg, plc, true, timeout, skipOnTimeout);
+ }
+
+ /**
* @param nodes Destination nodes.
* @param topic Topic to send the message to.
* @param msg Message to send.
