This is an automated email from the ASF dual-hosted git repository. domgarguilo pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 91db8a98d1 Merge branch '2.1' add f9551d0e6d Ensure compaction duration is not reset on coordinator restart (#4667) new b24f7b8496 Merge remote-tracking branch 'upstream/2.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: .../util/compaction/RunningCompactionInfo.java | 21 ++--- .../compaction/thrift/TCompactionStatusUpdate.java | 104 ++++++++++++++++++++- core/src/main/thrift/compaction-coordinator.thrift | 1 + .../accumulo/server/compaction/CompactionInfo.java | 3 +- .../accumulo/server/compaction/FileCompactor.java | 17 +++- .../org/apache/accumulo/compactor/Compactor.java | 36 +++++-- .../compaction/ExternalCompactionProgressIT.java | 98 ++++++++++++++++++- .../compaction/ExternalDoNothingCompactor.java | 6 ++ 8 files changed, 251 insertions(+), 35 deletions(-)