You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sh...@apache.org on 2020/08/11 10:12:21 UTC
[hadoop-ozone] branch master updated: HDDS-4048. Show more
information while SCM version info mismatch (#1278)
This is an automated email from the ASF dual-hosted git repository.
shashikant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 2da809e HDDS-4048. Show more information while SCM version info mismatch (#1278)
2da809e is described below
commit 2da809e68435e4fa7cb75a80b4f62bc31c21f3a8
Author: maobaolong <30...@qq.com>
AuthorDate: Tue Aug 11 18:12:12 2020 +0800
HDDS-4048. Show more information while SCM version info mismatch (#1278)
---
.../java/org/apache/hadoop/ozone/common/Storage.java | 2 +-
.../java/org/apache/hadoop/ozone/om/OzoneManager.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Storage.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Storage.java
index 25f8e86..d5e1348 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Storage.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Storage.java
@@ -168,7 +168,7 @@ public abstract class Storage {
*
* @return the version file path
*/
- private File getVersionFile() {
+ public File getVersionFile() {
return new File(getCurrentDir(), STORAGE_FILE_VERSION);
}
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 01340cd..13e47a7 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
@@ -407,6 +407,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
ScmInfo scmInfo = getScmInfo(configuration);
if (!(scmInfo.getClusterId().equals(omStorage.getClusterID()) && scmInfo
.getScmId().equals(omStorage.getScmId()))) {
+ logVersionMismatch(conf, scmInfo);
throw new OMException("SCM version info mismatch.",
ResultCodes.SCM_VERSION_MISMATCH_ERROR);
}
@@ -480,6 +481,21 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
omState = State.INITIALIZED;
}
+ private void logVersionMismatch(OzoneConfiguration conf, ScmInfo scmInfo) {
+ InetSocketAddress scmBlockAddress =
+ getScmAddressForBlockClients(conf);
+ if (!scmInfo.getClusterId().equals(omStorage.getClusterID())) {
+ LOG.error("clusterId from {} is {}, but is {} in {}",
+ scmBlockAddress, scmInfo.getClusterId(),
+ omStorage.getClusterID(), omStorage.getVersionFile());
+ }
+ if (!scmInfo.getScmId().equals(omStorage.getScmId())) {
+ LOG.error("scmId from {} is {}, but is {} in {}",
+ scmBlockAddress, scmInfo.getScmId(),
+ omStorage.getScmId(), omStorage.getVersionFile());
+ }
+ }
+
/**
* Instantiate services which are dependent on the OM DB state.
* When OM state is reloaded, these services are re-initialized with the
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org