This is an automated email from the ASF dual-hosted git repository. DomGarguilo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit eb98075df6b93c53a68d746e3a9150348a9f72f3 Merge: 0155de056a 1bbee0531f Author: Dom G <[email protected]> AuthorDate: Thu Sep 3 11:44:49 2026 -0400 Merge branch '2.1' into main core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 +++- .../main/java/org/apache/accumulo/core/trace/TraceAttributes.java | 2 ++ .../src/main/java/org/apache/accumulo/tserver/tablet/KVEntry.java | 8 +++++++- .../main/java/org/apache/accumulo/tserver/tablet/TabletBase.java | 3 +++ .../main/java/org/apache/accumulo/test/tracing/ScanTracingIT.java | 8 ++++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java index b148c1a60e,42c6f6b3a0..c8c6830aab --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@@ -1093,16 -1211,10 +1093,18 @@@ public enum Property "Options for the table scan dispatcher.", "2.0.0"), TABLE_SCAN_MAXMEM("table.scan.max.memory", "512k", PropertyType.BYTES, "The maximum amount of memory that will be used to cache results of a client query/scan. " - + "Once this limit is reached, the buffered data is sent to the client.", + + "Once this limit is reached, the buffered data is sent to the client. This is an " + + "estimate of heap usage and includes per entry object overhead, so it will always " + + "exceed the size of the key value data actually sent to the client.", "1.3.5"), + TABLE_BULK_MAX_TABLETS("table.bulk.max.tablets", "100", PropertyType.COUNT, + "The maximum number of tablets allowed for one bulk import file. Value of 0 is Unlimited.", + "2.1.0"), + TABLE_BULK_MAX_TABLET_FILES("table.bulk.max.tablet.files", "100", PropertyType.COUNT, + "The maximum number of files a bulk import can add to a single tablet. When this property " + + "is exceeded for any tablet the entire bulk import operation will fail before making any " + + "changes. Value of 0 is unlimited.", + "4.0.0"), TABLE_SHUFFLE_SOURCES("table.shuffle.sources", "false", PropertyType.BOOLEAN, "Shuffle the opening order for Rfiles to reduce thread contention on file open operations.", "2.1.5"), diff --cc test/src/main/java/org/apache/accumulo/test/tracing/ScanTracingIT.java index 97bc3c1f15,72c791fac4..71359a408f --- a/test/src/main/java/org/apache/accumulo/test/tracing/ScanTracingIT.java +++ b/test/src/main/java/org/apache/accumulo/test/tracing/ScanTracingIT.java @@@ -237,13 -233,12 +239,15 @@@ class ScanTracingIT extends Configurabl double colMultiplier = 10.0 / expectedColumns; assertClose((long) (results.scanSize * colMultiplier), stats.getBytesRead(), .05); assertClose(results.scanSize, stats.getBytesReturned(), .05); + assertEquals(stats.getBytesReturned() + KVEntry.MEMORY_OVERHEAD * stats.getEntriesReturned(), + stats.getMemoryUsed(), stats::toString); if (secondScanFitsInCache && i == 1) { assertEquals(0, stats.getFileBytesRead(), stats::toString); + assertEquals(0, stats.getDataCacheMisses(), stats::toString); } else { - assertClose((long) (stats.getBytesRead() * .005), stats.getFileBytesRead(), .2); + assertTrue( + stats.getFileBytesRead() > 0 && stats.getFileBytesRead() < stats.getBytesRead() * .01, + stats::toString); } if (cacheData) { assertEquals(0, stats.getDataCacheBypasses(), stats::toString);
