addressing review commits

Author: priyeshkaratha

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java

@@ -54,8 +54,6 @@
  */
 public final class RatisUtil {
 
-  public static final long SCM_RAFT_SNAPSHOT_GAP = 1L;
-
   private RatisUtil() {
   }
 
@@ -233,7 +231,6 @@ private static void setRaftSnapshotProperties(
     Snapshot.setAutoTriggerThreshold(properties,
         ozoneConf.getLong(ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_THRESHOLD,
                 ScmConfigKeys.OZONE_SCM_HA_RATIS_SNAPSHOT_THRESHOLD_DEFAULT));
-    Snapshot.setCreationGap(properties, SCM_RAFT_SNAPSHOT_GAP);
   }
 
   public static void checkRatisException(IOException e, String port,

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java

@@ -142,8 +142,7 @@ private void createStartTransactionBufferMonitor() {
         OZONE_SCM_HA_DBTRANSACTIONBUFFER_FLUSH_INTERVAL_DEFAULT,
         TimeUnit.MILLISECONDS);
     SCMHATransactionBufferMonitorTask monitorTask
-        = new SCMHATransactionBufferMonitorTask(
-        transactionBuffer, ratisServer, interval);
+        = new SCMHATransactionBufferMonitorTask(transactionBuffer, interval);
     trxBufferMonitorService =
         new BackgroundSCMService.Builder().setClock(scm.getSystemClock())
             .setScmContext(scm.getScmContext())

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHATransactionBufferMonitorTask.java

@@ -18,7 +18,6 @@
 package org.apache.hadoop.hdds.scm.ha;
 
 import java.io.IOException;
-import org.apache.ratis.statemachine.SnapshotInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,38 +28,26 @@
 public class SCMHATransactionBufferMonitorTask implements Runnable {
   private static final Logger LOG =
       LoggerFactory.getLogger(SCMHATransactionBufferMonitorTask.class);
-  private final SCMRatisServer server;
   private final SCMHADBTransactionBuffer transactionBuffer;
   private final long flushInterval;
 
   /**
    * SCMService related variables.
    */
   public SCMHATransactionBufferMonitorTask(
-      SCMHADBTransactionBuffer transactionBuffer,
-      SCMRatisServer server, long flushInterval) {
+      SCMHADBTransactionBuffer transactionBuffer, long flushInterval) {
     this.flushInterval = flushInterval;
     this.transactionBuffer = transactionBuffer;
-    this.server = server;
   }
 
   @Override
   public void run() {
     if (transactionBuffer.shouldFlush(flushInterval)) {
       LOG.debug("Running TransactionFlushTask");
-      // set latest snapshot to null for force snapshot
-      // the value will be reset again when snapshot is taken
-      final SnapshotInfo lastSnapshot = transactionBuffer
-          .getLatestSnapshotRef().getAndSet(null);
       try {
-        server.triggerSnapshot();
+        transactionBuffer.flush();
       } catch (IOException e) {
-        LOG.error("Snapshot request is failed", e);
-      } finally {
-        // under failure case, if unable to take snapshot, its value
-        // is reset to previous known value
-        transactionBuffer.getLatestSnapshotRef().compareAndSet(
-            null, lastSnapshot);
+        LOG.error("TransactionFlushTask is failed", e);
       }
     }
   }