Skip to content

HDDS-13092. Container scanner should trigger volume scan when marking a container unhealthy #8603

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
errose28 merged 14 commits into from
Jul 21, 2025
Merged

HDDS-13092. Container scanner should trigger volume scan when marking a container unhealthy #8603

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6c53f89
HDDS-13092. Container scanner should trigger on-demand volume scan wh…
Tejaskriya Jun 10, 2025
e15b545
Merge remote-tracking branch 'origin/master' into HDDS-13092
adoroszlai Jun 20, 2025
72ddfeb
Merge remote-tracking branch 'origin/master' into HDDS-13092
Tejaskriya Jul 8, 2025
d75ab18
fix implementation after merging master
Tejaskriya Jul 8, 2025
5e01b91
Move null check to before log
Tejaskriya Jul 10, 2025
15bdc21
rewrite test, fix logs and other comments
Tejaskriya Jul 14, 2025
cf48ca9
Merge remote-tracking branch 'origin' into HDDS-13092
Tejaskriya Jul 14, 2025
64e6d60
Merge remote-tracking branch 'origin' into HDDS-13092
Tejaskriya Jul 14, 2025
ae88309
fix merge issues
Tejaskriya Jul 14, 2025
af87c8e
fix tests
Tejaskriya Jul 14, 2025
60ed84d
fix tests
Tejaskriya Jul 14, 2025
a249fa9
remove final modifier changes in test
Tejaskriya Jul 14, 2025
2debf20
remove final modifier changes in test
Tejaskriya Jul 14, 2025
ad2e379
revert test changes, move trigger of vol scan
Tejaskriya Jul 18, 2025
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
1 change: 1 addition & 0 deletions .../java/org/apache/hadoop/ozone/container/ozoneimpl/BackgroundContainerMetadataScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public void scanContainer(Container<?> container)
}
if (result.hasErrors()) {
scanHelper.handleUnhealthyScanResult(containerID, result);
scanHelper.triggerVolumeScan(container.getContainerData());
Comment thread
Tejaskriya marked this conversation as resolved.
Outdated
}

// Do not update the scan timestamp after the scan since this was just a
Expand Down
14 changes: 14 additions & 0 deletions ...ervice/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScanHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.interfaces.ScanResult;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
import org.slf4j.Logger;

Expand Down Expand Up @@ -76,6 +77,7 @@ public void scanData(Container<?> container, DataTransferThrottler throttler, Ca
}
if (result.hasErrors()) {
handleUnhealthyScanResult(containerId, result);
triggerVolumeScan(containerData);
}
metrics.incNumContainersScanned();
}
Expand Down Expand Up @@ -107,6 +109,18 @@ public void handleUnhealthyScanResult(long containerID, ScanResult result) throw
}
}

public void triggerVolumeScan(ContainerData containerData) {
log.info("Triggering a volume scan for volume [{}] as unhealthy container [{}] was on it.",
containerData.getVolume().getStorageDir().getPath(), containerData.getContainerID());
HddsVolume volume = containerData.getVolume();
Comment thread
Tejaskriya marked this conversation as resolved.
Outdated
if (volume != null && !volume.isFailed()) {
StorageVolumeUtil.onFailure(volume);
} else {
log.warn("Cannot trigger volume scan for container {} since its volume is null or has failed.",
Comment thread
Tejaskriya marked this conversation as resolved.
Outdated
containerData.getContainerID());
}
}

