You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dg...@apache.org on 2019/01/11 13:38:55 UTC
[ignite] branch master updated: IGNITE-9859 Add debug logging on
refreshPartitions cause - Fixes #5801.
This is an automated email from the ASF dual-hosted git repository.
dgovorukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new bdda70c IGNITE-9859 Add debug logging on refreshPartitions cause - Fixes #5801.
bdda70c is described below
commit bdda70c854a19bb99ec8f8d8bd23ad68565fd668
Author: Max Shonichev <ms...@yandex.ru>
AuthorDate: Tue Dec 25 14:01:50 2018 +0300
IGNITE-9859 Add debug logging on refreshPartitions cause - Fixes #5801.
Signed-off-by: Dmitriy Govorukhin <dm...@gmail.com>
---
.../cache/GridCachePartitionExchangeManager.java | 32 ++++++++++++++++++++--
.../internal/processors/cache/WalStateManager.java | 3 ++
.../preloader/GridDhtPartitionsExchangeFuture.java | 7 ++++-
3 files changed, 38 insertions(+), 4 deletions(-)
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 d2304d4..525c41a 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
@@ -44,6 +44,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.affinity.AffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
@@ -1104,6 +1105,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
public void refreshPartitions(@NotNull Collection<CacheGroupContext> grps) {
// TODO https://issues.apache.org/jira/browse/IGNITE-6857
if (cctx.snapshot().snapshotOperationInProgress()) {
+ if (log.isDebugEnabled())
+ log.debug("Schedule resend parititions due to snapshot in progress");
+
scheduleResendPartitions();
return;
@@ -1709,8 +1713,12 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
}
}
- if (!cctx.kernalContext().clientNode() && updated)
+ if (!cctx.kernalContext().clientNode() && updated) {
+ if (log.isDebugEnabled())
+ log.debug("Refresh partitions due to topology update");
+
refreshPartitions();
+ }
boolean hasMovingParts = false;
@@ -2973,8 +2981,12 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
changed |= grp.topology().afterExchange(exchFut);
}
- if (!cctx.kernalContext().clientNode() && changed && !hasPendingServerExchange())
+ if (!cctx.kernalContext().clientNode() && changed && !hasPendingServerExchange()) {
+ if (log.isDebugEnabled())
+ log.debug("Refresh partitions due to mapping was changed");
+
refreshPartitions();
+ }
}
// Schedule rebalance if force rebalance or force reassign occurs.
@@ -3137,12 +3149,22 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
/** Timeout ID. */
private final IgniteUuid timeoutId = IgniteUuid.randomUuid();
+ /** Logger. */
+ protected final IgniteLogger log;
+
/** Timeout start time. */
private final long createTime = U.currentTimeMillis();
/** Started flag. */
private AtomicBoolean started = new AtomicBoolean();
+ /**
+ *
+ */
+ private ResendTimeoutObject() {
+ this.log = cctx.logger(getClass());
+ }
+
/** {@inheritDoc} */
@Override public IgniteUuid timeoutId() {
return timeoutId;
@@ -3161,8 +3183,12 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
return;
try {
- if (started.compareAndSet(false, true))
+ if (started.compareAndSet(false, true)) {
+ if (log.isDebugEnabled())
+ log.debug("Refresh partitions due to scheduled timeout");
+
refreshPartitions();
+ }
}
finally {
busyLock.readLock().unlock();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
index 83c548e..9d962db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
@@ -514,6 +514,9 @@ public class WalStateManager extends GridCacheSharedManagerAdapter {
}
+ if (log.isDebugEnabled())
+ log.debug("Refresh partitions due to rebalance finished");
+
cctx.exchange().refreshPartitions();
}
});
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 b53fe99..bce239c 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
@@ -2118,8 +2118,13 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
- if (!grpToRefresh.isEmpty())
+ if (!grpToRefresh.isEmpty()){
+ if (log.isDebugEnabled())
+ log.debug("Refresh partitions due to partitions initialized when affinity ready [" +
+ grpToRefresh.stream().map(CacheGroupContext::name).collect(Collectors.toList()) + ']');
+
cctx.exchange().refreshPartitions(grpToRefresh);
+ }
}
for (GridCacheContext cacheCtx : cctx.cacheContexts()) {