You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/07/22 04:50:56 UTC
[2/2] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates
IGNITE-104 - Ordered ATOMIC updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/825fbc9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/825fbc9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/825fbc9e
Branch: refs/heads/ignite-104
Commit: 825fbc9e47e2f4d21f350e08e78c8ffd7db23d96
Parents: e18872c
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Jul 21 19:42:09 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Jul 21 19:42:09 2015 -0700
----------------------------------------------------------------------
.../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 3 ++-
.../cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 3 ++-
modules/core/src/main/resources/META-INF/classnames.properties | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/825fbc9e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 80c97d5..7100d3d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -352,7 +352,8 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void>
if (mappingKey.part >= 0) {
Object topic = CU.partitionMessageTopic(cctx, mappingKey.part, false);
- cctx.io().sendOrderedMessage(mappingKey.nodeId, topic, req, cctx.ioPolicy(), 0);
+ cctx.io().sendOrderedMessage(mappingKey.nodeId, topic, req, cctx.ioPolicy(),
+ 2 * cctx.gridConfig().getNetworkTimeout());
}
else {
assert mappingKey.part == -1;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/825fbc9e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 9e46806..ef3a18b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -1145,7 +1145,8 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
if (mappingKey.part >= 0) {
Object topic = CU.partitionMessageTopic(cctx, mappingKey.part, true);
- cctx.io().sendOrderedMessage(mappingKey.nodeId, topic, req, cctx.ioPolicy(), 0);
+ cctx.io().sendOrderedMessage(mappingKey.nodeId, topic, req, cctx.ioPolicy(),
+ 2 * cctx.gridConfig().getNetworkTimeout());
}
else {
assert mappingKey.part == -1;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/825fbc9e/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index b3eed46..df4873a 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -185,6 +185,7 @@ org.apache.ignite.internal.GridTopic$T5
org.apache.ignite.internal.GridTopic$T6
org.apache.ignite.internal.GridTopic$T7
org.apache.ignite.internal.GridTopic$T8
+org.apache.ignite.internal.GridTopic$T9
org.apache.ignite.internal.IgniteComponentType
org.apache.ignite.internal.IgniteComputeImpl
org.apache.ignite.internal.IgniteDeploymentCheckedException