You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/10 11:24:41 UTC
[1/2] ignite git commit: ignite-1.5 Added more information for
warning message.
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 <sb...@gridgain.com>
Authored: Thu Dec 10 13:23:55 2015 +0300
Committer: sboikov <sb...@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.
*/
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18fef56c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18fef56c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18fef56c
Branch: refs/heads/ignite-1.5
Commit: 18fef56c2036b1d6fba8792522ea79d827e65aac
Parents: 09c9a0b d2008c5
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 10 13:24:30 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 10 13:24:30 2015 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 2 +-
.../portable/PortableClassDescriptor.java | 14 +-
.../portable/BinaryMarshallerSelfTest.java | 198 +++++++++++++++++++
.../GridPortableAffinityKeySelfTest.java | 2 +-
...CacheClientNodeBinaryObjectMetadataTest.java | 2 +-
...ridCacheAffinityRoutingPortableSelfTest.java | 2 +-
6 files changed, 211 insertions(+), 9 deletions(-)
----------------------------------------------------------------------