Skip to content

HDDS-10490. Intermittent NPE in TestSnapshotDiffManager#testLoadJobsOnStartUp #8596

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
jojochuang merged 2 commits into from
Jun 12, 2025
Merged

HDDS-10490. Intermittent NPE in TestSnapshotDiffManager#testLoadJobsOnStartUp #8596

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
3898ddc
HDDS-10490. Intermittent NPE in TestSnapshotDiffManager#testLoadJobsO…
chungen0126 Jun 9, 2025
ff6ac59
remove flaky tags
chungen0126 Jun 10, 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
2 changes: 1 addition & 1 deletion .../ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,10 +730,10 @@ private synchronized SnapshotDiffResponse submitSnapDiffJob(
// If executor cannot take any more job, remove the job form DB and return
// the Rejected Job status with wait time.
try {
updateJobStatus(jobKey, QUEUED, IN_PROGRESS);
snapDiffExecutor.execute(() -> generateSnapshotDiffReport(jobKey, jobId,
volumeName, bucketName, fromSnapshotName, toSnapshotName,
forceFullDiff, disableNativeDiff));
updateJobStatus(jobKey, QUEUED, IN_PROGRESS);
return new SnapshotDiffResponse(
new SnapshotDiffReportOzone(snapshotRoot.toString(), volumeName,
bucketName, fromSnapshotName, toSnapshotName, new ArrayList<>(),
Expand Down
3 changes: 0 additions & 3 deletions ...ne-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@
import org.apache.ozone.rocksdiff.DifferSnapshotInfo;
import org.apache.ozone.rocksdiff.RocksDBCheckpointDiffer;
import org.apache.ozone.rocksdiff.RocksDiffUtils;
import org.apache.ozone.test.tag.Flaky;
import org.apache.ratis.util.ExitUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.function.UncheckedAutoCloseableSupplier;
Expand Down Expand Up @@ -1304,7 +1303,6 @@ public void testGenerateDiffReportFailure() throws IOException {
* startup.
*/
@Test
@Flaky("HDDS-10490")
public void testLoadJobsOnStartUp() throws Exception {
for (int i = 0; i < snapshotInfoList.size(); i++) {
uploadSnapshotDiffJobToDb(snapshotInfo, snapshotInfoList.get(i),
Expand Down Expand Up @@ -1618,7 +1616,6 @@ public void testGetSnapshotDiffReportHappyCase() throws Exception {
* short-circuited based on previous one.
*/
@Test
@Flaky("HDDS-12361")
public void testGetSnapshotDiffReportJob() throws Exception {
for (int i = 0; i < jobStatuses.size(); i++) {
uploadSnapshotDiffJobToDb(snapshotInfo, snapshotInfoList.get(i),
Expand Down
Loading