From 77643ec13ee3bde3520dc922ebd775f48ea0abf0 Mon Sep 17 00:00:00 2001 From: "Dom G." Date: Mon, 7 Oct 2024 11:02:19 -0400 Subject: [PATCH] merge main into elasticity (#283) --- .../modules/config-files/templates/cluster.yaml.tftpl | 7 +++++-- .../modules/config-files/templates/install_sw.sh.tftpl | 2 +- .../apache/accumulo/testing/continuous/CreateTable.java | 3 +++ .../accumulo/testing/randomwalk/concurrent/Config.java | 1 - 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/cluster.yaml.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/cluster.yaml.tftpl index fcbd06d6..547610f0 100644 --- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/cluster.yaml.tftpl +++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/cluster.yaml.tftpl @@ -60,5 +60,8 @@ compactor: # NUM_SSERVERS is set then it will override sservers_per_host. # tservers_per_host: 1 -sservers_per_host: 1 - +sservers_per_host: + - default: 1 +compactors_per_host: + - q1: 1 + - q2: 1 diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl index bb1e1def..38720134 100644 --- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl +++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl @@ -150,7 +150,7 @@ else git clone ${accumulo_testing_repo} accumulo-testing-repo cd accumulo-testing-repo git checkout ${accumulo_testing_branch_name} - ${software_root}/apache-maven/apache-maven-${maven_version}/bin/mvn -ntp clean package -DskipTests -DskipITs + ${software_root}/apache-maven/apache-maven-${maven_version}/bin/mvn -ntp clean package -DskipTests -DskipITs -Daccumulo.version=${accumulo_version} fi # diff --git a/src/main/java/org/apache/accumulo/testing/continuous/CreateTable.java b/src/main/java/org/apache/accumulo/testing/continuous/CreateTable.java index ab952cc2..55d9e691 100644 --- a/src/main/java/org/apache/accumulo/testing/continuous/CreateTable.java +++ b/src/main/java/org/apache/accumulo/testing/continuous/CreateTable.java @@ -108,6 +108,9 @@ private static Map getProps(ContinuousEnv env, String propType) { String[] propArray = env.getTestProperty(propType).split(" "); Map propMap = new HashMap<>(); for (String prop : propArray) { + if (prop.isBlank()) { + continue; + } log.debug("prop: {}", prop); String[] kv = prop.split("="); propMap.put(kv[0], kv[1]); diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java index f6854df4..01125cf3 100644 --- a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java +++ b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java @@ -87,7 +87,6 @@ static Setting s(Property property, long min, long max) { final Setting[] tableSettings = { s(Property.TABLE_MAJC_RATIO, 1, 10), s(Property.TABLE_SPLIT_THRESHOLD, 10 * 1024, 10L * 1024 * 1024 * 1024), - s(Property.TABLE_MINC_COMPACT_IDLETIME, 100, 100 * 60 * 60 * 1000L), s(Property.TABLE_SCAN_MAXMEM, 10 * 1024, 10 * 1024 * 1024), s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE, 10 * 1024, 10 * 1024 * 1024L), s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX, 10 * 1024, 10 * 1024 * 1024L),