You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sz...@apache.org on 2022/10/12 07:36:56 UTC
[ozone] branch master updated: HDDS-7088. OM incorrectly detects SCM Ratis Group ID when OM and SCM are colocated with same Ratis storage directory. (#3809)
This is an automated email from the ASF dual-hosted git repository.
szetszwo 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 e529ed4586 HDDS-7088. OM incorrectly detects SCM Ratis Group ID when OM and SCM are colocated with same Ratis storage directory. (#3809)
e529ed4586 is described below
commit e529ed4586c19726303e5be3ae625b72f329aea3
Author: Navink <nv...@gmail.com>
AuthorDate: Wed Oct 12 13:06:50 2022 +0530
HDDS-7088. OM incorrectly detects SCM Ratis Group ID when OM and SCM are colocated with same Ratis storage directory. (#3809)
---
.../main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
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 ec6aa4a3a4..d089569a4e 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
@@ -1353,16 +1353,13 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
for (File ratisGroupDir : ratisDirFiles) {
if (ratisGroupDir.isDirectory()) {
if (!ratisGroupDir.getName().equals(groupIDfromServiceID)) {
- throw new IOException("Ratis group Dir on disk "
- + ratisGroupDir.getName() + " does not match with RaftGroupID"
- + groupIDfromServiceID + " generated from service id "
- + getOMServiceId() + ". Looks like there is a change to " +
- OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY + " value after the " +
- "cluster is setup. Currently change to this value is not " +
- "supported.");
+ LOG.warn("Unknown directory {} exists in ratis storage dir {}."
+ + " It is recommended not to share the ratis storage dir.",
+ ratisGroupDir, omRatisDir);
}
} else {
- LOG.warn("Unknown file {} exists in ratis storage dir {}",
+ LOG.warn("Unknown file {} exists in ratis storage dir {}."
+ + " It is recommended not to share the ratis storage dir.",
ratisGroupDir, omRatisDir);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org