This is an automated email from the ASF dual-hosted git repository. ddanielr pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push: new 69cbe71c51 Adds debug and warn messages for migrations (#4592) 69cbe71c51 is described below commit 69cbe71c51803cb27401d9533188b36781a8c5d4 Author: Daniel Roberts <ddani...@gmail.com> AuthorDate: Fri Jul 5 16:38:32 2024 -0400 Adds debug and warn messages for migrations (#4592) * Adds debug and warn messages for migrations Adds a debug message for better identification of migration issues. Adds a warn message when a table exceeds the migration max. Uses the EscalatingLogger to throw a warn level message and drops the default message to debug level --- .../accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java | 10 ++++++++-- .../src/main/java/org/apache/accumulo/manager/Manager.java | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java b/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java index fd64c88f39..040a9bc49f 100644 --- a/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java +++ b/core/src/main/java/org/apache/accumulo/core/spi/balancer/HostRegexTableLoadBalancer.java @@ -23,6 +23,7 @@ import static java.util.concurrent.TimeUnit.HOURS; import java.net.InetAddress; import java.net.UnknownHostException; import java.security.SecureRandom; +import java.time.Duration; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -45,6 +46,7 @@ import org.apache.accumulo.core.conf.ConfigurationTypeHelper; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.data.TabletId; +import org.apache.accumulo.core.logging.ConditionalLogger.EscalatingLogger; import org.apache.accumulo.core.manager.balancer.AssignmentParamsImpl; import org.apache.accumulo.core.manager.balancer.BalanceParamsImpl; import org.apache.accumulo.core.manager.balancer.TServerStatusImpl; @@ -58,6 +60,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.event.Level; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -97,6 +100,8 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer { private static final String PROP_PREFIX = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey(); private static final Logger LOG = LoggerFactory.getLogger(HostRegexTableLoadBalancer.class); + private static final Logger MIGRATIONS_LOGGER = + new EscalatingLogger(LOG, Duration.ofMinutes(5), 1000, Level.WARN); public static final String HOST_BALANCER_PREFIX = PROP_PREFIX + "balancer.host.regex."; public static final String HOST_BALANCER_OOB_CHECK_KEY = PROP_PREFIX + "balancer.host.regex.oob.period"; @@ -518,6 +523,8 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer { migrationsOut.addAll(newMigrations); if (migrationsOut.size() >= myConf.maxTServerMigrations) { + MIGRATIONS_LOGGER.debug("Table {} migration size : {} is over tserver migration max: {}", + tableName, migrationsOut.size(), myConf.maxTServerMigrations); break; } } @@ -526,8 +533,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer { migrationsFromLastPass.put(migration.getTablet(), migration); } - LOG.info("Migrating {} tablets for balance.", migrationsOut.size()); - LOG.debug("Tablets currently migrating: {}", migrationsOut); + LOG.info("Migrating tablets for balance: {}", migrationsOut); return minBalanceTime; } diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java index 406178d1de..b28fca7750 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java @@ -338,6 +338,10 @@ public class Manager extends AbstractServer int result = 0; for (TabletGroupWatcher watcher : watchers) { for (TableCounts counts : watcher.getStats().values()) { + log.debug( + "Watcher: {}: Assigned Tablets: {}, Dead tserver assignments: {}, Suspended Tablets: {}", + watcher.getName(), counts.assigned(), counts.assignedToDeadServers(), + counts.suspended()); result += counts.assigned() + counts.hosted(); } }