This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 9a460ce3a8f506bbde2006954519a48f4aac6a15
Merge: e9e8de3855 c57baa93ab
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Oct 7 15:48:33 2024 +0000
Merge branch '3.1'
assemble/conf/log4j2-service.properties | 3 +
.../org/apache/accumulo/core/conf/Property.java | 5 -
pom.xml | 8 +-
.../java/org/apache/accumulo/manager/Manager.java | 8 +-
.../util/logging/AccumuloMonitorAppender.java | 130 +++++++++++++++++++--
5 files changed, 134 insertions(+), 20 deletions(-)
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 7fd30d6003,16a215bd8b..8118b2d57c
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -921,7 -1034,8 +921,8 @@@ public class Manager extends AbstractSe
long wait = 0;
long totalMigrationsOut = 0;
final Map<DataLevel,Set<KeyExtent>> partitionedMigrations =
- partitionMigrations(migrationsSnapshot());
+ partitionMigrations(migrationsSnapshot().keySet());
+ int levelsCompleted = 0;
for (DataLevel dl : DataLevel.values()) {
if (dl == DataLevel.USER && tabletsNotHosted > 0) {
