Skip to content

HDDS-4048. Show more information while SCM version info mismatch #1278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bshashikant merged 2 commits into from
Aug 11, 2020
Merged

HDDS-4048. Show more information while SCM version info mismatch #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9cc924
HDDS-4048. Show more information while SCM version info mismatch
maobaolong Jul 30, 2020
1850baa
fix style
maobaolong Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public File getCurrentDir() {
*
* @return the version file path
*/
private File getVersionFile() {
public File getVersionFile() {
return new File(getCurrentDir(), STORAGE_FILE_VERSION);
}

Expand Down
16 changes: 16 additions & 0 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ private OzoneManager(OzoneConfiguration conf) throws IOException,
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);
}
Expand Down Expand Up @@ -480,6 +481,21 @@ private OzoneManager(OzoneConfiguration conf) throws IOException,
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
Expand Down