This is an automated email from the ASF dual-hosted git repository.
sammichen 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 f9facd848ae HDDS-13946. Wrong fields used to determine deleted block
size in OM. (#9308)
f9facd848ae is described below
commit f9facd848ae52781badb468f741017bd8a68af11
Author: Priyesh Karatha <[email protected]>
AuthorDate: Tue Nov 18 08:57:21 2025 +0530
HDDS-13946. Wrong fields used to determine deleted block size in OM. (#9308)
---
.../src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java | 9 +++++++--
.../java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 7 ++++++-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index f4a900435e7..eaca8ab2c52 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -163,6 +163,7 @@
import org.apache.hadoop.ozone.om.helpers.OzoneAclUtil;
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
+import org.apache.hadoop.ozone.om.helpers.QuotaUtil;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.WithParentObjectId;
import org.apache.hadoop.ozone.om.request.OMClientRequest;
@@ -836,8 +837,12 @@ public PendingKeysDeletion getPendingDeletionKeys(
if (filter == null || filter.apply(Table.newKeyValue(kv.getKey(),
info))) {
List<DeletedBlock> deletedBlocks =
info.getKeyLocationVersions().stream()
.flatMap(versionLocations ->
versionLocations.getLocationList().stream()
- .map(b -> new DeletedBlock(new
BlockID(b.getContainerID(),
- b.getLocalID()), info.getDataSize(),
info.getReplicatedSize()))).collect(Collectors.toList());
+ .map(b -> new DeletedBlock(
+ new BlockID(b.getContainerID(),
+ b.getLocalID()),
+ b.getLength(),
+ QuotaUtil.getReplicatedSize(b.getLength(),
info.getReplicationConfig())
+ ))).collect(Collectors.toList());
String blockGroupName = kv.getKey() + "/" +
reclaimableKeyCount++;
BlockGroup keyBlocks =
BlockGroup.newBuilder().setKeyName(blockGroupName)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index e7826708b89..6e79ca25ac8 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -113,6 +113,7 @@
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.helpers.OpenKeySession;
import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
+import org.apache.hadoop.ozone.om.helpers.QuotaUtil;
import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.S3SecretValue;
import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
@@ -1830,7 +1831,11 @@ public List<BlockGroup> getBlocksForKeyDelete(String
deletedKey)
info.getKeyLocationVersions()) {
List<DeletedBlock> item = keyLocations.getLocationList().stream()
.map(b -> new DeletedBlock(
- new BlockID(b.getContainerID(), b.getLocalID()),
info.getDataSize(), info.getReplicatedSize()))
+ new BlockID(b.getContainerID(),
+ b.getLocalID()),
+ b.getLength(),
+ QuotaUtil.getReplicatedSize(b.getLength(),
+ info.getReplicationConfig())))
.collect(Collectors.toList());
BlockGroup keyBlocks = BlockGroup.newBuilder()
.setKeyName(deletedKey)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
