This is an automated email from the ASF dual-hosted git repository.
dlmarion 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 35ff334b7b Fixed ZooKeeper command description, other long
descriptions (#6130)
35ff334b7b is described below
commit 35ff334b7bf9e95739c41851d7a3f903d4bd2833
Author: Dave Marion <[email protected]>
AuthorDate: Tue Feb 17 12:39:19 2026 -0500
Fixed ZooKeeper command description, other long descriptions (#6130)
---
.../server/conf/CheckAccumuloProperties.java | 15 +++++++++++----
.../apache/accumulo/server/util/ZooKeeperMain.java | 6 +++---
.../server/util/adminCommand/StopServers.java | 2 +-
.../main/java/org/apache/accumulo/start/Main.java | 20 +++++++++++++++-----
4 files changed, 30 insertions(+), 13 deletions(-)
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java
b/server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java
index ae22a7c946..5d3f7c20ec 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java
@@ -27,6 +27,8 @@ import org.apache.accumulo.start.spi.CommandGroup;
import org.apache.accumulo.start.spi.CommandGroups;
import org.apache.accumulo.start.spi.KeywordExecutable;
import org.apache.hadoop.conf.Configuration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.beust.jcommander.JCommander;
import com.google.auto.service.AutoService;
@@ -34,6 +36,8 @@ import com.google.auto.service.AutoService;
@AutoService(KeywordExecutable.class)
public class CheckAccumuloProperties extends
ServerKeywordExecutable<ServerOpts> {
+ private static final Logger LOG =
LoggerFactory.getLogger(CheckAccumuloProperties.class);
+
public CheckAccumuloProperties() {
super(new ServerOpts());
}
@@ -45,10 +49,7 @@ public class CheckAccumuloProperties extends
ServerKeywordExecutable<ServerOpts>
@Override
public String description() {
- return "Checks the provided Accumulo configuration file for errors. "
- + "This only checks the contents of the file and not any running
Accumulo system, "
- + "so it can be used prior to init, but only performs a subset of the
checks done by "
- + "'admin check run " + Check.SERVER_CONFIG + "'";
+ return "Checks the provided Accumulo configuration file for errors";
}
@Override
@@ -58,6 +59,12 @@ public class CheckAccumuloProperties extends
ServerKeywordExecutable<ServerOpts>
@Override
public void execute(JCommander cl, ServerOpts options) throws Exception {
+
+ LOG.info("This command checks the configuration file only to allow"
+ + " some level of verification before initializing an instance. To"
+ + " perform a more complete check, run the check command with the
arguments 'run "
+ + Check.SERVER_CONFIG + "'");
+
var hadoopConfig = new Configuration();
var siteConfig = options.getSiteConfiguration();
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
b/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
index 39a10117de..19c0ec48af 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
@@ -49,17 +49,17 @@ public class ZooKeeperMain extends
ServerKeywordExecutable<ZKOpts> {
@Override
public String keyword() {
- return "zookeeper";
+ return "zk-cli";
}
@Override
public CommandGroup commandGroup() {
- return CommandGroups.PROCESS;
+ return CommandGroups.CORE;
}
@Override
public String description() {
- return "Starts Apache Zookeeper instance";
+ return "Starts an Apache Zookeeper client rooted at the current instance.";
}
@Override
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/StopServers.java
b/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/StopServers.java
index 936d772b5c..c839bc7f14 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/StopServers.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/adminCommand/StopServers.java
@@ -93,7 +93,7 @@ public class StopServers extends
ServerKeywordExecutable<StopServerOpts> {
@Override
public String description() {
- return "Stop the servers at the given addresses allowing them to complete
current task but not start new task. Hostnames only are no longer supported;
you must use <host:port>. To Stop all services on a host, use 'accumulo admin
service-status' to list all hosts and then pass them to this command.";
+ return "Stops the servers at the supplied addresses.";
}
@Override
diff --git a/start/src/main/java/org/apache/accumulo/start/Main.java
b/start/src/main/java/org/apache/accumulo/start/Main.java
index 0ca768005f..ee1029d3f2 100644
--- a/start/src/main/java/org/apache/accumulo/start/Main.java
+++ b/start/src/main/java/org/apache/accumulo/start/Main.java
@@ -198,14 +198,24 @@ public class Main {
System.out.println(" accumulo classpath");
System.out.println(" accumulo jshell (<argument> ...)");
System.out.println(" accumulo className (<argument> ...)");
- System.out.println(" accumulo <group>* <command> [--help] (<argument>
...)");
- System.out.println(" * group may be omitted for commands with 'CLIENT'
group\n\n");
+ System.out.println(" accumulo <command>* <subcommand> [--help]
(<argument> ...)");
+ System.out.println(" * client commands can be run using 'accumulo
<subcommand> ...'\n");
Map<CommandGroup,Map<String,KeywordExecutable>> executables =
getExecutables(getClassLoader());
+
+ System.out.println(CommandGroups.CLIENT.title() + " Commands:");
+ executables.get(CommandGroups.CLIENT).entrySet().forEach(ce -> {
+ System.out.printf(" %-30s %s\n", ce.getValue().usage(),
ce.getValue().description());
+ });
+
+ System.out.println("\nThe following commands require access to the
accumulo.properties file\n");
+
executables.entrySet().forEach(e -> {
- System.out.println("\n" + e.getKey().title() + " Group Commands:");
- e.getValue().values()
- .forEach(ke -> System.out.printf(" %-30s %s\n", ke.usage(),
ke.description()));
+ if (e.getKey() != CommandGroups.CLIENT) {
+ System.out.println("\n" + e.getKey().title() + " Commands:");
+ e.getValue().values()
+ .forEach(ke -> System.out.printf(" %-30s %s\n", ke.usage(),
ke.description()));
+ }
});
System.out.println();
}
