ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: tmp test
Date Fri, 17 Mar 2017 11:03:40 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4705-1 [created] 6f70c5333


tmp test


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f70c533
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f70c533
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f70c533

Branch: refs/heads/ignite-4705-1
Commit: 6f70c5333346550f5ab82f18da1f8e3573d78c08
Parents: 9020d12
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Mar 17 14:03:31 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Mar 17 14:03:31 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    |  2 +-
 .../GridDhtAtomicAbstractUpdateFuture.java      |  2 ++
 .../dht/atomic/GridDhtAtomicCache.java          | 22 ++++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6f70c533/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 2a6706e..496287f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1154,7 +1154,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
                             String id = U.id8(localNode().id());
 
                             String msg = NL +
-                                "Metrics for local node (to disable set 'metricsLogFrequency'
to 0)" + NL +
+                                "Metrics for local node (to disable set 'metricsLogFrequency'
to 0), futs=" + ctx.cache().context().mvcc().atomicFuturesCount() + NL +
                                 "    ^-- Node [id=" + id + ", name=" + name() + ", uptime="
+ getUpTimeFormatted() + "]" + NL +
                                 "    ^-- H/N/C [hosts=" + hosts + ", nodes=" + nodes + ",
CPUs=" + cpus + "]" + NL +
                                 "    ^-- CPU [cur=" + dblFmt.format(cpuLoadPct) + "%, avg="
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/6f70c533/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
index 5ff5aa4..770a8d8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java
@@ -388,6 +388,8 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte
 
         if (needReplyToNear)
             completionCb.apply(updateReq, updateRes);
+
+        onDone();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/6f70c533/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index c20ed48..66af552 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -3205,17 +3205,17 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
         if (nearRes != null)
             sendDhtNearResponse(req, nearRes);
 
-        if (dhtRes == null && req.replyWithoutDelay()) {
-            dhtRes = new GridDhtAtomicUpdateResponse(ctx.cacheId(),
-                req.partition(),
-                req.futureId(),
-                ctx.deploymentEnabled());
-        }
-
-        if (dhtRes != null)
-            sendDhtPrimaryResponse(nodeId, req, dhtRes);
-        else
-            sendDeferredUpdateResponse(req.partition(), nodeId, req.futureId());
+//        if (dhtRes == null && req.replyWithoutDelay()) {
+//            dhtRes = new GridDhtAtomicUpdateResponse(ctx.cacheId(),
+//                req.partition(),
+//                req.futureId(),
+//                ctx.deploymentEnabled());
+//        }
+//
+//        if (dhtRes != null)
+//            sendDhtPrimaryResponse(nodeId, req, dhtRes);
+//        else
+//            sendDeferredUpdateResponse(req.partition(), nodeId, req.futureId());
     }
 
     /**


Mime
View raw message