ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-4705
Date Mon, 13 Mar 2017 15:03:36 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4705-2 fc3cc0abb -> 27bf9d5a0


ignite-4705


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

Branch: refs/heads/ignite-4705-2
Commit: 27bf9d5a013013d5485e10ebceb561c2fdfc9ee4
Parents: fc3cc0a
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Mar 13 18:03:28 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Mar 13 18:03:28 2017 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/IgnitionEx.java  |  5 ++--
 .../managers/communication/GridIoManager.java   |  5 +---
 .../processors/cache/GridCacheIoManager.java    |  3 ---
 .../GridDhtAtomicAbstractUpdateFuture.java      |  2 +-
 .../dht/atomic/GridDhtAtomicCache.java          | 25 +++++---------------
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  1 -
 .../GridNearAtomicSingleUpdateFuture.java       |  2 +-
 7 files changed, 12 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/27bf9d5a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 2d35cdb..f6cfe12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1703,8 +1703,9 @@ public class IgnitionEx {
 
             sysExecSvc.allowCoreThreadTimeOut(true);
 
-            if (cfg.getStripedPoolSize() > 0)
-                stripedExecSvc = new StripedExecutor(cfg.getStripedPoolSize(), cfg.getIgniteInstanceName(),
"sys", log);
+            validateThreadPoolSize(cfg.getStripedPoolSize(), "stripedPool");
+
+            stripedExecSvc = new StripedExecutor(cfg.getStripedPoolSize(), cfg.getIgniteInstanceName(),
"sys", log);
 
             // Note that since we use 'LinkedBlockingQueue', number of
             // maximum threads has no effect.

http://git-wip-us.apache.org/repos/asf/ignite/blob/27bf9d5a/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 0c0dbf7..23738d7 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
@@ -818,10 +818,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             return;
         }
 
-        if (ctx.config().getStripedPoolSize() > 0 &&
-            plc == GridIoPolicy.SYSTEM_POOL &&
-            msg.partition() != Integer.MIN_VALUE
-            ) {
+        if (plc == GridIoPolicy.SYSTEM_POOL && msg.partition() != Integer.MIN_VALUE)
{
             ctx.getStripedExecutorService().execute(msg.partition(), c);
 
             return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/27bf9d5a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index c4c0753..1cd8fbe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -378,9 +378,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter
{
             if (depEnabled)
                 cctx.deploy().ignoreOwnership(true);
 
-//            if (!cacheMsg.partitionExchangeMessage())
-//                log.info("Message [from=" + nodeId + ", msg=" + cacheMsg + ']');
-
             unmarshall(nodeId, cacheMsg);
 
             if (cacheMsg.classError() != null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/27bf9d5a/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 f2d2153..5ff5aa4 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
@@ -80,7 +80,7 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte
 
     /** Future version. */
     @GridToStringInclude
-    protected final Long futId;
+    protected final long futId;
 
     /** Update request. */
     final GridNearAtomicAbstractUpdateRequest updateReq;

http://git-wip-us.apache.org/repos/asf/ignite/blob/27bf9d5a/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 fccc9ba..c20ed48 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
@@ -3293,29 +3293,16 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
      */
     private void sendDeferredUpdateResponse(UUID primaryId, GridDhtAtomicDeferredUpdateResponse
msg) {
         try {
-            //ctx.kernalContext().gateway().readLock();
+            GridTimeoutObject timeoutSnd = msg.timeoutSender();
 
-            try {
-                GridTimeoutObject timeoutSnd = msg.timeoutSender();
-
-                if (timeoutSnd != null)
-                    ctx.time().removeTimeoutObject(timeoutSnd);
+            if (timeoutSnd != null)
+                ctx.time().removeTimeoutObject(timeoutSnd);
 
-                ctx.io().send(primaryId, msg, ctx.ioPolicy());
+            ctx.io().send(primaryId, msg, ctx.ioPolicy());
 
-                if (msgLog.isDebugEnabled()) {
-                    msgLog.debug("Sent deferred DHT update response [futIds=" + msg.futureIds()
+
-                        ", node=" + primaryId + ']');
-                }
-            }
-            finally {
-               // ctx.kernalContext().gateway().readUnlock();
-            }
-        }
-        catch (IllegalStateException ignored) {
             if (msgLog.isDebugEnabled()) {
-                msgLog.debug("Failed to send deferred DHT update response, node is stopping
[" +
-                    "futIds=" + msg.futureIds() + ", node=" + primaryId + ']');
+                msgLog.debug("Sent deferred DHT update response [futIds=" + msg.futureIds()
+
+                    ", node=" + primaryId + ']');
             }
         }
         catch (ClusterTopologyCheckedException ignored) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/27bf9d5a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 0239f7f..ab7aa6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -35,7 +35,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
 import org.apache.ignite.plugin.extensions.communication.MessageReader;
 import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * DHT atomic cache backup update response.

http://git-wip-us.apache.org/repos/asf/ignite/blob/27bf9d5a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index 62e8901..930c4af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -479,7 +479,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda
 
     /** {@inheritDoc} */
     @Override protected void map(AffinityTopologyVersion topVer) {
-        Long futId = cctx.mvcc().atomicFutureId();
+        long futId = cctx.mvcc().atomicFutureId();
 
         Exception err = null;
         PrimaryRequestState reqState0 = null;


Mime
View raw message