This is an automated email from the ASF dual-hosted git repository.
jojochuang 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 9bcfc6e5827 HDDS-15313. Increase snapshot diff default thresholds.
(#10385)
9bcfc6e5827 is described below
commit 9bcfc6e5827f705cc1f2d0930b2ef29b90c253ac
Author: SaketaChalamchala <[email protected]>
AuthorDate: Wed Jun 17 13:06:42 2026 -0700
HDDS-15313. Increase snapshot diff default thresholds. (#10385)
---
hadoop-hdds/common/src/main/resources/ozone-default.xml | 4 ++--
hadoop-hdds/docs/content/feature/Snapshot-Configuration-Properties.md | 4 ++--
.../org/apache/hadoop/ozone/shell/snapshot/SnapshotDiffHandler.java | 2 +-
.../common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java | 4 ++--
.../test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java | 3 ++-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml
b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index ac715a108a6..917eab5c30e 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -4779,7 +4779,7 @@
<property>
<name>ozone.om.snapshot.diff.max.page.size</name>
- <value>1000</value>
+ <value>5000</value>
<tag>OZONE, OM</tag>
<description>
Maximum number of entries to be returned in a single page of snap diff
report.
@@ -4865,7 +4865,7 @@
<property>
<name>ozone.om.snapshot.diff.max.allowed.keys.changed.per.job</name>
- <value>10000000</value>
+ <value>1000000000</value>
<tag>OZONE, OM</tag>
<description>
Max numbers of keys changed allowed for a snapshot diff job.
diff --git
a/hadoop-hdds/docs/content/feature/Snapshot-Configuration-Properties.md
b/hadoop-hdds/docs/content/feature/Snapshot-Configuration-Properties.md
index 3b530e19958..802a9fb6bd3 100644
--- a/hadoop-hdds/docs/content/feature/Snapshot-Configuration-Properties.md
+++ b/hadoop-hdds/docs/content/feature/Snapshot-Configuration-Properties.md
@@ -42,10 +42,10 @@ These parameters, defined in `ozone-site.xml`, control how
Ozone manages snapsho
* `ozone.om.snapshot.diff.db.dir`: Directory for SnapshotDiff job data.
Defaults to OM metadata dir. Use a spacious location for large diffs.
* `ozone.om.snapshot.force.full.diff`: Force a full diff for all
snapshot diff jobs (Default: false).
* `ozone.om.snapshot.diff.disable.native.libs`: Disable native libraries
for snapshot diff (Default: false).
- * `ozone.om.snapshot.diff.max.page.size`: Maximum page size for snapshot
diff (Default: 1000).
+ * `ozone.om.snapshot.diff.max.page.size`: Maximum page size for snapshot
diff (Default: 5000).
* `ozone.om.snapshot.diff.thread.pool.size`: Thread pool size for
snapshot diff (Default: 10).
* `ozone.om.snapshot.diff.job.default.wait.time`: Default wait time for
a snapshot diff job (Default: 1m).
- * `ozone.om.snapshot.diff.max.allowed.keys.changed.per.job`: Maximum
number of keys allowed to be changed per snapshot diff job (Default: 10000000).
+ * `ozone.om.snapshot.diff.max.allowed.keys.changed.per.job`: Maximum
number of keys allowed to be changed per snapshot diff job (Default:
1000000000).
* **Snapshot Compaction and Cleanup**
* `ozone.snapshot.key.deleting.limit.per.task`: The maximum number of
keys scanned by the snapshot deleting service in a single run (Default: 20000).
diff --git
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotDiffHandler.java
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotDiffHandler.java
index 29bf0c912ed..a4fdbdfb579 100644
---
a/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotDiffHandler.java
+++
b/hadoop-ozone/cli-shell/src/main/java/org/apache/hadoop/ozone/shell/snapshot/SnapshotDiffHandler.java
@@ -67,7 +67,7 @@ public class SnapshotDiffHandler extends Handler {
"Note the effective page size will also be bound by " +
"the server-side page size limit, see config:%n" +
" ozone.om.snapshot.diff.max.page.size",
- defaultValue = "1000",
+ defaultValue = "5000",
showDefaultValue = CommandLine.Help.Visibility.ALWAYS
)
private int pageSize;
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
index a43d3fb2598..b1209b6a213 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
@@ -591,7 +591,7 @@ public final class OMConfigKeys {
public static final int OZONE_OM_SNAPSHOT_DB_MAX_OPEN_FILES_DEFAULT
= 100;
public static final int OZONE_OM_SNAPSHOT_DIFF_REPORT_MAX_PAGE_SIZE_DEFAULT
- = 1000;
+ = 5000;
public static final String OZONE_OM_SNAPSHOT_DIFF_THREAD_POOL_SIZE
= "ozone.om.snapshot.diff.thread.pool.size";
@@ -638,7 +638,7 @@ public final class OMConfigKeys {
= "ozone.om.snapshot.diff.max.allowed.keys.changed.per.job";
public static final long
OZONE_OM_SNAPSHOT_DIFF_MAX_ALLOWED_KEYS_CHANGED_PER_DIFF_JOB_DEFAULT
- = 10_000_000;
+ = 1_000_000_000L;
public static final String OZONE_OM_UPGRADE_QUOTA_RECALCULATE_ENABLE
= "ozone.om.upgrade.quota.recalculate.enabled";
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
index 4da76840c2a..462ea280303 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOmSnapshot.java
@@ -31,6 +31,7 @@
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_ENABLE_FILESYSTEM_PATHS;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_CACHE_CLEANUP_SERVICE_RUN_INTERVAL;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_DIFF_DISABLE_NATIVE_LIBS;
+import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_DIFF_REPORT_MAX_PAGE_SIZE_DEFAULT;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_SNAPSHOT_FORCE_FULL_DIFF;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL;
import static org.apache.hadoop.ozone.om.OmSnapshotManager.DELIMITER;
@@ -1458,7 +1459,7 @@ public void testSnapDiff() throws Exception {
snap7, "400000000000000000003", 0, forceFullSnapshotDiff,
disableNativeDiff));
assertThat(ioException.getMessage()).contains("Index (given: 3) " +
"should be a number >= 0 and < totalDiffEntries: 2. Page size " +
- "(given: 1000) should be a positive number > 0.");
+ "(given: " + OZONE_OM_SNAPSHOT_DIFF_REPORT_MAX_PAGE_SIZE_DEFAULT + ")
should be a positive number > 0.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