public boolean shouldScanMetadata(Container<?> container) {
if (container == null) {
return false;
Expand Down
13 changes: 13 additions & 0 deletions .../java/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerDataScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import static org.mockito.Mockito.atMostOnce;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
Expand All @@ -48,9 +49,11 @@
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;

Expand Down Expand Up @@ -133,6 +136,16 @@ public void testUnhealthyContainersDetected() throws Exception {
verifyContainerMarkedUnhealthy(deletedContainer, never());
}

@Test
@Override
public void testUnhealthyContainersTriggersVolumeScan() throws Exception {
try (MockedStatic<StorageVolumeUtil> mockedStatic = mockStatic(StorageVolumeUtil.class)) {
Comment thread
errose28 marked this conversation as resolved.
scanner.runIteration();
verifyContainerMarkedUnhealthy(corruptData, atLeastOnce());
mockedStatic.verify(() -> StorageVolumeUtil.onFailure(corruptData.getContainerData().getVolume()), times(1));
}
}

@Test
public void testScanTimestampUpdated() throws Exception {
scanner.runIteration();
Expand Down
15 changes: 15 additions & 0 deletions ...a/org/apache/hadoop/ozone/container/ozoneimpl/TestBackgroundContainerMetadataScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
import static org.mockito.Mockito.atMost;
import static org.mockito.Mockito.atMostOnce;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand All @@ -45,9 +47,11 @@
import org.apache.hadoop.hdfs.util.DataTransferThrottler;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.utils.StorageVolumeUtil;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;

Expand Down Expand Up @@ -130,6 +134,17 @@ public void testUnhealthyContainersDetected() throws Exception {
verifyContainerMarkedUnhealthy(openContainer, never());
}

@Test
@Override
public void testUnhealthyContainersTriggersVolumeScan() throws Exception {
try (MockedStatic<StorageVolumeUtil> mockedStatic = mockStatic(StorageVolumeUtil.class)) {
scanner.runIteration();
verifyContainerMarkedUnhealthy(openCorruptMetadata, atLeastOnce());
mockedStatic.verify(() ->
StorageVolumeUtil.onFailure(openCorruptMetadata.getContainerData().getVolume()), times(1));
}
}

@Test
@Override
public void testUnhealthyContainerRescanned() throws Exception {
Expand Down
9 changes: 9 additions & 0 deletions .../test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestContainerScannersAbstract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.io.File;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
Expand Down Expand Up @@ -130,6 +131,9 @@ public abstract void testPreviouslyScannedContainerIsScanned()
@Test
public abstract void testChecksumUpdateFailure() throws Exception;

@Test
public abstract void testUnhealthyContainersTriggersVolumeScan() throws Exception;

// HELPER METHODS

protected void setScannedTimestampOld(Container<ContainerData> container) {
Expand Down Expand Up @@ -198,6 +202,11 @@ private ContainerController mockContainerController() {
MetadataScanResult healthyMetadata = getHealthyMetadataScanResult();
MetadataScanResult unhealthyMetadata = getUnhealthyMetadataScanResult();


File volLocation = mock(File.class);
when(volLocation.getPath()).thenReturn("/temp/volume-testcontainerscanner");
when(vol.getStorageDir()).thenReturn(volLocation);

// healthy container
ContainerTestUtils.setupMockContainer(healthy,
true, healthyMetadata, healthyData,
Expand Down
13 changes: 12 additions & 1 deletion ...st/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOnDemandContainerDataScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.apache.hadoop.ozone.container.common.impl.ContainerData;
import org.apache.hadoop.ozone.container.common.interfaces.Container;
import org.apache.hadoop.ozone.container.common.interfaces.ScanResult;
import org.apache.ozone.test.GenericTestUtils.LogCapturer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -66,7 +67,7 @@
@MockitoSettings(strictness = Strictness.LENIENT)
public class TestOnDemandContainerDataScanner extends
TestContainerScannersAbstract {

private OnDemandContainerDataScanner onDemandScanner;

@Override
Expand Down Expand Up @@ -325,6 +326,16 @@ public void testMerkleTreeWritten() throws Exception {
}
}

@Test
@Override
public void testUnhealthyContainersTriggersVolumeScan() throws Exception {
LogCapturer logCapturer = LogCapturer.captureLogs(
OnDemandContainerDataScanner.class);
scanContainer(corruptData);
verifyContainerMarkedUnhealthy(corruptData, times(1));
assertTrue(logCapturer.getOutput().contains("Triggering a volume scan for volume"));
}

private void scanContainer(Container<?> container) throws Exception {
Optional<Future<?>> scanFuture = onDemandScanner.scanContainer(container);
if (scanFuture.isPresent()) {
Expand Down
Loading