You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ca...@apache.org on 2020/12/28 06:17:24 UTC
[ozone] branch master updated: HDDS-4623. Update CountQuota to
NamesapceQuota (#1735)
This is an automated email from the ASF dual-hosted git repository.
captainzmc 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 04401dd HDDS-4623. Update CountQuota to NamesapceQuota (#1735)
04401dd is described below
commit 04401dde89d96053b6279fe3a0e45e505d96436c
Author: Rui Wang <am...@users.noreply.github.com>
AuthorDate: Sun Dec 27 22:17:11 2020 -0800
HDDS-4623. Update CountQuota to NamesapceQuota (#1735)
* HDDS-4623. Update CountQuota to NamesapceQuota
---
.../src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java | 4 ++--
.../src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java | 4 ++--
.../hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java | 4 ++--
.../org/apache/hadoop/ozone/shell/ClearSpaceQuotaOptions.java | 8 ++++----
.../org/apache/hadoop/ozone/shell/bucket/ClearQuotaHandler.java | 4 ++--
.../org/apache/hadoop/ozone/shell/bucket/SetQuotaHandler.java | 6 +++---
.../org/apache/hadoop/ozone/shell/volume/ClearQuotaHandler.java | 4 ++--
.../org/apache/hadoop/ozone/shell/volume/SetQuotaHandler.java | 6 +++---
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
index cebe0d9..f688a66 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneBucket.java
@@ -434,11 +434,11 @@ public class OzoneBucket extends WithMetadata {
}
/**
- * Clean the count quota of the bucket.
+ * Clean the namespace quota of the bucket.
*
* @throws IOException
*/
- public void clearCountQuota() throws IOException {
+ public void clearNamespaceQuota() throws IOException {
OzoneBucket ozoneBucket = proxy.getBucketDetails(volumeName, name);
proxy.setBucketQuota(volumeName, name, QUOTA_RESET,
ozoneBucket.getQuotaInBytes());
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
index c4fcbcb..369500f 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneVolume.java
@@ -296,11 +296,11 @@ public class OzoneVolume extends WithMetadata {
}
/**
- * Clean the count quota of the volume.
+ * Clean the namespace quota of the volume.
*
* @throws IOException
*/
- public void clearCountQuota() throws IOException {
+ public void clearNamespaceQuota() throws IOException {
OzoneVolume ozoneVolume = proxy.getVolumeDetails(name);
proxy.setVolumeQuota(name, QUOTA_RESET, ozoneVolume.getQuotaInBytes());
this.quotaInBytes = ozoneVolume.getQuotaInBytes();
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
index 2776f59..eada2f7 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
@@ -315,14 +315,14 @@ public abstract class TestOzoneRpcClientAbstract {
Assert.assertEquals(1000L, ozoneBucket.getQuotaInNamespace());
store.getVolume(volumeName).clearSpaceQuota();
- store.getVolume(volumeName).clearCountQuota();
+ store.getVolume(volumeName).clearNamespaceQuota();
OzoneVolume clrVolume = store.getVolume(volumeName);
Assert.assertEquals(OzoneConsts.QUOTA_RESET, clrVolume.getQuotaInBytes());
Assert.assertEquals(OzoneConsts.QUOTA_RESET,
clrVolume.getQuotaInNamespace());
ozoneBucket.clearSpaceQuota();
- ozoneBucket.clearCountQuota();
+ ozoneBucket.clearNamespaceQuota();
OzoneBucket clrBucket = store.getVolume(volumeName).getBucket(bucketName);
Assert.assertEquals(OzoneConsts.QUOTA_RESET, clrBucket.getQuotaInBytes());
Assert.assertEquals(OzoneConsts.QUOTA_RESET,
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/ClearSpaceQuotaOptions.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/ClearSpaceQuotaOptions.java
index 12ef6c1..8653c73 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/ClearSpaceQuotaOptions.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/ClearSpaceQuotaOptions.java
@@ -29,15 +29,15 @@ public class ClearSpaceQuotaOptions {
private boolean clrSpaceQuota;
@CommandLine.Option(names = {"--namespace-quota"},
- description = "clear count quota")
- private boolean clrCountQuota;
+ description = "clear namespace quota")
+ private boolean clrNamespaceQuota;
public boolean getClrSpaceQuota() {
return clrSpaceQuota;
}
- public boolean getClrCountQuota() {
- return clrCountQuota;
+ public boolean getClrNamespaceQuota() {
+ return clrNamespaceQuota;
}
}
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/ClearQuotaHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/ClearQuotaHandler.java
index 5e63a89..160475e 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/ClearQuotaHandler.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/ClearQuotaHandler.java
@@ -48,8 +48,8 @@ public class ClearQuotaHandler extends BucketHandler {
if (clrSpaceQuota.getClrSpaceQuota()) {
bucket.clearSpaceQuota();
}
- if (clrSpaceQuota.getClrCountQuota()) {
- bucket.clearCountQuota();
+ if (clrSpaceQuota.getClrNamespaceQuota()) {
+ bucket.clearNamespaceQuota();
}
}
}
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetQuotaHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetQuotaHandler.java
index f3e1ee3..21d0321 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetQuotaHandler.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetQuotaHandler.java
@@ -46,7 +46,7 @@ public class SetQuotaHandler extends BucketHandler {
OzoneBucket bucket = client.getObjectStore().getVolume(volumeName)
.getBucket(bucketName);
long spaceQuota = bucket.getQuotaInBytes();
- long countQuota = bucket.getQuotaInNamespace();
+ long namespaceQuota = bucket.getQuotaInNamespace();
if (quotaOptions.getQuotaInBytes() != null
&& !quotaOptions.getQuotaInBytes().isEmpty()) {
@@ -54,9 +54,9 @@ public class SetQuotaHandler extends BucketHandler {
quotaOptions.getQuotaInNamespace()).getQuotaInBytes();
}
if (quotaOptions.getQuotaInNamespace() >= 0) {
- countQuota = quotaOptions.getQuotaInNamespace();
+ namespaceQuota = quotaOptions.getQuotaInNamespace();
}
- bucket.setQuota(OzoneQuota.getOzoneQuota(spaceQuota, countQuota));
+ bucket.setQuota(OzoneQuota.getOzoneQuota(spaceQuota, namespaceQuota));
}
}
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/ClearQuotaHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/ClearQuotaHandler.java
index 72ae903..fc5dc96 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/ClearQuotaHandler.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/ClearQuotaHandler.java
@@ -46,8 +46,8 @@ public class ClearQuotaHandler extends VolumeHandler {
if (clrSpaceQuota.getClrSpaceQuota()) {
volume.clearSpaceQuota();
}
- if (clrSpaceQuota.getClrCountQuota()) {
- volume.clearCountQuota();
+ if (clrSpaceQuota.getClrNamespaceQuota()) {
+ volume.clearNamespaceQuota();
}
}
}
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/SetQuotaHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/SetQuotaHandler.java
index 1fb72f1..23aa333 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/SetQuotaHandler.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/SetQuotaHandler.java
@@ -45,7 +45,7 @@ public class SetQuotaHandler extends VolumeHandler {
OzoneVolume volume = client.getObjectStore().getVolume(volumeName);
long spaceQuota = volume.getQuotaInBytes();
- long countQuota = volume.getQuotaInNamespace();
+ long namespaceQuota = volume.getQuotaInNamespace();
if (quotaOptions.getQuotaInBytes() != null
&& !quotaOptions.getQuotaInBytes().isEmpty()) {
@@ -53,9 +53,9 @@ public class SetQuotaHandler extends VolumeHandler {
quotaOptions.getQuotaInNamespace()).getQuotaInBytes();
}
if (quotaOptions.getQuotaInNamespace() >= 0) {
- countQuota = quotaOptions.getQuotaInNamespace();
+ namespaceQuota = quotaOptions.getQuotaInNamespace();
}
- volume.setQuota(OzoneQuota.getOzoneQuota(spaceQuota, countQuota));
+ volume.setQuota(OzoneQuota.getOzoneQuota(spaceQuota, namespaceQuota));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org