未验证 提交 988a135a 编写于 作者: B Benedict Jin 提交者: GitHub

Correct the spelling of millseconds to milliseconds (#2092)

上级 168ac8c1
......@@ -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) {
......
......@@ -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();
......
......@@ -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();
......
......@@ -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.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册