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

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


The following commit(s) were added to refs/heads/main by this push:
     new 45297287b8 sets default limits on bulk imports files (#5149)
45297287b8 is described below

commit 45297287b84b9900877df50e451a8c6806509c90
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Mon Dec 9 06:47:59 2024 -0500

    sets default limits on bulk imports files (#5149)
    
    * sets default limits on bulk imports files
    
    fixes #5138
    
    * fix property description
---
 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 11 +++++------
 .../java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 881ff857cb..122c7f414b 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -926,13 +926,12 @@ public enum Property {
       "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.",
       "1.3.5"),
-  TABLE_BULK_MAX_TABLETS("table.bulk.max.tablets", "0", PropertyType.COUNT,
-      "The maximum number of tablets allowed for one bulk import file. Value 
of 0 is Unlimited. "
-          + "This property is only enforced in the new bulk import API.",
+  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", "0", 
PropertyType.COUNT,
+  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 any making "
+          + "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_FILE_TYPE("table.file.type", RFile.EXTENSION, 
PropertyType.FILENAME_EXT,
@@ -969,7 +968,7 @@ public enum Property {
           + "to 0 will make it default to tserver.scan.files.open.max-1, this 
will prevent a tablet"
           + " from having more RFiles than can be opened by a scan.",
       "1.4.0"),
-  TABLE_FILE_PAUSE("table.file.pause", "0", PropertyType.COUNT,
+  TABLE_FILE_PAUSE("table.file.pause", "100", PropertyType.COUNT,
       "When a tablet has more than this number of files, bulk imports and 
minor compactions "
           + "will wait until the tablet has less files before proceeding.  
This will cause back "
           + "pressure on bulk imports and writes to tables when compactions 
are not keeping up. "
diff --git 
a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java 
b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
index 0ba5ae64b1..d13d92237c 100644
--- a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java
@@ -103,6 +103,7 @@ public class CountNameNodeOpsBulkIT extends 
ConfigurableMacBase {
       Map<String,String> props = new HashMap<>();
       props.put(Property.TABLE_MAJC_RATIO.getKey(), "2000");
       props.put(Property.TABLE_FILE_MAX.getKey(), "2000");
+      props.put(Property.TABLE_FILE_PAUSE.getKey(), "2000");
       // splits to slow down bulk import
       SortedSet<Text> splits = new TreeSet<>();
       for (int i = 1; i < 0xf; i++) {

Reply via email to