This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 9a3433b0d2 HDDS-12520. Move auditparser under debug (#8041)
9a3433b0d2 is described below
commit 9a3433b0d2b4d41f63cfdbc72c4352ff36f1d4cb
Author: Nandakumar Vadivelu <[email protected]>
AuthorDate: Thu Mar 13 10:19:47 2025 +0530
HDDS-12520. Move auditparser under debug (#8041)
---
hadoop-hdds/docs/content/tools/AuditParser.md | 8 ++++----
hadoop-hdds/docs/content/tools/AuditParser.zh.md | 8 ++++----
.../src/main/smoketest/auditparser/auditparser.robot | 10 +++++-----
hadoop-ozone/dist/src/shell/ozone/ozone | 13 +++++++------
.../ozone/{ => debug}/audit/parser/AuditParser.java | 20 +++++++++-----------
.../audit/parser/common/DatabaseHelper.java | 4 ++--
.../audit/parser/common/ParserConsts.java | 2 +-
.../audit/parser/common/package-info.java | 0
.../audit/parser/handler/LoadCommandHandler.java | 8 ++++----
.../audit/parser/handler/QueryCommandHandler.java | 10 +++++-----
.../audit/parser/handler/TemplateCommandHandler.java | 10 +++++-----
.../audit/parser/handler/package-info.java | 0
.../{ => debug}/audit/parser/model/AuditEntry.java | 2 +-
.../{ => debug}/audit/parser/model/package-info.java | 0
.../ozone/{ => debug}/audit/parser/package-info.java | 0
.../{ => debug}/audit/parser/TestAuditParser.java | 10 ++++------
.../ozone/{ => debug}/audit/parser/package-info.java | 0
17 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/hadoop-hdds/docs/content/tools/AuditParser.md
b/hadoop-hdds/docs/content/tools/AuditParser.md
index ee2acd959c..ebc5c8ae6a 100644
--- a/hadoop-hdds/docs/content/tools/AuditParser.md
+++ b/hadoop-hdds/docs/content/tools/AuditParser.md
@@ -40,25 +40,25 @@ UNIQUE(datetime,level,logger,user,ip,op,params,result))
Usage:
{{< highlight bash >}}
-ozone auditparser <path to db file> [COMMAND] [PARAM]
+ozone debug auditparser <path to db file> [COMMAND] [PARAM]
{{< /highlight >}}
To load an audit log to database:
{{< highlight bash >}}
-ozone auditparser <path to db file> load <path to audit log>
+ozone debug auditparser <path to db file> load <path to audit log>
{{< /highlight >}}
Load command creates the audit table described above.
To run a custom read-only query:
{{< highlight bash >}}
-ozone auditparser <path to db file> query <select query enclosed within double
quotes>
+ozone debug auditparser <path to db file> query <select query enclosed within
double quotes>
{{< /highlight >}}
Audit Parser comes with a set of templates(most commonly used queries).
To run a template query:
{{< highlight bash >}}
-ozone auditparser <path to db file> template <templateName>
+ozone debug auditparser <path to db file> template <templateName>
{{< /highlight >}}
Following templates are available:
diff --git a/hadoop-hdds/docs/content/tools/AuditParser.zh.md
b/hadoop-hdds/docs/content/tools/AuditParser.zh.md
index 10786d5174..ffe0617328 100644
--- a/hadoop-hdds/docs/content/tools/AuditParser.zh.md
+++ b/hadoop-hdds/docs/content/tools/AuditParser.zh.md
@@ -38,25 +38,25 @@ UNIQUE(datetime,level,logger,user,ip,op,params,result))
用法：
{{< highlight bash >}}
-ozone auditparser <数据库文件的路径> [命令] [参数]
+ozone debug auditparser <数据库文件的路径> [命令] [参数]
{{< /highlight >}}
将审计日志加载到数据库：
{{< highlight bash >}}
-ozone auditparser <数据库文件的路径> load <审计日志的路径>
+ozone debug auditparser <数据库文件的路径> load <审计日志的路径>
{{< /highlight >}}
Load 命令会创建如上所述的审计表。
运行一个自定义的只读查询：
{{< highlight bash >}}
-ozone auditparser <数据库文件的路径> query <双引号括起来的 select 查询>
+ozone debug auditparser <数据库文件的路径> query <双引号括起来的 select 查询>
{{< /highlight >}}
审计解析起自带了一些模板（最常用的查询）
运行模板查询：
{{< highlight bash >}}
-ozone auditparser <数据库文件的路径 template <模板名称>
+ozone debug auditparser <数据库文件的路径 template <模板名称>
{{< /highlight >}}
Ozone 提供了以下模板：
diff --git a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
b/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
index 55e4ed841d..5af45d97c5 100644
--- a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
@@ -42,15 +42,15 @@ Testing audit parser
${logdir} = Get Environment Variable OZONE_LOG_DIR
/var/log/ozone
${logfile} = Execute ls -t "${logdir}" | grep om-audit
| head -1
- Execute ozone auditparser
"${auditworkdir}/audit.db" load "${logdir}/${logfile}"
- ${result} = Execute ozone auditparser
"${auditworkdir}/audit.db" template top5cmds
+ Execute ozone debug auditparser
"${auditworkdir}/audit.db" load "${logdir}/${logfile}"
+ ${result} = Execute ozone debug auditparser
"${auditworkdir}/audit.db" template top5cmds
Should Contain ${result} ALLOCATE_KEY
- ${result} = Execute ozone auditparser
"${auditworkdir}/audit.db" template top5users
+ ${result} = Execute ozone debug auditparser
"${auditworkdir}/audit.db" template top5users
Run Keyword If '${SECURITY_ENABLED}' == 'true' Set username
Should Contain ${result} ${user}
- ${result} = Execute ozone auditparser
"${auditworkdir}/audit.db" query "select count(*) from audit where
op='CREATE_VOLUME' and RESULT='SUCCESS'"
+ ${result} = Execute ozone debug auditparser
"${auditworkdir}/audit.db" query "select count(*) from audit where
op='CREATE_VOLUME' and RESULT='SUCCESS'"
${result} = Convert To Number ${result}
Should be true ${result}>=1
- ${result} = Execute ozone auditparser
"${auditworkdir}/audit.db" query "select count(*) from audit where
op='CREATE_BUCKET' and RESULT='SUCCESS'"
+ ${result} = Execute ozone debug auditparser
"${auditworkdir}/audit.db" query "select count(*) from audit where
op='CREATE_BUCKET' and RESULT='SUCCESS'"
${result} = Convert To Number ${result}
Should be true ${result}>=${buckets}
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone
b/hadoop-ozone/dist/src/shell/ozone/ozone
index d868f0217e..08bbf1acfe 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -36,7 +36,6 @@ function ozone_usage
ozone_add_option "--jvmargs arguments" "append JVM options to any existing
options defined in the OZONE_OPTS environment variable. Any defined in
OZONE_CLIENT_OPTS will be append after these jvmargs"
ozone_add_option "--validate (continue)" "validates if all jars as indicated
in the corresponding OZONE_RUN_ARTIFACT_NAME classpath file are present,
command execution shall continue post validation failure if 'continue' is
passed"
- ozone_add_subcommand "auditparser" client "runs audit parser tool"
ozone_add_subcommand "classpath" client "prints the class path needed for
running ozone commands"
ozone_add_subcommand "datanode" daemon "run a HDDS datanode"
ozone_add_subcommand "envvars" client "display computed Hadoop environment
variables"
@@ -83,10 +82,6 @@ function ozonecmd_case
RATIS_OPTS="-Dorg.apache.ratis.thirdparty.io.netty.allocator.useCacheForAllThreads=false
${RATIS_OPTS}"
case ${subcmd} in
- auditparser)
- OZONE_CLASSNAME=org.apache.hadoop.ozone.audit.parser.AuditParser
- OZONE_RUN_ARTIFACT_NAME="ozone-tools"
- ;;
classpath)
if [[ "$#" -gt 0 ]]; then
OZONE_RUN_ARTIFACT_NAME="$1"
@@ -309,7 +304,13 @@ if [[ $# = 0 ]]; then
fi
OZONE_SUBCMD=$1
-shift
+
+if [[ "$OZONE_SUBCMD" == "auditparser" ]]; then
+ echo "warning: 'ozone auditparser' is deprecated, use 'ozone debug
auditparser' instead."
+ OZONE_SUBCMD="debug"
+else
+ shift
+fi
if ozone_need_reexec ozone "${OZONE_SUBCMD}"; then
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/AuditParser.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/AuditParser.java
similarity index 78%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/AuditParser.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/AuditParser.java
index ccfadba281..067c5e5491 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/AuditParser.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/AuditParser.java
@@ -15,20 +15,21 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser;
+package org.apache.hadoop.ozone.debug.audit.parser;
-import org.apache.hadoop.hdds.cli.GenericCli;
+import org.apache.hadoop.hdds.cli.DebugSubcommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
-import org.apache.hadoop.ozone.audit.parser.handler.LoadCommandHandler;
-import org.apache.hadoop.ozone.audit.parser.handler.QueryCommandHandler;
-import org.apache.hadoop.ozone.audit.parser.handler.TemplateCommandHandler;
+import org.apache.hadoop.ozone.debug.audit.parser.handler.LoadCommandHandler;
+import org.apache.hadoop.ozone.debug.audit.parser.handler.QueryCommandHandler;
+import
org.apache.hadoop.ozone.debug.audit.parser.handler.TemplateCommandHandler;
+import org.kohsuke.MetaInfServices;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
/**
* Ozone audit parser tool.
*/
-@Command(name = "ozone auditparser",
+@Command(name = "auditparser",
description = "Shell parser for Ozone Audit Logs",
subcommands = {
LoadCommandHandler.class,
@@ -37,7 +38,8 @@
},
versionProvider = HddsVersionProvider.class,
mixinStandardHelpOptions = true)
-public class AuditParser extends GenericCli {
+@MetaInfServices(DebugSubcommand.class)
+public class AuditParser implements DebugSubcommand {
/*
<.db file path> load <file>
<.db file path> template <template name>
@@ -51,10 +53,6 @@ public class AuditParser extends GenericCli {
"UNIQUE(datetime,level,logger,user,ip,op,params,result))")
private String database;
- public static void main(String[] argv) throws Exception {
- new AuditParser().run(argv);
- }
-
public String getDatabase() {
return database;
}
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/DatabaseHelper.java
similarity index 98%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/DatabaseHelper.java
index dbe0d252f3..ef9bb652ee 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/DatabaseHelper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser.common;
+package org.apache.hadoop.ozone.debug.audit.parser.common;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -37,7 +37,7 @@
import java.util.Properties;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
-import org.apache.hadoop.ozone.audit.parser.model.AuditEntry;
+import org.apache.hadoop.ozone.debug.audit.parser.model.AuditEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/ParserConsts.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/ParserConsts.java
similarity index 95%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/ParserConsts.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/ParserConsts.java
index 4a9b16be8b..ee93ce5aa0 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/ParserConsts.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/ParserConsts.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser.common;
+package org.apache.hadoop.ozone.debug.audit.parser.common;
/**
* Constants used for ozone audit parser.
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/package-info.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/common/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/LoadCommandHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/LoadCommandHandler.java
similarity index 87%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/LoadCommandHandler.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/LoadCommandHandler.java
index cbd9eb4d39..14e2b5eb06 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/LoadCommandHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/LoadCommandHandler.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser.handler;
+package org.apache.hadoop.ozone.debug.audit.parser.handler;
import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
-import org.apache.hadoop.ozone.audit.parser.AuditParser;
-import org.apache.hadoop.ozone.audit.parser.common.DatabaseHelper;
+import org.apache.hadoop.ozone.debug.audit.parser.AuditParser;
+import org.apache.hadoop.ozone.debug.audit.parser.common.DatabaseHelper;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
import picocli.CommandLine.ParentCommand;
@@ -32,7 +32,7 @@
aliases = "l",
description = "Load ozone audit log files.\n\n" +
"To load an audit log to database:\n" +
- "ozone auditparser <path to db file> load <logs>\n",
+ "ozone debug auditparser <path to db file> load <logs>\n",
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
public class LoadCommandHandler implements Callable<Void> {
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/QueryCommandHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/QueryCommandHandler.java
similarity index 84%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/QueryCommandHandler.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/QueryCommandHandler.java
index 3217c93a21..38ea062fb3 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/QueryCommandHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/QueryCommandHandler.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser.handler;
+package org.apache.hadoop.ozone.debug.audit.parser.handler;
import java.sql.SQLException;
import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
-import org.apache.hadoop.ozone.audit.parser.AuditParser;
-import org.apache.hadoop.ozone.audit.parser.common.DatabaseHelper;
+import org.apache.hadoop.ozone.debug.audit.parser.AuditParser;
+import org.apache.hadoop.ozone.debug.audit.parser.common.DatabaseHelper;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
import picocli.CommandLine.ParentCommand;
@@ -33,8 +33,8 @@
@Command(name = "query",
aliases = "q",
description = "Execute custom query.\n\n" +
- "To run a custom read-only query:\n" +
- "ozone auditparser <path to db file> query <query>\n",
+ "To run a custom read-only query on the audit logs loaded to the
database:\n" +
+ "ozone debug auditparser <path to db file> query <query>\n",
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
public class QueryCommandHandler implements Callable<Void> {
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/TemplateCommandHandler.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/TemplateCommandHandler.java
similarity index 86%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/TemplateCommandHandler.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/TemplateCommandHandler.java
index 95c981fc68..2f24ef35cb 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/TemplateCommandHandler.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/TemplateCommandHandler.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser.handler;
+package org.apache.hadoop.ozone.debug.audit.parser.handler;
import java.sql.SQLException;
import java.util.concurrent.Callable;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
-import org.apache.hadoop.ozone.audit.parser.AuditParser;
-import org.apache.hadoop.ozone.audit.parser.common.DatabaseHelper;
+import org.apache.hadoop.ozone.debug.audit.parser.AuditParser;
+import org.apache.hadoop.ozone.debug.audit.parser.common.DatabaseHelper;
import picocli.CommandLine.Command;
import picocli.CommandLine.Parameters;
import picocli.CommandLine.ParentCommand;
@@ -32,8 +32,8 @@
@Command(name = "template",
aliases = "t",
description = "Execute template query.\n\n" +
- "To run a template query:\n" +
- "ozone auditparser <path to db file> template <template>\n\n" +
+ "To run a template query on the audit logs loaded to the database:\n" +
+ "ozone debug auditparser <path to db file> template <template>\n\n" +
"Following templates are available:\n" +
"(Template) (Description)\n" +
"top5users : Top 5 users.\n" +
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/package-info.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/handler/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/model/AuditEntry.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/model/AuditEntry.java
similarity index 98%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/model/AuditEntry.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/model/AuditEntry.java
index 56dcd34293..fc0468d829 100644
---
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/model/AuditEntry.java
+++
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/model/AuditEntry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser.model;
+package org.apache.hadoop.ozone.debug.audit.parser.model;
/**
* POJO used for ozone audit parser tool.
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/model/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/model/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/model/package-info.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/model/package-info.java
diff --git
a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/package-info.java
b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/package-info.java
rename to
hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/audit/parser/package-info.java
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/audit/parser/TestAuditParser.java
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/debug/audit/parser/TestAuditParser.java
similarity index 95%
rename from
hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/audit/parser/TestAuditParser.java
rename to
hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/debug/audit/parser/TestAuditParser.java
index 37230819c7..03eb979417 100644
---
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/audit/parser/TestAuditParser.java
+++
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/debug/audit/parser/TestAuditParser.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.ozone.audit.parser;
+package org.apache.hadoop.ozone.debug.audit.parser;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
@@ -107,7 +107,7 @@ public static void cleanup() throws IOException {
private static void execute(String[] args, String msg) {
List<String> arguments = new ArrayList(Arrays.asList(args));
LOG.info("Executing shell command with args {}", arguments);
- CommandLine cmd = parserTool.getCmd();
+ CommandLine cmd = new CommandLine(parserTool);
IExceptionHandler2<List<Object>> exceptionHandler =
new IExceptionHandler2<List<Object>>() {
@@ -200,10 +200,8 @@ public void testLoadCommand() {
public void testHelp() throws Exception {
String[] args = new String[]{"--help"};
execute(args,
- "Usage: ozone auditparser [-hV] [--verbose] " +
- "[-conf=<configurationPath>]\n" +
- " [-D=<String=String>]... <database> " +
- "[COMMAND]");
+ "Usage: auditparser [-hV] <database> [COMMAND]\n" +
+ "Shell parser for Ozone Audit Logs");
}
private static File getRandomTempDir() throws IOException {
diff --git
a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/audit/parser/package-info.java
b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/debug/audit/parser/package-info.java
similarity index 100%
rename from
hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/audit/parser/package-info.java
rename to
hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/debug/audit/parser/package-info.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
