Rename container scan helper

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/BackgroundContainerDataScanner.java

@@ -19,13 +19,10 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
-import java.time.Instant;
 import java.util.Iterator;
-import java.util.Optional;
+
 import org.apache.hadoop.hdfs.util.Canceler;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
-import org.apache.hadoop.ozone.container.checksum.ContainerChecksumTreeManager;
-import org.apache.hadoop.ozone.container.common.impl.ContainerData;
 import org.apache.hadoop.ozone.container.common.interfaces.Container;
 import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
 import org.slf4j.Logger;
@@ -48,7 +45,7 @@ public class BackgroundContainerDataScanner extends
   private final Canceler canceler;
   private static final String NAME_FORMAT = "ContainerDataScanner(%s)";
   private final ContainerDataScannerMetrics metrics;
-  private final ContainerScannerMixin scannerMixin;
+  private final ContainerScanHelper scannerMixin;
 
   public BackgroundContainerDataScanner(ContainerScannerConfiguration conf,
                                         ContainerController controller,
@@ -60,7 +57,7 @@ public BackgroundContainerDataScanner(ContainerScannerConfiguration conf,
     canceler = new Canceler();
     this.metrics = ContainerDataScannerMetrics.create(volume.toString());
     this.metrics.setStorageDirectory(volume.toString());
-    this.scannerMixin = new ContainerScannerMixin(LOG, controller, metrics, conf);
+    this.scannerMixin = new ContainerScanHelper(LOG, controller, metrics, conf);
   }
 
   @Override

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/BackgroundContainerMetadataScanner.java

@@ -35,14 +35,14 @@ public class BackgroundContainerMetadataScanner extends
       LoggerFactory.getLogger(BackgroundContainerMetadataScanner.class);
   private final ContainerMetadataScannerMetrics metrics;
   private final ContainerController controller;
-  private final ContainerScannerMixin scannerMixin;
+  private final ContainerScanHelper scannerMixin;
 
   public BackgroundContainerMetadataScanner(ContainerScannerConfiguration conf,
                                             ContainerController controller) {
     super("ContainerMetadataScanner", conf.getMetadataScanInterval());
     this.controller = controller;
     this.metrics = ContainerMetadataScannerMetrics.create();
-    this.scannerMixin = new ContainerScannerMixin(LOG, controller, metrics, conf);
+    this.scannerMixin = new ContainerScanHelper(LOG, controller, metrics, conf);
   }
 
   @Override

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScannerMixin.java → hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerScanHelper.java

@@ -17,33 +17,29 @@
 
 package org.apache.hadoop.ozone.container.ozoneimpl;
 
-import static org.apache.hadoop.hdds.HddsUtils.checksumToString;
-
 import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Optional;
 import org.apache.hadoop.hdfs.util.Canceler;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
-import org.apache.hadoop.ozone.container.checksum.ContainerChecksumTreeManager;
 import org.apache.hadoop.ozone.container.common.impl.ContainerData;
 import org.apache.hadoop.ozone.container.common.interfaces.Container;
 import org.apache.hadoop.ozone.container.common.interfaces.ScanResult;
-import org.apache.hadoop.ozone.container.common.utils.ContainerLogger;
 import org.apache.hadoop.ozone.container.common.volume.HddsVolume;
 import org.slf4j.Logger;
 
 /**
  * Mixin to handle common data and metadata scan operations among background and on-demand scanners.
  */
-public class ContainerScannerMixin {
+public class ContainerScanHelper {
   private final Logger log;
   private final ContainerController controller;
   private final AbstractContainerScannerMetrics metrics;
   private final long minScanGap;
 
-  public ContainerScannerMixin(Logger log, ContainerController controller,
-      AbstractContainerScannerMetrics metrics, ContainerScannerConfiguration conf) {
+  public ContainerScanHelper(Logger log, ContainerController controller,
+                             AbstractContainerScannerMetrics metrics, ContainerScannerConfiguration conf) {
     this.log = log;
     this.controller = controller;
     this.metrics = metrics;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/OnDemandContainerDataScanner.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.hadoop.hdfs.util.Canceler;
 import org.apache.hadoop.hdfs.util.DataTransferThrottler;
-import org.apache.hadoop.ozone.container.checksum.ContainerChecksumTreeManager;
 import org.apache.hadoop.ozone.container.common.interfaces.Container;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,7 +43,7 @@ public final class OnDemandContainerDataScanner {
   private final ConcurrentHashMap
       .KeySetView<Long, Boolean> containerRescheduleCheckSet;
   private final OnDemandScannerMetrics metrics;
-  private final ContainerScannerMixin scannerMixin;
+  private final ContainerScanHelper scannerMixin;
 
   public OnDemandContainerDataScanner(
       ContainerScannerConfiguration conf, ContainerController controller) {
@@ -54,7 +53,7 @@ public OnDemandContainerDataScanner(
     metrics = OnDemandScannerMetrics.create();
     scanExecutor = Executors.newSingleThreadExecutor();
     containerRescheduleCheckSet = ConcurrentHashMap.newKeySet();
-    this.scannerMixin = new ContainerScannerMixin(LOG, controller, metrics, conf);
+    this.scannerMixin = new ContainerScanHelper(LOG, controller, metrics, conf);
   }
 
   public Optional<Future<?>> scanContainer(Container<?> container) {