Skip to content

HDDS-8914. Datanode may fail to start due to duplicate VolumeInfoMetrics #4966

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
adoroszlai merged 1 commit into from
Jun 26, 2023
Merged

HDDS-8914. Datanode may fail to start due to duplicate VolumeInfoMetrics #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ainer-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/DbVolume.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ protected DbVolume(Builder b) throws IOException {
}

@Override
protected void initialize() throws IOException {
super.initialize();
protected void initializeImpl() throws IOException {
super.initializeImpl();
scanForDbStorePaths();
}

Expand Down
10 changes: 7 additions & 3 deletions ...rvice/src/main/java/org/apache/hadoop/ozone/container/common/volume/MutableVolumeSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,11 @@ private void initializeVolumeSet() throws IOException {
}

for (String locationString : rawLocations) {
StorageVolume volume = null;
try {
StorageLocation location = StorageLocation.parse(locationString);

StorageVolume volume = volumeFactory.createVolume(
volume = volumeFactory.createVolume(
location.getUri().getPath(), location.getStorageType());

LOG.info("Added Volume : {} to VolumeSet",
Expand All @@ -183,8 +184,11 @@ private void initializeVolumeSet() throws IOException {
volumeMap.put(volume.getStorageDir().getPath(), volume);
volumeStateMap.get(volume.getStorageType()).add(volume);
} catch (IOException e) {
StorageVolume volume =
volumeFactory.createFailedVolume(locationString);
if (volume != null) {
volume.shutdown();
}

volume = volumeFactory.createFailedVolume(locationString);
failedVolumeMap.put(locationString, volume);
LOG.error("Failed to parse the storage location: " + locationString, e);
}
Expand Down
11 changes: 10 additions & 1 deletion ...-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolume.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,16 @@ public void format(String cid) throws IOException {
* otherwise returns with IOException.
* @throws IOException
*/
protected void initialize() throws IOException {
protected final void initialize() throws IOException {
try {
initializeImpl();
} catch (Exception e) {
shutdown();
throw e;
}
}

protected void initializeImpl() throws IOException {
VolumeState intialVolumeState = analyzeVolumeState();
switch (intialVolumeState) {
case NON_EXISTENT:
Expand Down