HBASE-23968 Incorporated PR feedback

Author: mwkang

hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java

@@ -322,7 +322,7 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel
         if (LOG.isDebugEnabled()) {
           now = currentTime;
         }
-        if (closeChecker.isClosedByTimeLimit(store, currentTime)) {
+        if (closeChecker.isTimeLimit(store, currentTime)) {
           progress.cancel();
           return false;
         }
@@ -489,7 +489,7 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel
             bytesWrittenProgressForLog += len;
           }
           throughputController.control(compactionName, len);
-          if (closeChecker.isClosedBySizeLimit(store, len)) {
+          if (closeChecker.isSizeLimit(store, len)) {
             progress.cancel();
             return false;
           }

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CloseChecker.java

@@ -40,7 +40,12 @@ public CloseChecker(Configuration conf, long currentTime) {
     this.lastCloseCheckMillis = currentTime;
   }
 
-  public boolean isClosedBySizeLimit(Store store, long bytesWritten) {
+  /**
+   * Check periodically to see if a system stop is requested every written bytes reach size limit.
+   *
+   * @return if true, system stop.
+   */
+  public boolean isSizeLimit(Store store, long bytesWritten) {
     if (closeCheckSizeLimit <= 0) {
       return false;
     }
@@ -54,7 +59,12 @@ public boolean isClosedBySizeLimit(Store store, long bytesWritten) {
     return !store.areWritesEnabled();
   }
 
-  public boolean isClosedByTimeLimit(Store store, long now) {
+  /**
+   * Check periodically to see if a system stop is requested every time.
+   *
+   * @return if true, system stop.
+   */
+  public boolean isTimeLimit(Store store, long now) {
     if (closeCheckTimeLimit <= 0) {
       return false;
     }

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java

@@ -396,7 +396,7 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel
         if (LOG.isDebugEnabled()) {
           now = currentTime;
         }
-        if (closeChecker.isClosedByTimeLimit(store, currentTime)) {
+        if (closeChecker.isTimeLimit(store, currentTime)) {
           progress.cancel();
           return false;
         }
@@ -421,7 +421,7 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel
             bytesWrittenProgressForLog += len;
           }
           throughputController.control(compactionName, len);
-          if (closeChecker.isClosedBySizeLimit(store, len)) {
+          if (closeChecker.isSizeLimit(store, len)) {
             progress.cancel();
             return false;
           }

hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java

@@ -173,7 +173,7 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel
         if (LOG.isDebugEnabled()) {
           now = currentTime;
         }
-        if (closeChecker.isClosedByTimeLimit(store, currentTime)) {
+        if (closeChecker.isTimeLimit(store, currentTime)) {
           progress.cancel();
           return false;
         }
@@ -297,7 +297,7 @@ protected boolean performCompaction(FileDetails fd, InternalScanner scanner, Cel
             bytesWrittenProgressForLog += len;
           }
           throughputController.control(compactionName, len);
-          if (closeChecker.isClosedBySizeLimit(store, len)) {
+          if (closeChecker.isSizeLimit(store, len)) {
             progress.cancel();
             return false;
           }

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestCloseChecker.java

@@ -54,27 +54,27 @@ public void testIsClosed() {
     conf.setLong(TIME_LIMIT_KEY, 10);
 
     CloseChecker closeChecker = new CloseChecker(conf, currentTime);
-    assertFalse(closeChecker.isClosedByTimeLimit(enableWrite, currentTime));
-    assertFalse(closeChecker.isClosedBySizeLimit(enableWrite, 10L));
+    assertFalse(closeChecker.isTimeLimit(enableWrite, currentTime));
+    assertFalse(closeChecker.isSizeLimit(enableWrite, 10L));
 
     closeChecker = new CloseChecker(conf, currentTime);
-    assertFalse(closeChecker.isClosedByTimeLimit(enableWrite, currentTime + 11));
-    assertFalse(closeChecker.isClosedBySizeLimit(enableWrite, 11L));
+    assertFalse(closeChecker.isTimeLimit(enableWrite, currentTime + 11));
+    assertFalse(closeChecker.isSizeLimit(enableWrite, 11L));
 
     closeChecker = new CloseChecker(conf, currentTime);
-    assertTrue(closeChecker.isClosedByTimeLimit(disableWrite, currentTime + 11));
-    assertTrue(closeChecker.isClosedBySizeLimit(disableWrite, 11L));
+    assertTrue(closeChecker.isTimeLimit(disableWrite, currentTime + 11));
+    assertTrue(closeChecker.isSizeLimit(disableWrite, 11L));
 
     for (int i = 0; i < 10; i++) {
       int plusTime = 5 * i;
-      assertFalse(closeChecker.isClosedByTimeLimit(enableWrite, currentTime + plusTime));
-      assertFalse(closeChecker.isClosedBySizeLimit(enableWrite, 5L));
+      assertFalse(closeChecker.isTimeLimit(enableWrite, currentTime + plusTime));
+      assertFalse(closeChecker.isSizeLimit(enableWrite, 5L));
     }
 
     closeChecker = new CloseChecker(conf, currentTime);
-    assertFalse(closeChecker.isClosedByTimeLimit(disableWrite, currentTime + 6));
-    assertFalse(closeChecker.isClosedBySizeLimit(disableWrite, 6));
-    assertTrue(closeChecker.isClosedByTimeLimit(disableWrite, currentTime + 12));
-    assertTrue(closeChecker.isClosedBySizeLimit(disableWrite, 6));
+    assertFalse(closeChecker.isTimeLimit(disableWrite, currentTime + 6));
+    assertFalse(closeChecker.isSizeLimit(disableWrite, 6));
+    assertTrue(closeChecker.isTimeLimit(disableWrite, currentTime + 12));
+    assertTrue(closeChecker.isSizeLimit(disableWrite, 6));
   }
 }