diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java index d7d1df62b32a0901589b41c7861c80f517d38cbc..6594bf208d7689e8201ff204a57f821a859f7508 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java @@ -292,7 +292,7 @@ public class StorageEngine implements IService { } @Override - public void shutdown(long millseconds) throws ShutdownException { + public void shutdown(long milliseconds) throws ShutdownException { try { forceCloseAllProcessor(); } catch (TsFileProcessorException e) { diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java index 830ea56f3eb45c4b29fc67cb74b0b3fef31b38ce..aa2ef5f7ca646e195260ab2edf165d52d118c70b 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java @@ -67,9 +67,9 @@ public class CompactionMergeTaskPoolManager implements IService { } @Override - public void waitAndStop(long millseconds) { + public void waitAndStop(long milliseconds) { if (pool != null) { - awaitTermination(pool, millseconds); + awaitTermination(pool, milliseconds); logger.info("Waiting for task pool to shut down"); waitTermination(); } @@ -96,12 +96,12 @@ public class CompactionMergeTaskPoolManager implements IService { logger.info("CompactionManager stopped"); } - private void awaitTermination(ExecutorService service, long millseconds) { + private void awaitTermination(ExecutorService service, long milliseconds) { try { service.shutdown(); - service.awaitTermination(millseconds, TimeUnit.MILLISECONDS); + service.awaitTermination(milliseconds, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - logger.warn("CompactionThreadPool can not be closed in {} ms", millseconds); + logger.warn("CompactionThreadPool can not be closed in {} ms", milliseconds); Thread.currentThread().interrupt(); } service.shutdownNow(); diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java index ac0e38d4a43a1fa037440ce1a19db270ce137c77..aa4f0d119e8695acd042b1fc332ec85c91f89468 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java @@ -192,17 +192,17 @@ public class MergeManager implements IService, MergeManagerMBean { } @Override - public void waitAndStop(long millseconds) { + public void waitAndStop(long milliseconds) { if (mergeTaskPool != null) { if (timedMergeThreadPool != null) { - awaitTermination(timedMergeThreadPool, millseconds); + awaitTermination(timedMergeThreadPool, milliseconds); timedMergeThreadPool = null; } - awaitTermination(taskCleanerThreadPool, millseconds); + awaitTermination(taskCleanerThreadPool, milliseconds); taskCleanerThreadPool = null; - awaitTermination(mergeTaskPool, millseconds); - awaitTermination(mergeChunkSubTaskPool, millseconds); + awaitTermination(mergeTaskPool, milliseconds); + awaitTermination(mergeChunkSubTaskPool, milliseconds); logger.info("Waiting for task pool to shut down"); long startTime = System.currentTimeMillis(); while (!mergeTaskPool.isTerminated() || !mergeChunkSubTaskPool.isTerminated()) { @@ -227,12 +227,12 @@ public class MergeManager implements IService, MergeManagerMBean { } } - private void awaitTermination(ExecutorService service, long millseconds) { + private void awaitTermination(ExecutorService service, long milliseconds) { try { service.shutdown(); - service.awaitTermination(millseconds, TimeUnit.MILLISECONDS); + service.awaitTermination(milliseconds, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - logger.warn("MergeThreadPool can not be closed in {} ms", millseconds); + logger.warn("MergeThreadPool can not be closed in {} ms", milliseconds); Thread.currentThread().interrupt(); } service.shutdownNow(); diff --git a/server/src/main/java/org/apache/iotdb/db/service/IService.java b/server/src/main/java/org/apache/iotdb/db/service/IService.java index 96c49188756e3db11f3d0ece3d094c9f1f1a941f..4bd32ddd9e69d8c90b58de9e1d6913d630f9ecdb 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/IService.java +++ b/server/src/main/java/org/apache/iotdb/db/service/IService.java @@ -34,9 +34,9 @@ public interface IService { */ void stop(); - default void waitAndStop(long millseconds) {stop();} + default void waitAndStop(long milliseconds) {stop();} - default void shutdown(long millseconds) throws ShutdownException {waitAndStop(millseconds);} + default void shutdown(long milliseconds) throws ShutdownException {waitAndStop(milliseconds);} /** * Get the name of the the service.