ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject incubator-ignite git commit: #IGNITE-80 Debug
Date Tue, 14 Apr 2015 02:43:42 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-80 7668bde20 -> 9b9b48a57


#IGNITE-80 Debug


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

Branch: refs/heads/ignite-80
Commit: 9b9b48a574106663166c21596bc204cc9441a9e2
Parents: 7668bde
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Mon Apr 13 19:43:35 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Mon Apr 13 19:43:35 2015 -0700

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheMvccManager.java       | 2 +-
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java        | 7 +++++++
 .../ignite/internal/util/future/GridCompoundFuture.java       | 5 +++--
 3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b9b48a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index a569e56..5472955 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@ -567,7 +567,7 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter
{
     /**
      * @return Collection of all locked entries.
      */
-    private Collection<GridDistributedCacheEntry> locked() {
+    public Collection<GridDistributedCacheEntry> locked() {
         return F.concat(false, locked.values(), nearLocked.values());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b9b48a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 0c178fc..5e2da1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -695,6 +695,11 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
 
         for (GridCacheFuture<?> fut : cctx.mvcc().activeFutures())
             U.warn(log, ">>> " + fut);
+
+        U.warn(log, "Locally locked entries:");
+
+        for (GridCacheEntryEx entry : cctx.mvcc().locked())
+            U.warn(log, ">>> " + entry);
     }
 
     /**
@@ -1240,6 +1245,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
 
                         GridDebug.dumpWithReset(log);
 
+                        dumpPendingObjects();
+
                         U.warn(log,
                             "Retrying preload partition exchange due to timeout [done=" +
isDone() +
                                 ", dummy=" + dummy + ", exchId=" + exchId + ", rcvdIds="
+ F.id8s(rcvdIds) +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b9b48a5/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index a8a545d..0aa2aa2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -286,7 +286,8 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R>
{
                     @Override public String apply(IgniteInternalFuture<T> f) {
                         return Boolean.toString(f.isDone());
                     }
-                })
+                }),
+            ", cls", getClass().getSimpleName()
         );
     }
 
@@ -359,7 +360,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R>
{
 
         /** {@inheritDoc} */
         @Override public String toString() {
-            return "Compound future listener: " + GridCompoundFuture.this;
+            return "Compound future listener.";
         }
     }
 }


Mime
View raw message