HDDS-148. Remove ContainerReportManager and ContainerReportManagerImpl. Contributed by Nanda kumar.

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerManagerImpl.java

@@ -53,8 +53,6 @@ import org.apache.hadoop.ozone.container.common.interfaces
 import org.apache.hadoop.ozone.container.common.interfaces
     .ContainerLocationManager;
 import org.apache.hadoop.ozone.container.common.interfaces.ContainerManager;
-import org.apache.hadoop.ozone.container.common.interfaces
-    .ContainerReportManager;
 import org.apache.hadoop.ozone.container.common.interfaces.KeyManager;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.utils.MetadataKeyFilters;
@@ -127,10 +125,8 @@ public class ContainerManagerImpl implements ContainerManager {
   private ChunkManager chunkManager;
   private KeyManager keyManager;
   private Configuration conf;
-  private DatanodeDetails datanodeDetails;
 
   private ContainerDeletionChoosingPolicy containerDeletionChooser;
-  private ContainerReportManager containerReportManager;
 
   /**
    * Init call that sets up a container Manager.
@@ -154,7 +150,6 @@ public class ContainerManagerImpl implements ContainerManager {
         " directories must be greater than zero.");
 
     this.conf = config;
-    this.datanodeDetails = dnDetails;
 
     readLock();
     try {
@@ -203,9 +198,6 @@ public class ContainerManagerImpl implements ContainerManager {
       }
       this.locationManager =
           new ContainerLocationManagerImpl(containerDirs, dataDirs, config);
-
-      this.containerReportManager =
-          new ContainerReportManagerImpl(config);
     } finally {
       readUnlock();
     }

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerReportManagerImpl.java

@@ -1,67 +0,0 @@
-/*
- * 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
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.hadoop.ozone.container.common.impl;
-
-import org.apache.commons.lang3.RandomUtils;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.ozone.OzoneConfigKeys;
-import org.apache.hadoop.ozone.container.common.interfaces
-    .ContainerReportManager;
-import org.apache.hadoop.util.Time;
-
-import java.util.concurrent.TimeUnit;
-
-import static org.apache.hadoop.hdds.scm.HddsServerUtil.getScmHeartbeatInterval;
-
-/**
- * Class wraps the container report operations on datanode.
- * // TODO: support incremental/delta container report
- */
-public class ContainerReportManagerImpl implements ContainerReportManager {
-  // Last non-empty container report time
-  private long lastContainerReportTime;
-  private final long containerReportInterval;
-  private final long heartbeatInterval;
-
-  public ContainerReportManagerImpl(Configuration config) {
-    this.lastContainerReportTime = -1;
-    this.containerReportInterval = config.getTimeDuration(
-        OzoneConfigKeys.OZONE_CONTAINER_REPORT_INTERVAL,
-        OzoneConfigKeys.OZONE_CONTAINER_REPORT_INTERVAL_DEFAULT,
-        TimeUnit.MILLISECONDS);
-    this.heartbeatInterval = getScmHeartbeatInterval(config);
-  }
-
-  public boolean shouldSendContainerReport() {
-    if (lastContainerReportTime < 0) {
-      return true;
-    }
-    // Add a random delay (0~30s) on top of the container report
-    // interval (60s) so tha the SCM is overwhelmed by the container reports
-    // sent in sync.
-    if (Time.monotonicNow() - lastContainerReportTime >
-        (containerReportInterval + getRandomReportDelay())) {
-      return true;
-    }
-    return false;
-  }
-
-  private long getRandomReportDelay() {
-    return RandomUtils.nextLong(0, heartbeatInterval);
-  }
-}

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerReportManager.java

@@ -1,30 +0,0 @@
-/*
- * 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
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.hadoop.ozone.container.common.interfaces;
-
-/**
- * Interface for container report manager operations.
- */
-public interface ContainerReportManager {
-
-  /**
-   * Check if we have to send container report.
-   * @return true if container report has to be sent.
-   */
-  boolean shouldSendContainerReport();
-}