This is an automated email from the ASF dual-hosted git repository. msingh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 2cdd8c203cb3da8e4a8744d899c30cfd654abe95 Author: Doroszlai, Attila <[email protected]> AuthorDate: Wed Mar 3 06:40:18 2021 +0100 HDDS-4885. ozone admin datanode list filter by UUID broken (#1977) --- .../apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java | 2 +- hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java index 236d0c3..5e9b3c3 100644 --- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java +++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/datanode/ListInfoSubcommand.java @@ -67,7 +67,7 @@ public class ListInfoSubcommand extends ScmSubcommand { } if (!Strings.isNullOrEmpty(uuid)) { allNodes = allNodes.filter(p -> - p.getDatanodeDetails().toString().equals(uuid)); + p.getDatanodeDetails().getUuidString().equals(uuid)); } allNodes.forEach(this::printDatanodeInfo); } diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot b/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot index b34f3af..6d419ba 100644 --- a/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot +++ b/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot @@ -25,6 +25,15 @@ List datanodes Should contain ${output} Datanode: Should contain ${output} Related pipelines: +Filter list by UUID + ${uuid} = Execute ozone admin datanode list | grep '^Datanode:' | head -1 | awk '{ print \$2 }' + ${output} = Execute ozone admin datanode list --id "${uuid}" + Should contain ${output} Datanode: ${uuid} + ${datanodes} = Get Lines Containing String ${output} Datanode: + @{lines} = Split To Lines ${datanodes} + ${count} = Get Length ${lines} + Should Be Equal As Integers ${count} 1 + Incomplete command ${output} = Execute And Ignore Error ozone admin datanode Should contain ${output} Incomplete command --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
