Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Iotdb
提交
988a135a
I
Iotdb
项目概览
apache
/
Iotdb
10 个月 前同步成功
通知
25
Star
3344
Fork
916
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iotdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
988a135a
编写于
11月 22, 2020
作者:
B
Benedict Jin
提交者:
GitHub
11月 22, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correct the spelling of millseconds to milliseconds (#2092)
上级
168ac8c1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
16 addition
and
16 deletion
+16
-16
server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
...c/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+1
-1
server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java
.../db/engine/compaction/CompactionMergeTaskPoolManager.java
+5
-5
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
...org/apache/iotdb/db/engine/merge/manage/MergeManager.java
+8
-8
server/src/main/java/org/apache/iotdb/db/service/IService.java
...r/src/main/java/org/apache/iotdb/db/service/IService.java
+2
-2
未找到文件。
server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
浏览文件 @
988a135a
...
...
@@ -292,7 +292,7 @@ public class StorageEngine implements IService {
}
@Override
public
void
shutdown
(
long
millseconds
)
throws
ShutdownException
{
public
void
shutdown
(
long
mill
i
seconds
)
throws
ShutdownException
{
try
{
forceCloseAllProcessor
();
}
catch
(
TsFileProcessorException
e
)
{
...
...
server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionMergeTaskPoolManager.java
浏览文件 @
988a135a
...
...
@@ -67,9 +67,9 @@ public class CompactionMergeTaskPoolManager implements IService {
}
@Override
public
void
waitAndStop
(
long
millseconds
)
{
public
void
waitAndStop
(
long
mill
i
seconds
)
{
if
(
pool
!=
null
)
{
awaitTermination
(
pool
,
millseconds
);
awaitTermination
(
pool
,
mill
i
seconds
);
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
mill
i
seconds
)
{
try
{
service
.
shutdown
();
service
.
awaitTermination
(
millseconds
,
TimeUnit
.
MILLISECONDS
);
service
.
awaitTermination
(
mill
i
seconds
,
TimeUnit
.
MILLISECONDS
);
}
catch
(
InterruptedException
e
)
{
logger
.
warn
(
"CompactionThreadPool can not be closed in {} ms"
,
millseconds
);
logger
.
warn
(
"CompactionThreadPool can not be closed in {} ms"
,
mill
i
seconds
);
Thread
.
currentThread
().
interrupt
();
}
service
.
shutdownNow
();
...
...
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
浏览文件 @
988a135a
...
...
@@ -192,17 +192,17 @@ public class MergeManager implements IService, MergeManagerMBean {
}
@Override
public
void
waitAndStop
(
long
millseconds
)
{
public
void
waitAndStop
(
long
mill
i
seconds
)
{
if
(
mergeTaskPool
!=
null
)
{
if
(
timedMergeThreadPool
!=
null
)
{
awaitTermination
(
timedMergeThreadPool
,
millseconds
);
awaitTermination
(
timedMergeThreadPool
,
mill
i
seconds
);
timedMergeThreadPool
=
null
;
}
awaitTermination
(
taskCleanerThreadPool
,
millseconds
);
awaitTermination
(
taskCleanerThreadPool
,
mill
i
seconds
);
taskCleanerThreadPool
=
null
;
awaitTermination
(
mergeTaskPool
,
millseconds
);
awaitTermination
(
mergeChunkSubTaskPool
,
millseconds
);
awaitTermination
(
mergeTaskPool
,
mill
i
seconds
);
awaitTermination
(
mergeChunkSubTaskPool
,
mill
i
seconds
);
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
mill
i
seconds
)
{
try
{
service
.
shutdown
();
service
.
awaitTermination
(
millseconds
,
TimeUnit
.
MILLISECONDS
);
service
.
awaitTermination
(
mill
i
seconds
,
TimeUnit
.
MILLISECONDS
);
}
catch
(
InterruptedException
e
)
{
logger
.
warn
(
"MergeThreadPool can not be closed in {} ms"
,
millseconds
);
logger
.
warn
(
"MergeThreadPool can not be closed in {} ms"
,
mill
i
seconds
);
Thread
.
currentThread
().
interrupt
();
}
service
.
shutdownNow
();
...
...
server/src/main/java/org/apache/iotdb/db/service/IService.java
浏览文件 @
988a135a
...
...
@@ -34,9 +34,9 @@ public interface IService {
*/
void
stop
();
default
void
waitAndStop
(
long
millseconds
)
{
stop
();}
default
void
waitAndStop
(
long
mill
i
seconds
)
{
stop
();}
default
void
shutdown
(
long
mill
seconds
)
throws
ShutdownException
{
waitAndStop
(
mill
seconds
);}
default
void
shutdown
(
long
mill
iseconds
)
throws
ShutdownException
{
waitAndStop
(
milli
seconds
);}
/**
* Get the name of the the service.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录