HDDS-6290. operational-state and node-state options in datanode list CLI not working correctly

[dombizita]

What changes were proposed in this pull request?

In this change I fixed the handling of options when using ozone admin datanode list. Previously there was a condition check that only let using the --ip and --id options, in other cases it returned all the datanodes without filtering.

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-6290

How was this patch tested?

Existing tests (unit and acceptance) and tested in docker environment.

[sodonnel]

Do all these need a collect(...) at the end to form a new list and replace the old one, or is this logic filtering down the list correct as it stands?

[sodonnel]

Sorry - ignore my earlier comment. I missed that allNodes is a Stream and not a list at the top.

Do we need to have allNodes = allNodes.filter(...? Can we just drop the assignment so its like:

   ...
    if (!Strings.isNullOrEmpty(uuid)) {
      allNodes.filter(p ->
          p.getDatanodeDetails().getUuidString().equals(uuid));
    }
    if (!Strings.isNullOrEmpty(nodeOperationalState)) {
      allNodes.filter(p -> p.getOpState().toString()
          .compareToIgnoreCase(nodeOperationalState) == 0);
    }
   ...

[adoroszlai]

Yes, the assignment is needed. Stream.filter returns a new stream, and the original one can no longer be used.

jshell> var strings = Stream.of("a","aa","aaa","aaaa","aaaaa")
strings ==> java.util.stream.ReferencePipeline$Head@6ee52dcd

jshell> strings.filter(x -> x.length() > 2)
$22 ==> java.util.stream.ReferencePipeline$2@57e1b0c

jshell> strings.filter(x -> x.length() < 5)
|  Exception java.lang.IllegalStateException: stream has already been operated upon or closed
|        at AbstractPipeline.<init> (AbstractPipeline.java:203)

jshell> var strings = Stream.of("a","aa","aaa","aaaa","aaaaa")
strings ==> java.util.stream.ReferencePipeline$Head@480bdb19

jshell> strings = strings.filter(x -> x.length() < 5)
strings ==> java.util.stream.ReferencePipeline$2@2a742aa2

jshell> strings = strings.filter(x -> x.length() > 2)
strings ==> java.util.stream.ReferencePipeline$2@467aecef

jshell> strings.count()
$27 ==> 2

[sodonnel]

Ah - thanks for clarifying. This is good to know!

[sodonnel]

Thanks for spotting and fixing this issue. Could you extend the tests in TestListInfoSubCommand to reproduce this issue and then confirm the changes fix it please?

[adoroszlai]

Thanks @dombizita for the fix.