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-5075
Date Wed, 17 May 2017 19:23:51 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5075 16397628a -> 88b094485


ignite-5075


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

Branch: refs/heads/ignite-5075
Commit: 88b094485d6a54d4a18d1960f0dc53cfe0372ea8
Parents: 1639762
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 17 22:23:40 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 17 22:23:40 2017 +0300

----------------------------------------------------------------------
 .../internal/managers/communication/GridIoManager.java    | 10 +++++++---
 .../processors/cache/CacheGroupInfrastructure.java        |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/88b09448/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 fc94667..9be29dc 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
@@ -1064,10 +1064,14 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             pools.poolForPolicy(plc).execute(c);
         }
         catch (RejectedExecutionException e) {
-            U.error(log, "Failed to process regular message due to execution rejection. Will
attempt to process " +
-                "message in the listener thread instead.", e);
+            if (!ctx.isStopping()) {
+                U.error(log, "Failed to process regular message due to execution rejection.
Will attempt to process " +
+                        "message in the listener thread instead.", e);
 
-            c.run();
+                c.run();
+            }
+            else if (log.isDebugEnabled())
+                log.debug("Failed to process regular message due to execution rejection:
" + msg);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/88b09448/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
index d4d54c7..addcfcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
@@ -531,6 +531,8 @@ public class CacheGroupInfrastructure {
      *
      */
     public void onKernalStop() {
+        aff.cancelFutures(new IgniteCheckedException("Failed to wait for topology update,
node is stopping."));
+
         preldr.onKernalStop();
 
         offheapMgr.onKernalStop();


Mime
View raw message