(accumulo) 01/01: Merge branch 'main' into elasticity

[kturner]

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

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

commit 101ae815f129efaf26cfc95eff0266861b561b49
Merge: e375190772 978f8b9eca
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Tue Feb 13 18:03:52 2024 +0000

    Merge branch 'main' into elasticity

 .../org/apache/accumulo/tserver/log/DfsLogger.java   | 10 ++++++----
 .../accumulo/test/functional/CompactionIT.java       | 20 +++++++++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 896929654a,18fdff715d..a310b1e08c
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@@ -72,10 -79,12 +72,11 @@@ import org.apache.accumulo.core.iterato
  import org.apache.accumulo.core.iterators.IteratorEnvironment;
  import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
  import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 -import org.apache.accumulo.core.iterators.user.AgeOffFilter;
  import org.apache.accumulo.core.iterators.user.GrepIterator;
  import org.apache.accumulo.core.metadata.AccumuloTable;
 +import org.apache.accumulo.core.metadata.RootTable;
  import org.apache.accumulo.core.metadata.StoredTabletFile;
 -import org.apache.accumulo.core.metadata.schema.Ample;
+ import org.apache.accumulo.core.metadata.schema.MetadataSchema;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
  import org.apache.accumulo.core.metadata.schema.TabletMetadata;
@@@ -350,10 -703,8 +351,10 @@@ public class CompactionIT extends Accum
          assertEquals(0, scanner.stream().count());
        }
  
-       var finalCount = countFiles(c);
+       var finalCount = countFiles(c, tableName);
        assertTrue(finalCount <= beforeCount);
 +
 +      
ExternalCompactionTestUtils.assertNoCompactionMetadata(getServerContext(), 
tableName);
      }
    }