Skip to content

HDDS-8885. Quota repair count enable quota feature for old bucket/volume #4941

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
sadanand48 merged 4 commits into from
Jun 26, 2023
Merged

HDDS-8885. Quota repair count enable quota feature for old bucket/volume #4941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbce0da
HDDS-8885. Quota repair count enable quota feature for old bucket/volume
sumitagrawl Jun 19, 2023
f5c5689
HDDS-8885. Quota repair count enable quota feature for old bucket/volume
sumitagrawl Jun 20, 2023
9f33528
HDDS-8885. Quota repair count enable quota feature for old bucket/volume
sumitagrawl Jun 21, 2023
f3b47d0
HDDS-8885. Quota repair count enable quota feature for old bucket/volume
sumitagrawl Jun 23, 2023
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
83 changes: 82 additions & 1 deletion ...ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/QuotaRepairTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.TableIterator;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
Expand All @@ -48,8 +50,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.apache.hadoop.ozone.OzoneConsts.OLD_QUOTA_DEFAULT;
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static org.apache.hadoop.ozone.OzoneConsts.QUOTA_RESET;
import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.VOLUME_LOCK;

/**
* Quota repair task.
Expand All @@ -59,6 +64,7 @@ public class QuotaRepairTask {
QuotaRepairTask.class);
private static final int BATCH_SIZE = 5000;
private static final int TASK_THREAD_CNT = 3;
public static final long EPOCH_DEFAULT = -1L;
private final OMMetadataManager metadataManager;
private final Map<String, OmBucketInfo> nameBucketInfoMap = new HashMap<>();
private final Map<String, OmBucketInfo> idBucketInfoMap = new HashMap<>();
Expand All @@ -68,6 +74,7 @@ public class QuotaRepairTask {
= new ConcurrentHashMap<>();
private final Map<String, CountPair> directoryCountMap
= new ConcurrentHashMap<>();
private final Map<String, String> oldVolumeKeyNameMap = new HashMap();

public QuotaRepairTask(OMMetadataManager metadataManager) {
this.metadataManager = metadataManager;
Expand All @@ -90,6 +97,13 @@ public void repair() throws Exception {
executor.shutdown();
LOG.info("Completed quota repair task");
}
updateOldVolumeQuotaSupport();

// cleanup epoch added to avoid extra epoch id in cache
ArrayList<Long> epochs = new ArrayList<>();
epochs.add(EPOCH_DEFAULT);
metadataManager.getBucketTable().cleanupCache(epochs);
metadataManager.getVolumeTable().cleanupCache(epochs);
}

private void prepareAllVolumeBucketInfo() throws IOException {
Expand All @@ -102,8 +116,48 @@ private void prepareAllVolumeBucketInfo() throws IOException {
iterator.next();
omVolumeArgs = entry.getValue();
getAllBuckets(omVolumeArgs.getVolume(), omVolumeArgs.getObjectID());
if (omVolumeArgs.getQuotaInBytes() == OLD_QUOTA_DEFAULT
|| omVolumeArgs.getQuotaInNamespace() == OLD_QUOTA_DEFAULT) {
oldVolumeKeyNameMap.put(entry.getKey(), entry.getValue().getVolume());
}
}
}
}

private void updateOldVolumeQuotaSupport() throws IOException {
LOG.info("Starting volume quota support update");
IOzoneManagerLock lock = metadataManager.getLock();
try (BatchOperation batchOperation = metadataManager.getStore()
.initBatchOperation()) {
for (Map.Entry<String, String> volEntry
: oldVolumeKeyNameMap.entrySet()) {
lock.acquireReadLock(VOLUME_LOCK, volEntry.getValue());
try {
OmVolumeArgs omVolumeArgs = metadataManager.getVolumeTable().get(
volEntry.getKey());
boolean isQuotaReset = false;
if (omVolumeArgs.getQuotaInBytes() == OLD_QUOTA_DEFAULT) {
omVolumeArgs.setQuotaInBytes(QUOTA_RESET);
isQuotaReset = true;
}
if (omVolumeArgs.getQuotaInNamespace() == OLD_QUOTA_DEFAULT) {
omVolumeArgs.setQuotaInNamespace(QUOTA_RESET);
isQuotaReset = true;
}
if (isQuotaReset) {
metadataManager.getVolumeTable().addCacheEntry(
new CacheKey<>(volEntry.getKey()),
CacheValue.get(EPOCH_DEFAULT, omVolumeArgs));
metadataManager.getVolumeTable().putWithBatch(batchOperation,
volEntry.getKey(), omVolumeArgs);
}
} finally {
lock.releaseReadLock(VOLUME_LOCK, volEntry.getValue());
}
}
metadataManager.getStore().commitBatchOperation(batchOperation);
}
LOG.info("Completed volume quota support update");
}

private void getAllBuckets(String volumeName, long volumeId)
Expand Down Expand Up @@ -176,6 +230,9 @@ private void repairCount() throws Exception {
updateCountToBucketInfo(idBucketInfoMap, fileCountMap);
updateCountToBucketInfo(idBucketInfoMap, directoryCountMap);

// update quota enable flag for old volume and buckets
updateOldBucketQuotaSupport();

try (BatchOperation batchOperation = metadataManager.getStore()
.initBatchOperation()) {
for (Map.Entry<String, OmBucketInfo> entry
Expand All @@ -190,7 +247,31 @@ private void repairCount() throws Exception {
}
LOG.info("Completed quota repair for all keys, files and directories");
}


private void updateOldBucketQuotaSupport() {
for (Map.Entry<String, OmBucketInfo> entry : nameBucketInfoMap.entrySet()) {
if (entry.getValue().getQuotaInBytes() == OLD_QUOTA_DEFAULT
|| entry.getValue().getQuotaInNamespace() == OLD_QUOTA_DEFAULT) {
OmBucketInfo.Builder builder = entry.getValue().toBuilder();
if (entry.getValue().getQuotaInBytes() == OLD_QUOTA_DEFAULT) {
builder.setQuotaInBytes(QUOTA_RESET);
}
if (entry.getValue().getQuotaInNamespace() == OLD_QUOTA_DEFAULT) {
builder.setQuotaInNamespace(QUOTA_RESET);
}
OmBucketInfo bucketInfo = builder.build();
entry.setValue(bucketInfo);

// there is a new value to be updated in bucket cache
String bucketKey = metadataManager.getBucketKey(
bucketInfo.getVolumeName(), bucketInfo.getBucketName());
metadataManager.getBucketTable().addCacheEntry(
new CacheKey<>(bucketKey),
CacheValue.get(EPOCH_DEFAULT, bucketInfo));
}
}
}

private <VALUE> void recalculateUsages(
Table<String, VALUE> table, Map<String, CountPair> prefixUsageMap,
String strType, boolean haveValue) throws UncheckedIOException,
Expand Down
43 changes: 43 additions & 0 deletions ...e/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestQuotaRepairTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
package org.apache.hadoop.ozone.om.service;

import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
import org.apache.hadoop.ozone.om.request.key.TestOMKeyRequest;
import org.apache.hadoop.util.Time;
Expand Down Expand Up @@ -90,4 +93,44 @@ public void testQuotaRepair() throws Exception {
Assert.assertTrue(fsoUpdateBucketInfo.getUsedNamespace() == 13);
Assert.assertTrue(fsoUpdateBucketInfo.getUsedBytes() == 10000);
}

@Test
public void testQuotaRepairForOldVersionVolumeBucket() throws Exception {
// add volume with -2 value
OmVolumeArgs omVolumeArgs =
OmVolumeArgs.newBuilder().setCreationTime(Time.now())
.setVolume(volumeName).setAdminName(volumeName)
.setOwnerName(volumeName).setQuotaInBytes(-2)
.setQuotaInNamespace(-2).build();
omMetadataManager.getVolumeTable().put(
omMetadataManager.getVolumeKey(volumeName), omVolumeArgs);
omMetadataManager.getVolumeTable().addCacheEntry(
new CacheKey<>(omMetadataManager.getVolumeKey(volumeName)),
CacheValue.get(1L, omVolumeArgs));

// add bucket with -2 value
OMRequestTestUtils.addBucketToDB(volumeName, bucketName,
omMetadataManager, -2);

// pre check for quota flag
OmBucketInfo bucketInfo = omMetadataManager.getBucketTable().get(
omMetadataManager.getBucketKey(volumeName, bucketName));
Assert.assertTrue(bucketInfo.getQuotaInBytes() == -2);

omVolumeArgs = omMetadataManager.getVolumeTable().get(
omMetadataManager.getVolumeKey(volumeName));
Assert.assertTrue(omVolumeArgs.getQuotaInBytes() == -2);
Assert.assertTrue(omVolumeArgs.getQuotaInNamespace() == -2);

QuotaRepairTask quotaRepairTask = new QuotaRepairTask(omMetadataManager);
quotaRepairTask.repair();

bucketInfo = omMetadataManager.getBucketTable().get(
omMetadataManager.getBucketKey(volumeName, bucketName));
Assert.assertTrue(bucketInfo.getQuotaInBytes() == -1);
OmVolumeArgs volArgsVerify = omMetadataManager.getVolumeTable()
.get(omMetadataManager.getVolumeKey(volumeName));
Assert.assertTrue(volArgsVerify.getQuotaInBytes() == -1);
Assert.assertTrue(volArgsVerify.getQuotaInNamespace() == -1);
}
}