This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 4a461b2418 HDDS-10490. Intermittent NPE in
TestSnapshotDiffManager#testLoadJobsOnStartUp (#8596)
4a461b2418 is described below
commit 4a461b2418790198c99566ea08aea0e5072fe442
Author: Chung En Lee <[email protected]>
AuthorDate: Fri Jun 13 06:32:54 2025 +0800
HDDS-10490. Intermittent NPE in
TestSnapshotDiffManager#testLoadJobsOnStartUp (#8596)
---
.../java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java | 2 +-
.../org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
index 1e0b5f7d87..51638ac9c7 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotDiffManager.java
@@ -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<>(),
diff --git
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
index 2ffbaa44d8..0ea625a0e0 100644
---
a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
+++
b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDiffManager.java
@@ -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;
@@ -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),
@@ -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),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
