HDDS-10504. Remove unused VolumeInfo#configuredCapacity (apache#6363)

(cherry picked from commit 0763985)
xichen01 · Jul 18, 2024 · 03c658d · 03c658d
1 parent ae38ec3
commit 03c658d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/...ner-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java b/...ner-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
@@ -100,11 +100,6 @@ public final class VolumeInfo {
   // Space usage calculator
   private final VolumeUsage usage;
 
-  // Capacity configured. This is useful when we want to
-  // limit the visible capacity for tests. If negative, then we just
-  // query from the filesystem.
-  private long configuredCapacity;
-
   private long reservedInBytes;
 
   /**
@@ -115,7 +110,6 @@ public static class Builder {
     private final String rootDir;
     private SpaceUsageCheckFactory usageCheckFactory;
     private StorageType storageType;
-    private long configuredCapacity;
 
     public Builder(String root, ConfigurationSource config) {
       this.rootDir = root;
@@ -127,11 +121,6 @@ public Builder storageType(StorageType st) {
       return this;
     }
 
-    public Builder configuredCapacity(long capacity) {
-      this.configuredCapacity = capacity;
-      return this;
-    }
-
     public Builder usageCheckFactory(SpaceUsageCheckFactory factory) {
       this.usageCheckFactory = factory;
       return this;
@@ -206,9 +195,6 @@ private VolumeInfo(Builder b) throws IOException {
     this.storageType = (b.storageType != null ?
         b.storageType : StorageType.DEFAULT);
 
-    this.configuredCapacity = (b.configuredCapacity != 0 ?
-        b.configuredCapacity : -1);
-
     SpaceUsageCheckFactory usageCheckFactory = b.usageCheckFactory;
     if (usageCheckFactory == null) {
       usageCheckFactory = SpaceUsageCheckFactory.create(b.conf);
@@ -222,10 +208,7 @@ private VolumeInfo(Builder b) throws IOException {
   }
 
   public long getCapacity() {
-    if (configuredCapacity < 0) {
-      return Math.max(usage.getCapacity() - reservedInBytes, 0);
-    }
-    return configuredCapacity;
+    return Math.max(usage.getCapacity() - reservedInBytes, 0);
   }
 
   /**

diff --git a/...er-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java b/...er-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
@@ -34,7 +34,7 @@
  * Class that wraps the space df of the Datanode Volumes used by SCM
  * containers.
  */
-public class VolumeUsage implements SpaceUsageSource {
+public class VolumeUsage {
 
   private final CachingSpaceUsageSource source;
   private boolean shutdownComplete;
@@ -47,7 +47,6 @@ public class VolumeUsage implements SpaceUsageSource {
     start(); // TODO should start only on demand
   }
 
-  @Override
   public long getCapacity() {
     return Math.max(source.getCapacity(), 0);
   }
@@ -60,7 +59,6 @@ public long getCapacity() {
    *                      remainingReserved
    * B) avail = fsAvail - Max(reserved - other, 0);
    */
-  @Override
   public long getAvailable() {
     return source.getAvailable() - getRemainingReserved();
   }
@@ -70,12 +68,10 @@ public long getAvailable(SpaceUsageSource precomputedVolumeSpace) {
     return available - getRemainingReserved(precomputedVolumeSpace);
   }
 
-  @Override
   public long getUsedSpace() {
     return source.getUsedSpace();
   }
 
-  @Override
   public SpaceUsageSource snapshot() {
     return source.snapshot();
   }