sarvekshayr commented on code in PR #9211:
URL: https://github.com/apache/ozone/pull/9211#discussion_r2471754469
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java:
##########
@@ -620,23 +620,21 @@ public void join() throws InterruptedException {
* (single) thread, or queues it in the handler where a thread pool executor
* will process it. The total commands queued in the datanode is therefore
* the sum those in the CommandQueue and the dispatcher queues.
- * @return A map containing a count for each known command.
+ * @return EnumCounters containing a count for each known command.
*/
- public Map<SCMCommandProto.Type, Integer> getQueuedCommandCount() {
- // This is a "sparse map" - there is not guaranteed to be an entry for
- // every command type
- Map<SCMCommandProto.Type, Integer> commandQSummary =
+ public EnumCounters<SCMCommandProto.Type> getQueuedCommandCount() {
+ // Get command counts from StateContext command queue
+ EnumCounters<SCMCommandProto.Type> commandQSummary =
context.getCommandQueueSummary();
- // This map will contain an entry for every command type which is
registered
+ // This EnumCounters will contain an entry for every command type which is
registered
// with the dispatcher, and that should be all command types the DN knows
- // about. Any commands with nothing in the queue will return a count of
+ // about. Any commands with nothing in the queue will have a count of
// zero.
- Map<SCMCommandProto.Type, Integer> dispatcherQSummary =
+ EnumCounters<SCMCommandProto.Type> dispatcherQSummary =
commandDispatcher.getQueuedCommandCount();
- // Merge the "sparse" map into the fully populated one returning a count
+ // Merge the two EnumCounters into the fully populated one having a count
// for all known command types.
- commandQSummary.forEach((k, v)
- -> dispatcherQSummary.merge(k, v, Integer::sum));
+ dispatcherQSummary.add(commandQSummary);
return dispatcherQSummary;
Review Comment:
In the old implementation, dispatcherQSummary already contains {APPLE,
ORANGE, PEAR}, and the merge only updates the values of keys present in
commandQSummary. Keys that are not in commandQSummary (like PEAR) remain
untouched, so PEAR = 4 stays in the result.
In the new implementation, dispatcherQSummary already includes all enum
keys, then .add(commandQSummary) adds the values from the sparse map only to
matching keys. PEAR still stays 4.
So in both cases, the output contains all keys from dispatcherQSummary,
including PEAR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
