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/01 07:46:45 UTC
ignite git commit: ignite-1.5 Should not wait on preloader sync
future for system caches callbacks.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 9dce73888 -> 7ab75a4fa
ignite-1.5 Should not wait on preloader sync future for system caches callbacks.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ab75a4f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ab75a4f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ab75a4f
Branch: refs/heads/ignite-1537
Commit: 7ab75a4fad64fcef1854daf112dd749ed28bdc9f
Parents: 9dce738
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 1 09:08:31 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 1 09:45:39 2015 +0300
----------------------------------------------------------------------
.../near/GridNearOptimisticTxPrepareFuture.java | 10 +++-------
.../cache/portable/CacheObjectBinaryProcessorImpl.java | 5 ++++-
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ab75a4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 77667b28..2ce14af 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -590,13 +590,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
@Override public String toString() {
Collection<String> futs = F.viewReadOnly(futures(), new C1<IgniteInternalFuture<?>, String>() {
@Override public String apply(IgniteInternalFuture<?> f) {
- return "[node=" + ((MiniFuture) f).node().id() +
- ", loc=" + ((MiniFuture) f).node().isLocal() +
- ", done=" + f.isDone() + "]";
- }
- }, new P1<IgniteInternalFuture<GridNearTxPrepareResponse>>() {
- @Override public boolean apply(IgniteInternalFuture<GridNearTxPrepareResponse> fut) {
- return isMini(fut);
+ return "[node=" + ((MiniFuture)f).node().id() +
+ ", loc=" + ((MiniFuture)f).node().isLocal() +
+ ", done=" + f.isDone() + "]";
}
}, new P1<IgniteInternalFuture<GridNearTxPrepareResponse>>() {
@Override public boolean apply(IgniteInternalFuture<GridNearTxPrepareResponse> fut) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ab75a4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
index 1bfdf1c..4bdd7e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectBinaryProcessorImpl.java
@@ -503,7 +503,10 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm
if (clientNode)
return clientMetaDataCache.get(typeId);
else {
- BinaryMetadata meta = metaDataCache.getTopologySafe(new PortableMetadataKey(typeId));
+ BinaryMetadata meta = metaDataCache.localPeek(new PortableMetadataKey(typeId));
+
+ if (meta == null && !metaDataCache.context().preloader().syncFuture().isDone())
+ meta = metaDataCache.getTopologySafe(new PortableMetadataKey(typeId));
return meta != null ? meta.wrap(portableCtx) : null;
}