This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch HDDS-7593
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-7593 by this push:
new 905834e0ee HDDS-10700. Merge HDDS-10780 into HBase feature branch.
(#6641)
905834e0ee is described below
commit 905834e0ee82a18163bd67cdfec2a9ff091a1c75
Author: Ashish Kumar <[email protected]>
AuthorDate: Thu May 9 11:31:12 2024 +0530
HDDS-10700. Merge HDDS-10780 into HBase feature branch. (#6641)
Co-authored-by: ashishk <[email protected]>
---
.../src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
index 58a2153352..62d1579ef2 100644
---
a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
+++
b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java
@@ -148,8 +148,9 @@ public final class XceiverClientRatis extends
XceiverClientSpi {
// been replicating data successfully.
} else {
stream = commitInfoProtos.stream().map(proto -> commitInfoMap
- .computeIfPresent(RatisHelper.toDatanodeId(proto.getServer()),
- (address, index) -> proto.getCommitIndex()));
+ .computeIfPresent(RatisHelper.toDatanodeId(proto.getServer()),
+ (address, index) -> proto.getCommitIndex()))
+ .filter(Objects::nonNull);
}
return stream.mapToLong(Long::longValue).min().orElse(0);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
