You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/07/04 10:02:32 UTC
[26/50] ignite git commit: ignite-2.1.2 Limit amount of debug logging
ignite-2.1.2 Limit amount of debug logging
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6972e95
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6972e95
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6972e95
Branch: refs/heads/master
Commit: d6972e95367d93c1015b6bab8dd4dc78ae2fc1e6
Parents: 764eeea
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jun 28 11:30:47 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 28 11:30:47 2017 +0300
----------------------------------------------------------------------
.../affinity/GridAffinityAssignmentCache.java | 14 ++++++++---
.../GridCachePartitionExchangeManager.java | 25 +++++++++++++++-----
2 files changed, 30 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6972e95/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index b478462..71ec3ea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -88,7 +88,7 @@ public class GridAffinityAssignmentCache {
private final AtomicReference<GridAffinityAssignment> head;
/** Ready futures. */
- private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts = new ConcurrentHashMap8<>();
+ private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts = new ConcurrentSkipListMap<>();
/** Log. */
private final IgniteLogger log;
@@ -434,10 +434,18 @@ public class GridAffinityAssignmentCache {
*/
public void dumpDebugInfo() {
if (!readyFuts.isEmpty()) {
- U.warn(log, "Pending affinity ready futures [grp=" + cacheOrGrpName + ", lastVer=" + lastVersion() + "]:");
+ U.warn(log, "First 3 pending affinity ready futures [grp=" + cacheOrGrpName +
+ ", total=" + readyFuts.size() +
+ ", lastVer=" + lastVersion() + "]:");
- for (AffinityReadyFuture fut : readyFuts.values())
+ int cnt = 0;
+
+ for (AffinityReadyFuture fut : readyFuts.values()) {
U.warn(log, ">>> " + fut);
+
+ if (++cnt == 3)
+ break;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6972e95/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 322da18..19d99a4 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
@@ -154,7 +154,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
private final AtomicReference<GridDhtTopologyFuture> lastFinishedFut = new AtomicReference<>();
/** */
- private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts = new ConcurrentHashMap8<>();
+ private final ConcurrentMap<AffinityTopologyVersion, AffinityReadyFuture> readyFuts =
+ new ConcurrentSkipListMap<>();
/** */
private final ConcurrentSkipListMap<AffinityTopologyVersion, IgnitePair<IgniteProductVersion>> nodeVers =
@@ -1402,10 +1403,16 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
exchWorker.dumpExchangeDebugInfo();
if (!readyFuts.isEmpty()) {
- U.warn(diagnosticLog, "Pending affinity ready futures:");
+ U.warn(diagnosticLog, "First 5 pending affinity ready futures [total=" + readyFuts.size() + ']');
+
+ int cnt = 0;
- for (AffinityReadyFuture fut : readyFuts.values())
+ for (AffinityReadyFuture fut : readyFuts.values()) {
U.warn(diagnosticLog, ">>> " + fut);
+
+ if (++cnt == 5)
+ break;
+ }
}
IgniteDiagnosticPrepareContext diagCtx = cctx.kernalContext().cluster().diagnosticEnabled() ?
@@ -1775,11 +1782,17 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
* Dump debug info.
*/
void dumpExchangeDebugInfo() {
- U.warn(log, "Pending exchange futures:");
+ U.warn(log, "First 10 pending exchange futures [total=" + futQ.size() + ']');
- for (CachePartitionExchangeWorkerTask task: futQ) {
- if (isExchangeTask(task))
+ int cnt = 0;
+
+ for (CachePartitionExchangeWorkerTask task : futQ) {
+ if (isExchangeTask(task)) {
U.warn(log, ">>> " + ((GridDhtPartitionsExchangeFuture)task).shortInfo());
+
+ if (++cnt == 10)
+ break;
+ }
}
}