[accumulo] 01/01: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git commit a658fa8cbace3381d10555eac51c9f1fbe28b531 Merge: e6026cbdc8 ded409fc46 Author: Christopher Tubbs AuthorDate: Thu Aug 17 19:27:39 2023 -0400 Merge branch '2.1' minicluster/minicluster.properties | 31 -- pom.xml| 8 +-- .../accumulo/shell/format/DeleterFormatter.java| 56 +++--- .../shell/format/DeleterFormatterTest.java | 69 +++--- .../build/create-release-candidate.sh | 10 ++-- 5 files changed, 81 insertions(+), 93 deletions(-) diff --cc pom.xml index a2eecf76d7,033dc81abc..16a6426583 --- a/pom.xml +++ b/pom.xml @@@ -1163,7 -1174,7 +1163,7 @@@ warning true - **/thrift/*.java,**/HelpMojo.java - **/thrift/*.java,**/proto/*.java ++ **/thrift/*.java
[accumulo] branch main updated (e6026cbdc8 -> a658fa8cba)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git from e6026cbdc8 Merge branch '2.1' add 02dec739a3 Add some trivial build updates (#3702) add ded409fc46 Make DeleterFormatter use standard confirm (#3704) new a658fa8cba Merge branch '2.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: minicluster/minicluster.properties | 31 -- pom.xml| 8 +-- .../accumulo/shell/format/DeleterFormatter.java| 56 +++--- .../shell/format/DeleterFormatterTest.java | 69 +++--- .../build/create-release-candidate.sh | 10 ++-- 5 files changed, 81 insertions(+), 93 deletions(-) delete mode 100644 minicluster/minicluster.properties rename assemble/build.sh => src/build/create-release-candidate.sh (98%)
[accumulo] branch 2.1 updated (02dec739a3 -> ded409fc46)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git from 02dec739a3 Add some trivial build updates (#3702) add ded409fc46 Make DeleterFormatter use standard confirm (#3704) No new revisions were added by this update. Summary of changes: .../accumulo/shell/format/DeleterFormatter.java| 56 +++--- .../shell/format/DeleterFormatterTest.java | 69 +++--- 2 files changed, 71 insertions(+), 54 deletions(-)
[accumulo] branch 2.1 updated: Add some trivial build updates (#3702)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 02dec739a3 Add some trivial build updates (#3702)
02dec739a3 is described below
commit 02dec739a319baafcb21f619177251af4d7f2fb7
Author: Christopher Tubbs
AuthorDate: Thu Aug 17 15:18:22 2023 -0400
Add some trivial build updates (#3702)
* Remove unused file
* Update regex to filter out alpha/beta when using versions plugin
* Remove unused HelpMojo exception
* Bump sortpom and checkstyle versions to latest
* Move release candidate build script to build script directory
---
minicluster/minicluster.properties | 31 --
pom.xml| 8 +++---
.../build/create-release-candidate.sh | 10 ---
3 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/minicluster/minicluster.properties
b/minicluster/minicluster.properties
deleted file mode 100644
index a6395099cc..00
--- a/minicluster/minicluster.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-useMiniDFS=true
-rootPassword=secret
-instanceName=testInstance
-numTServers=1
-zooKeeperPort=3191
-jdwpEnabled=true
-zooKeeperMemory=128M
-tserverMemory=256M
-managerMemory=128M
-defaultMemory=256M
-shutdownPort=4446
-site.instance.secret=HUSH
diff --git a/pom.xml b/pom.xml
index cb923db522..033dc81abc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
true
-
.+-SNAPSHOT,(?i).*(alpha|beta)[0-9]*,(?i).*[.-](m|rc)[0-9]+
+
.+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+
11
3.6.0
@@ -770,7 +770,7 @@
com.github.ekryd.sortpom
sortpom-maven-plugin
- 3.2.1
+ 3.3.0
false
false
@@ -1174,13 +1174,13 @@
warning
true
-
**/thrift/*.java,**/proto/*.java,**/HelpMojo.java
+ **/thrift/*.java,**/proto/*.java
com.puppycrawl.tools
checkstyle
-10.12.1
+10.12.2
diff --git a/assemble/build.sh b/src/build/create-release-candidate.sh
similarity index 98%
rename from assemble/build.sh
rename to src/build/create-release-candidate.sh
index c0bb5786a8..d9ad0548ca 100755
--- a/assemble/build.sh
+++ b/src/build/create-release-candidate.sh
@@ -20,6 +20,8 @@
cd "$(dirname "$0")/.." || exit 1
scriptname=$(basename "$0")
+projectroot="$(git rev-parse --show-toplevel)" || exit 1
+cd "$projectroot" || exit 1
export tlpName=accumulo
export projName="$tlpName"
export projNameLong="Apache ${projName^}"
@@ -430,17 +432,17 @@ createReleaseCandidate() {
[[ $numBin == "1" ]] && binSha=$(sha512sum
target/checkout/**/"$projName-$ver-bin.tar.gz" | cut -f1 -d" ")
# continue to creating email notification
- echo "$(red Running)" "$(yellow "$scriptname" --create-email "$ver" "$rc")"
+ echo "$(red Running)" "$(yellow "$scriptname" --email "$ver" "$rc")"
createEmail "$ver" "$rc" "" "$srcSha" "$binSha"
}
SELECTED_FINGERPRINT=""
-if [[ $1 == '--create-release-candidate' ]]; then
+if [[ $1 == '--create' ]]; then
shift
createReleaseCandidate "$@"
-elif [[ $1 == '--create-email' ]]; then
+elif [[ $1 == '--email' ]]; then
shift
createEmail "$@"
else
- fail "Missing one of: $(red --create-release-candidate), $(red
--create-email)"
+ fail "Missing one of: $(red --create), $(red --email)"
fi
[accumulo] branch elasticity updated (f106b8c212 -> 4b0f6bbb31)
This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from f106b8c212 Merge branch 'main' into elasticity add 161207f529 Remove old/broken shell fate test (#3687) add 12898a36b7 Roll up the manager's safe mode status indicator to the nav bar (#3561) add aaec35fcf8 normalize metric labels and structure (#3600) add 313238b5e8 Roll up the manager's safe mode status indicator to the nav bar (#3561) add 04262c07d7 Merge branch '2.1' add b59dfa9564 Add CI check to detect Thrift changes (#3362) add a07499e07a Minor POM quality updates (#3419) add 4f5d358dcc More build updates to reduce warnings (#3426) add 497d741f7a Update datasketches-java to 4.0.0 (#3457) add c1ed35411b Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498) add c6024b2b62 Bump guava from 31.1-jre to 32.0.0-jre (#3497) add 9e8b59caa1 Update parent POM to 30 and remove contrib dir (#3550) add c38c10fec1 Bump ZooKeeper patch version add 67ca64eeb5 Merge branch '2.1' add 12c0b7b018 Fix bad assert statements in tests (#3691) add c99f708127 Merge branch '2.1' add 38c261d123 consolidate y/n prompts in shell (#3684) add 57903f4636 Merge branch '2.1' add 64916fb724 Allow ACCUMULO_JAVA_PREFIX to be an array (#3701) add e6026cbdc8 Merge branch '2.1' new 4b0f6bbb31 Merge branch 'main' into elasticity The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: assemble/bin/accumulo | 2 +- assemble/conf/accumulo-env.sh | 9 +- .../accumulo/core/metrics/MetricsProducer.java | 31 +-- .../its/mapreduce/AccumuloInputFormatIT.java | 2 +- pom.xml| 2 +- .../apache/accumulo/monitor/resources/js/navbar.js | 230 ++--- .../tserver/metrics/TabletServerScanMetrics.java | 2 +- .../main/java/org/apache/accumulo/shell/Shell.java | 21 ++ .../accumulo/shell/commands/ConfigCommand.java | 32 ++- .../shell/commands/DeleteNamespaceCommand.java | 14 +- .../accumulo/shell/commands/DropUserCommand.java | 9 +- .../accumulo/shell/commands/MergeCommand.java | 11 +- .../accumulo/shell/commands/TableOperation.java| 24 +-- .../shell/commands/DropUserCommandTest.java| 11 +- .../apache/accumulo/test/functional/TabletIT.java | 3 +- .../org/apache/accumulo/test/shell/ShellIT.java| 10 +- .../apache/accumulo/test/shell/ShellServerIT.java | 55 - 17 files changed, 239 insertions(+), 229 deletions(-)
[accumulo] 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 4b0f6bbb3103286fa0487b4ff101d42e6b22e98d
Merge: f106b8c212 e6026cbdc8
Author: Dave Marion
AuthorDate: Thu Aug 17 12:07:00 2023 +
Merge branch 'main' into elasticity
assemble/bin/accumulo | 2 +-
assemble/conf/accumulo-env.sh | 9 +-
.../accumulo/core/metrics/MetricsProducer.java | 31 +--
.../its/mapreduce/AccumuloInputFormatIT.java | 2 +-
pom.xml| 2 +-
.../apache/accumulo/monitor/resources/js/navbar.js | 230 ++---
.../tserver/metrics/TabletServerScanMetrics.java | 2 +-
.../main/java/org/apache/accumulo/shell/Shell.java | 21 ++
.../accumulo/shell/commands/ConfigCommand.java | 32 ++-
.../shell/commands/DeleteNamespaceCommand.java | 14 +-
.../accumulo/shell/commands/DropUserCommand.java | 9 +-
.../accumulo/shell/commands/MergeCommand.java | 11 +-
.../accumulo/shell/commands/TableOperation.java| 24 +--
.../shell/commands/DropUserCommandTest.java| 11 +-
.../apache/accumulo/test/functional/TabletIT.java | 3 +-
.../org/apache/accumulo/test/shell/ShellIT.java| 10 +-
.../apache/accumulo/test/shell/ShellServerIT.java | 55 -
17 files changed, 239 insertions(+), 229 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
index 820a432bd2,a2aa7d6a9a..0c66ce5411
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
@@@ -639,21 -603,10 +639,21 @@@ public interface MetricsProducer
String METRICS_LOW_MEMORY = "accumulo.detected.low.memory";
String METRICS_COMPACTOR_PREFIX = "accumulo.compactor.";
String METRICS_COMPACTOR_MAJC_STUCK = METRICS_COMPACTOR_PREFIX +
"majc.stuck";
+ String METRICS_COMPACTOR_JOB_PRIORITY_QUEUES = METRICS_COMPACTOR_PREFIX +
"queue.count";
+ String METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_LENGTH =
METRICS_COMPACTOR_PREFIX + "queue.length";
+ String METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_DEQUEUED =
+ METRICS_COMPACTOR_PREFIX + "queue.jobs.dequeued";
+ String METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_QUEUED =
+ METRICS_COMPACTOR_PREFIX + "queue.jobs.queued";
+ String METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_REJECTED =
+ METRICS_COMPACTOR_PREFIX + "queue.jobs.rejected";
+
+ String METRICS_COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_PRIORITY =
+ METRICS_COMPACTOR_PREFIX + "queue.jobs.priority";
String METRICS_FATE_PREFIX = "accumulo.fate.";
- String METRICS_FATE_TYPE_IN_PROGRESS = METRICS_FATE_PREFIX +
"ops.in_progress_by_type";
- String METRICS_FATE_TOTAL_IN_PROGRESS = METRICS_FATE_PREFIX +
"ops.in_progress";
+ String METRICS_FATE_TYPE_IN_PROGRESS = METRICS_FATE_PREFIX +
"ops.in.progress.by.type";
+ String METRICS_FATE_TOTAL_IN_PROGRESS = METRICS_FATE_PREFIX +
"ops.in.progress";
String METRICS_FATE_OPS_ACTIVITY = METRICS_FATE_PREFIX + "ops.activity";
String METRICS_FATE_ERRORS = METRICS_FATE_PREFIX + "errors";
String METRICS_FATE_TX = METRICS_FATE_PREFIX + "tx";
diff --cc test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
index e5177d8f78,03b6b1c1b2..2c69542334
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
@@@ -2260,152 -2090,6 +2260,97 @@@ public class ShellServerIT extends Shar
assertMatches(output,
"(?sm).*^.*total[:]2[,]\\s+missing[:]0[,]\\s+extra[:]0.*$.*");
}
+ // This test serves to verify the listtablets command as well as the
getTabletInformation api,
+ // which is used by listtablets.
+ @Test
+ public void testListTablets() throws IOException, InterruptedException {
+
+final var tables = getUniqueNames(2);
+final String table1 = tables[0];
+final String table2 = tables[1];
+
+ts.exec("createtable " + table1, true);
+ts.exec("addsplits g n u", true);
+ts.exec("setgoal -g always -r g", true);
+ts.exec("setgoal -g always -r u", true);
+insertData(table1, 1000, 3);
+ts.exec("compact -w -t " + table1);
+ts.exec("scan -t " + table1);
+
+ts.exec("createtable " + table2, true);
+ts.exec("addsplits f m t", true);
+ts.exec("setgoal -g always -r n", true);
+insertData(table2, 500, 5);
+ts.exec("compact -t " + table2);
+ts.exec("scan -t " + table1);
+ts.exec("setgoal -r g -t " + table2 + " -g NEVER");
+
+// give tablet time to become unassigned
+for (var i = 0; i < 15; i++) {
+ Thread.sleep(1000);
+ String goal = ts.exec("listtablets -t " + table2, true, "m
NEVER");
+ if (goal.contains("UNASSIGNED None")) {
+break;
