HDDS-10897. Refactor OzoneQuota #6714
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
|
|
@@ -19,52 +19,82 @@ | |
| package org.apache.hadoop.hdds.client; | ||
|
|
||
| import com.google.common.base.Strings; | ||
| import org.apache.hadoop.ozone.OzoneConsts; | ||
| import org.apache.ratis.util.Preconditions; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * represents an OzoneQuota Object that can be applied to | ||
| * a storage volume. | ||
| */ | ||
| public final class OzoneQuota { | ||
|
|
||
| /** Quota Units.*/ | ||
| public enum Units { | ||
| // the names and the ordering are important | ||
| B(1), | ||
| KB(OzoneConsts.KB), | ||
| MB(OzoneConsts.MB), | ||
| GB(OzoneConsts.GB), | ||
| TB(OzoneConsts.TB); | ||
|
|
||
| private final long size; | ||
| private final List<RawQuotaInBytes> cache; | ||
|
|
||
| Units(long size) { | ||
| this.size = size; | ||
| this.cache = createCache(this); | ||
| } | ||
|
|
||
| private static List<RawQuotaInBytes> createCache(Units unit) { | ||
| final List<RawQuotaInBytes> quotas = new ArrayList<>(1024); | ||
| for (int i = 0; i < 1024; i++) { | ||
| quotas.add(new RawQuotaInBytes(unit, i)); | ||
| } | ||
| return Collections.unmodifiableList(quotas); | ||
| } | ||
|
|
||
| public long getSize() { | ||
| return size; | ||
| } | ||
|
|
||
| RawQuotaInBytes getRawQuotaInBytes(long b) { | ||
| return b < cache.size() ? cache.get(Math.toIntExact(b)) | ||
| : new RawQuotaInBytes(this, b); | ||
| } | ||
| } | ||
|
|
||
| private static final List<Units> PARSE_ORDER; | ||
| static { | ||
| List<Units> reversed = new ArrayList<>(Arrays.asList(Units.values())); | ||
| Collections.reverse(reversed); | ||
| PARSE_ORDER = Collections.unmodifiableList(reversed); | ||
| } | ||
|
|
||
| // Quota to decide how many buckets can be created. | ||
| private long quotaInNamespace; | ||
| // Quota to decide how many storage space will be used in bytes. | ||
| private final long quotaInBytes; | ||
| private final RawQuotaInBytes rawQuotaInBytes; | ||
|
|
||
| /** | ||
| * Used to convert user input values into bytes such as: 1MB-> 1048576. | ||
| */ | ||
| private static class RawQuotaInBytes { | ||
| static RawQuotaInBytes valueOf(long quotaInBytes) { | ||
|
Contributor
There was a problem hiding this comment. Add a precondition: Preconditions.assertTrue(quotaInBytes >= 0, () -> "quotaInBytes = " + quotaInBytes + " must be >= 0"); |
||
| final int i = Long.numberOfTrailingZeros(quotaInBytes) / 10; | ||
| final Units unit = Units.values()[i]; | ||
| final RawQuotaInBytes b = unit.getRawQuotaInBytes(quotaInBytes >> (i * 10)); | ||
| Preconditions.assertSame(quotaInBytes, b.sizeInBytes(), "sizeInBytes"); | ||
| return b; | ||
| } | ||
|
Comment on lines
+90
to
+97
Contributor
There was a problem hiding this comment. @adoroszlai , Just found that public static void main(String[] args) {
final RawQuotaInBytes q = RawQuotaInBytes.valueOf(0);
System.out.println("q = " + q);
}
// q = 0 EB |
||
|
|
||
| private final Units unit; | ||
| private final long size; | ||
|
|
||
| RawQuotaInBytes(Units unit, long size) { | ||
| this.unit = unit; | ||
|
|
@@ -83,14 +113,7 @@ public long getSize() { | |
| * Returns size in Bytes or negative num if there is no Quota. | ||
| */ | ||
| public long sizeInBytes() { | ||
| return this.getSize() * getUnit().getSize(); | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -158,20 +181,21 @@ public static OzoneQuota parseSpaceQuota(String quotaInBytes) { | |
| String uppercase = quotaInBytes.toUpperCase() | ||
| .replaceAll("\\s+", ""); | ||
| String size = ""; | ||
| final long nSize; | ||
| Units currUnit = Units.B; | ||
|
|
||
| try { | ||
| for (Units unit : PARSE_ORDER) { | ||
| final String quota = unit.name(); | ||
| if (uppercase.endsWith((quota))) { | ||
| size = uppercase | ||
| .substring(0, uppercase.length() - quota.length()); | ||
| currUnit = unit; | ||
| break; | ||
| } | ||
| } | ||
| // there might be no unit specified. | ||
| if (size.isEmpty()) { | ||
| size = uppercase; | ||
| } | ||
| nSize = Long.parseLong(size); | ||
|
|
@@ -240,15 +264,7 @@ public static OzoneQuota parseQuota(String quotaInBytes, | |
| */ | ||
| public static OzoneQuota getOzoneQuota(long quotaInBytes, | ||
| long quotaInNamespace) { | ||
| return new OzoneQuota(quotaInNamespace, RawQuotaInBytes.valueOf(quotaInBytes)); | ||
| } | ||
|
|
||
| public long getQuotaInNamespace() { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add also
It sounds stupid if someone wants to set 1PB quote but Ozone does not support it.
Also, after the above change, the following will never have
ArrayIndexOutOfBoundsException.