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 582a5cec45 HDDS-9816. Addendum: fix compile error due to conflict with
HDDS-9303 (#5764)
582a5cec45 is described below
commit 582a5cec45449caf13f341d9ad59201fcca2902c
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Dec 11 14:29:18 2023 +0100
HDDS-9816. Addendum: fix compile error due to conflict with HDDS-9303
(#5764)
---
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 0e9eebaa04..053afbed3c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -3035,7 +3035,9 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
RaftPeer leaderId;
if (isRatisEnabled) {
if (null == omRatisServer) {
- return "Server is shutting down";
+ messageException.add("Server is shutting down");
+ resultList.add(messageException);
+ return resultList;
}
try {
leaderId = omRatisServer.getLeader();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
