Skip to content

HDDS-6201. Fix NPE for DataScanner with scanned container deleted by others. #3005

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
Feb 1, 2022
Merged

HDDS-6201. Fix NPE for DataScanner with scanned container deleted by others. #3005

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
14 changes: 12 additions & 2 deletions ...ervice/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,12 @@ public void markContainerForClose(final long containerId)
public void markContainerUnhealthy(final long containerId)
throws IOException {
Container container = containerSet.getContainer(containerId);
getHandler(container).markContainerUnhealthy(container);
if (container != null) {
getHandler(container).markContainerUnhealthy(container);
} else {
LOG.warn("Container {} not found, may be deleted, skip mark UNHEALTHY",
containerId);
}
}

/**
Expand Down Expand Up @@ -206,7 +211,12 @@ public Iterator<Container<?>> getContainers(HddsVolume volume) {
void updateDataScanTimestamp(long containerId, Instant timestamp)
throws IOException {
Container container = containerSet.getContainer(containerId);
container.updateDataScanTimestamp(timestamp);
if (container != null) {
container.updateDataScanTimestamp(timestamp);
} else {
LOG.warn("Container {} not found, may be deleted, " +
"skip update DataScanTimestamp", containerId);
}
}

}