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/11/03 14:34:49 UTC
[2/2] ignite git commit: 1093
1093
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d208fa8e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d208fa8e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d208fa8e
Branch: refs/heads/ignite-1093-3
Commit: d208fa8ef5531382960d28d02a18e8735911fe98
Parents: c2195b5
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Nov 3 16:34:36 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Nov 3 16:34:36 2015 +0300
----------------------------------------------------------------------
.../cache/GridCachePartitionExchangeManager.java | 4 ++++
.../processors/cache/GridCachePreloader.java | 5 +++++
.../processors/cache/GridCachePreloaderAdapter.java | 5 +++++
.../dht/preloader/GridDhtPartitionSupplier.java | 16 ++++++++++++++++
.../distributed/dht/preloader/GridDhtPreloader.java | 5 +++++
5 files changed, 35 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d208fa8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index e8f1a61..2bf68bd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -1059,6 +1059,10 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
}
dumpPendingObjects();
+
+ for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
+ cacheCtx.preloader().dumpDebugInfo();
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d208fa8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
index bab3b32..1658a89 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
@@ -183,4 +183,9 @@ public interface GridCachePreloader {
* @param topVer Topology version.
*/
public void onTopologyChanged(AffinityTopologyVersion topVer);
+
+ /**
+ * Dumps debug information.
+ */
+ public void dumpDebugInfo();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d208fa8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
index d465950..9c0e9f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
@@ -178,4 +178,9 @@ public class GridCachePreloaderAdapter implements GridCachePreloader {
@Override public void onTopologyChanged(AffinityTopologyVersion topVer) {
// No-op.
}
+
+ /** {@inheritDoc} */
+ @Override public void dumpDebugInfo() {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d208fa8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
index 39559d4..865bad8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
@@ -1015,4 +1015,20 @@ class GridDhtPartitionSupplier {
return false;
}
}
+
+ /**
+ * Dumps debug information.
+ */
+ public void dumpDebugInfo() {
+ synchronized (scMap) {
+ if (!scMap.isEmpty()) {
+ U.warn(log, "Rebalancing supplier reserved following partitions:");
+
+ for (SupplyContext sc : scMap.values()) {
+ if (sc.loc != null)
+ U.warn(log, ">>> " + sc.loc);
+ }
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d208fa8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 84da3d3..8f2b19d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -752,6 +752,11 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
}
}
+ /** {@inheritDoc} */
+ @Override public void dumpDebugInfo() {
+ supplier.dumpDebugInfo();
+ }
+
/**
* Adds future to future map.
*