Skip to content

Commit

Permalink
Fixes a few minor issues (apache#282)
Browse files Browse the repository at this point in the history
Ran into a few problems when trying to run a small 2.1.4-SNAPSHOT
cluster.  Fixed the following problems.

 * When build in accumulo-testing use the version of accumulo on the
   cluster.
 * Update the cluster yaml file to align with the latest changes in
   2.1.3.
 * Handle a property that was recently deprecated in 3.1.0-SNAPSHOT.
 * Fix an issue with empty continuous ingest table config.
  • Loading branch information
keith-turner authored Sep 16, 2024
1 parent 813d336 commit 1f8eb44
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,8 @@ compaction:
# 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
Original file line number Diff line number Diff line change
Expand Up @@ -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

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ private static Map<String,String> getProps(ContinuousEnv env, String propType) {
String[] propArray = env.getTestProperty(propType).split(" ");
Map<String,String> 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]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ static Setting s(Property property, long min, long max) {
final Property TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN_deprecated =
Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN;

@SuppressWarnings("deprecation")
final Property TABLE_MINC_COMPACT_IDLETIME_deprecated = Property.TABLE_MINC_COMPACT_IDLETIME;

// @formatter:off
final Setting[] settings = {
s(Property.TSERV_BLOOM_LOAD_MAXCONCURRENT, 1, 10),
Expand Down Expand Up @@ -103,7 +106,7 @@ 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(TABLE_MINC_COMPACT_IDLETIME_deprecated, 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),
Expand Down

0 comments on commit 1f8eb44

Please sign in to comment.