ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] ignite git commit: ignite-1.5 Added more information for warning message.
Date Thu, 10 Dec 2015 10:24:41 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1.5 d2008c53d -> 18fef56c2


ignite-1.5 Added more information for warning message.


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

Branch: refs/heads/ignite-1.5
Commit: 09c9a0bcc9c608628ee9909eed0854c0a4be79aa
Parents: f24749e
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Dec 10 13:23:55 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Dec 10 13:23:55 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheIoManager.java       |  5 ++++-
 .../processors/cache/GridCacheProcessor.java       | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/09c9a0bc/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 9a391e5..0aa8b1b 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
@@ -192,7 +192,10 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter
{
             }
             else {
                 U.warn(log, "Received message without registered handler (will ignore) [msg="
+ cacheMsg +
-                    ", nodeId=" + nodeId + ']');
+                    ", nodeId=" + nodeId +
+                    ", locTopVer=" + cctx.exchange().readyAffinityVersion() +
+                    ", msgTopVer=" + cacheMsg.topologyVersion() +
+                    ", cacheDesc=" + cctx.cache().cacheDescriptor(cacheMsg.cacheId()) + ']');
             }
 
             return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/09c9a0bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 3bd9466..84b9960 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -3053,6 +3053,23 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     }
 
     /**
+     * @param cacheId Cache ID.
+     * @return Cache descriptor.
+     */
+    @Nullable public DynamicCacheDescriptor cacheDescriptor(int cacheId) {
+        for (DynamicCacheDescriptor cacheDesc : registeredCaches.values()) {
+            CacheConfiguration ccfg = cacheDesc.cacheConfiguration();
+
+            assert ccfg != null : cacheDesc;
+
+            if (CU.cacheId(ccfg.getName()) == cacheId)
+                return cacheDesc;
+        }
+
+        return null;
+    }
+
+    /**
      * @param cacheCfg Cache configuration template.
      * @throws IgniteCheckedException If failed.
      */


Mime
View raw message