Skip to content

HDDS-15204. Quota repair includes snapshot pending-delete usage. #10217

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

Draft
jojochuang wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

HDDS-15204. Quota repair includes snapshot pending-delete usage. #10217

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
a76962e
HDDS-15204. Quota repair includes snapshot pending-delete usage.
jojochuang May 8, 2026
e881abf
also account for deleted keys in snapshot namespace
sadanand48 May 21, 2026
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
4 changes: 2 additions & 2 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ public void decrUsedBytes(long bytes, boolean increasePendingDeleteBytes) {
}
}

private void incrSnapshotUsedBytes(long bytes) {
public void incrSnapshotUsedBytes(long bytes) {
this.snapshotUsedBytes += bytes;
}

Expand All @@ -275,7 +275,7 @@ public void decrUsedNamespace(long namespaceToUse, boolean increasePendingDelete
}
}

private void incrSnapshotUsedNamespace(long namespaceToUse) {
public void incrSnapshotUsedNamespace(long namespaceToUse) {
this.snapshotUsedNamespace += namespaceToUse;
}

Expand Down
2 changes: 2 additions & 0 deletions hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2358,6 +2358,8 @@ message BucketQuotaCount {
required int64 diffUsedBytes = 3;
required int64 diffUsedNamespace = 4;
required bool supportOldQuota = 5 [default=false];
optional int64 diffSnapshotUsedBytes = 6;
optional int64 diffSnapshotUsedNamespace = 7;
}

message QuotaRepairResponse {
Expand Down
12 changes: 12 additions & 0 deletions hadoop-ozone/interface-client/src/main/resources/proto.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8213,6 +8213,18 @@
"value": "false"
}
]
},
{
"id": 6,
"name": "diffSnapshotUsedBytes",
"type": "int64",
"optional": true
},
{
"id": 7,
"name": "diffSnapshotUsedNamespace",
"type": "int64",
"optional": true
}
]
},
Expand Down
6 changes: 6 additions & 0 deletions ...manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMQuotaRepairRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ private void updateBucketInfo(
}
bucketInfo.incrUsedBytes(bucketCountInfo.getDiffUsedBytes());
bucketInfo.incrUsedNamespace(bucketCountInfo.getDiffUsedNamespace());
if (bucketCountInfo.hasDiffSnapshotUsedBytes()) {
bucketInfo.incrSnapshotUsedBytes(bucketCountInfo.getDiffSnapshotUsedBytes());
}
if (bucketCountInfo.hasDiffSnapshotUsedNamespace()) {
bucketInfo.incrSnapshotUsedNamespace(bucketCountInfo.getDiffSnapshotUsedNamespace());
}
if (bucketCountInfo.getSupportOldQuota()) {
OmBucketInfo.Builder builder = bucketInfo.toBuilder();
if (bucketInfo.getQuotaInBytes() == OLD_QUOTA_DEFAULT) {
Expand Down
Loading