You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2024/10/07 15:49:25 UTC

(accumulo) branch main updated (e9e8de3855 -> 9a460ce3a8)

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


    from e9e8de3855 fixes bug in CompactionJobPriorityQueue (#4946)
     add bf3e480662 removes unused property (#4948)
     add 66229f5f76 fixes bug with waitForBalance signaling (#4947)
     add 93e44ec2ad limit thread and add queue to monitor append (#4879)
     add c57baa93ab Merge branch '2.1' into 3.1
     new 9a460ce3a8 Merge branch '3.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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(-)


(accumulo) 01/01: Merge branch '3.1'

Posted by kt...@apache.org.
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 <kt...@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) {