Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小楼昨夜-听风雨
TDengine
提交
0ed403dd
T
TDengine
项目概览
小楼昨夜-听风雨
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0ed403dd
编写于
8月 24, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master' into feature/os
上级
af20a536
374c0560
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
19 addition
and
16 deletion
+19
-16
src/os/inc/osDir.h
src/os/inc/osDir.h
+1
-1
src/os/src/detail/osDir.c
src/os/src/detail/osDir.c
+9
-8
src/util/src/version.c
src/util/src/version.c
+5
-5
src/vnode/src/vnodeMain.c
src/vnode/src/vnodeMain.c
+4
-2
未找到文件。
src/os/inc/osDir.h
浏览文件 @
0ed403dd
...
...
@@ -23,7 +23,7 @@ extern "C" {
// TAOS_OS_FUNC_DIR
void
taosRemoveDir
(
char
*
rootDir
);
int
taosMkDir
(
const
char
*
pathname
,
mode_t
mode
);
void
taos
MvDir
(
char
*
destDir
,
char
*
srcDir
);
void
taos
Rename
(
char
*
oldName
,
char
*
newName
);
#ifdef __cplusplus
}
...
...
src/os/src/detail/osDir.c
浏览文件 @
0ed403dd
...
...
@@ -50,18 +50,19 @@ int taosMkDir(const char *path, mode_t mode) {
return
code
;
}
void
taos
MvDir
(
char
*
destDir
,
char
*
srcDir
)
{
void
taos
Rename
(
char
*
oldName
,
char
*
newName
)
{
if
(
0
==
tsEnableVnodeBak
)
{
uInfo
(
"vnode backup not enabled"
);
return
;
}
char
shellCmd
[
1024
+
1
]
=
{
0
};
//(void)snprintf(shellCmd, 1024, "cp -rf %s %s", srcDir, destDir);
(
void
)
snprintf
(
shellCmd
,
1024
,
"mv %s %s"
,
srcDir
,
destDir
);
taosSystem
(
shellCmd
);
uInfo
(
"shell cmd:%s is executed"
,
shellCmd
);
// if newName in not empty, rename return fail.
// the newName must be empty or does not exist
if
(
rename
(
oldName
,
newName
))
{
uError
(
"%s is modify to %s fail, reason:%s"
,
oldName
,
newName
,
strerror
(
errno
));
}
else
{
uInfo
(
"%s is modify to %s success!"
,
oldName
,
newName
);
}
}
#endif
\ No newline at end of file
#endif
src/util/src/version.c
浏览文件 @
0ed403dd
char
version
[
12
]
=
"2.0.
1.1
"
;
char
version
[
12
]
=
"2.0.
2.0
"
;
char
compatible_version
[
12
]
=
"2.0.0.0"
;
char
gitinfo
[
48
]
=
"
ae1966332948147bacce3d32f9ad539ab8721db
2"
;
char
gitinfoOfInternal
[
48
]
=
"
bf53767db56cedb1c484df83a1f10536f12647ad
"
;
char
buildinfo
[
64
]
=
"Built by root at 2020-08-2
0 15:46
"
;
char
gitinfo
[
48
]
=
"
d711657139620f6c50f362597020705b8ad26bd
2"
;
char
gitinfoOfInternal
[
48
]
=
"
1d74ae24c541ffbb280e8630883c0236cd45f8c7
"
;
char
buildinfo
[
64
]
=
"Built by root at 2020-08-2
4 16:31
"
;
void
libtaos_2_0_
1_1_Linux_x64
()
{};
void
libtaos_2_0_
2_0_Linux_x64_beta
()
{};
src/vnode/src/vnodeMain.c
浏览文件 @
0ed403dd
...
...
@@ -358,9 +358,11 @@ void vnodeRelease(void *pVnodeRaw) {
taosTFree
(
pVnode
->
rootDir
);
if
(
pVnode
->
dropped
)
{
char
rootDir
[
TSDB_FILENAME_LEN
]
=
{
0
};
char
rootDir
[
TSDB_FILENAME_LEN
]
=
{
0
};
char
newDir
[
TSDB_FILENAME_LEN
]
=
{
0
};
sprintf
(
rootDir
,
"%s/vnode%d"
,
tsVnodeDir
,
vgId
);
taosMvDir
(
tsVnodeBakDir
,
rootDir
);
sprintf
(
newDir
,
"%s/vnode%d"
,
tsVnodeBakDir
,
vgId
);
taosRename
(
rootDir
,
newDir
);
taosRemoveDir
(
rootDir
);
dnodeSendStatusMsgToMnode
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录