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-5566 TcpCommunicationSpi: stop server from onContextDestroyed
Date Wed, 21 Jun 2017 09:54:35 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5566 [created] 097ab4d60


ignite-5566 TcpCommunicationSpi: stop server from onContextDestroyed


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

Branch: refs/heads/ignite-5566
Commit: 097ab4d60f546a8326cc932605e6c08d36a1e7af
Parents: b16f725
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Jun 21 12:54:22 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Jun 21 12:54:22 2017 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java      | 2 +-
 .../ignite/spi/communication/tcp/TcpCommunicationSpi.java     | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/097ab4d6/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 52f007a..71cdaad 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
@@ -1870,7 +1870,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
                         if (dhtFut != null) {
                             if (req.writeSynchronizationMode() == PRIMARY_SYNC
                                 // To avoid deadlock disable back-pressure for sender data
node.
-                                && !ctx.discovery().cacheAffinityNode(ctx.discovery().node(nodeId),
ctx.name())
+                                && !ctx.discovery().cacheAffinityNode(node, ctx.name())
                                 && !dhtFut.isDone()) {
                                 final IgniteRunnable tracker = GridNioBackPressureControl.threadTracker();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/097ab4d6/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 5d74a80..11c2418 100755
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2332,10 +2332,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements
Communicati
 
         unregisterMBean();
 
-        // Stop TCP server.
-        if (nioSrvr != null)
-            nioSrvr.stop();
-
         U.interrupt(commWorker);
         U.join(commWorker, log);
 
@@ -2377,6 +2373,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter implements
Communicati
         if (connectGate != null)
             connectGate.stopped();
 
+        if (nioSrvr != null)
+            nioSrvr.stop();
+
         // Force closing.
         for (GridCommunicationClient[] clients0 : clients.values()) {
             for (GridCommunicationClient client : clients0) {


Mime
View raw message