Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
loser646
TDengine
提交
1f279b72
T
TDengine
项目概览
loser646
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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,发现更多精彩内容 >>
提交
1f279b72
编写于
10月 23, 2020
作者:
H
Hongze Cheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix TD-1759
上级
1e14f722
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
46 addition
and
24 deletion
+46
-24
src/wal/src/walMain.c
src/wal/src/walMain.c
+46
-24
未找到文件。
src/wal/src/walMain.c
浏览文件 @
1f279b72
...
@@ -60,6 +60,7 @@ static int walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp);
...
@@ -60,6 +60,7 @@ static int walRestoreWalFile(SWal *pWal, void *pVnode, FWalWrite writeFp);
static
int
walRemoveWalFiles
(
const
char
*
path
);
static
int
walRemoveWalFiles
(
const
char
*
path
);
static
void
walProcessFsyncTimer
(
void
*
param
,
void
*
tmrId
);
static
void
walProcessFsyncTimer
(
void
*
param
,
void
*
tmrId
);
static
void
walRelease
(
SWal
*
pWal
);
static
void
walRelease
(
SWal
*
pWal
);
static
int
walGetMaxOldFileId
(
char
*
odir
);
static
void
walModuleInitFunc
()
{
static
void
walModuleInitFunc
()
{
walTmrCtrl
=
taosTmrInit
(
1000
,
100
,
300000
,
"WAL"
);
walTmrCtrl
=
taosTmrInit
(
1000
,
100
,
300000
,
"WAL"
);
...
@@ -312,7 +313,7 @@ int walRestore(void *handle, void *pVnode, int (*writeFp)(void *, void *, int))
...
@@ -312,7 +313,7 @@ int walRestore(void *handle, void *pVnode, int (*writeFp)(void *, void *, int))
for
(
index
=
minId
;
index
<=
maxId
;
++
index
)
{
for
(
index
=
minId
;
index
<=
maxId
;
++
index
)
{
snprintf
(
pWal
->
name
,
sizeof
(
pWal
->
name
),
"%s/%s%d"
,
opath
,
walPrefix
,
index
);
snprintf
(
pWal
->
name
,
sizeof
(
pWal
->
name
),
"%s/%s%d"
,
opath
,
walPrefix
,
index
);
terrno
=
walRestoreWalFile
(
pWal
,
pVnode
,
writeFp
);
terrno
=
walRestoreWalFile
(
pWal
,
pVnode
,
writeFp
);
if
(
terrno
<
0
)
break
;
if
(
terrno
<
0
)
continue
;
}
}
}
}
...
@@ -476,31 +477,26 @@ int walHandleExistingFiles(const char *path) {
...
@@ -476,31 +477,26 @@ int walHandleExistingFiles(const char *path) {
int
plen
=
strlen
(
walPrefix
);
int
plen
=
strlen
(
walPrefix
);
terrno
=
0
;
terrno
=
0
;
if
(
access
(
opath
,
F_OK
)
==
0
)
{
int
midx
=
walGetMaxOldFileId
(
opath
);
// old directory is there, it means restore process is not finished
int
count
=
0
;
walRemoveWalFiles
(
path
);
while
((
ent
=
readdir
(
dir
))
!=
NULL
)
{
if
(
strncmp
(
ent
->
d_name
,
walPrefix
,
plen
)
==
0
)
{
}
else
{
midx
++
;
// move all files to old directory
snprintf
(
oname
,
sizeof
(
oname
),
"%s/%s"
,
path
,
ent
->
d_name
);
int
count
=
0
;
snprintf
(
nname
,
sizeof
(
nname
),
"%s/old/wal%d"
,
path
,
midx
);
while
((
ent
=
readdir
(
dir
))
!=
NULL
)
{
if
(
taosMkDir
(
opath
,
0755
)
!=
0
)
{
if
(
strncmp
(
ent
->
d_name
,
walPrefix
,
plen
)
==
0
)
{
wError
(
"wal:%s, failed to create directory:%s(%s)"
,
oname
,
opath
,
strerror
(
errno
));
snprintf
(
oname
,
sizeof
(
oname
),
"%s/%s"
,
path
,
ent
->
d_name
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
snprintf
(
nname
,
sizeof
(
nname
),
"%s/old/%s"
,
path
,
ent
->
d_name
);
break
;
if
(
taosMkDir
(
opath
,
0755
)
!=
0
)
{
}
wError
(
"wal:%s, failed to create directory:%s(%s)"
,
oname
,
opath
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
break
;
}
if
(
rename
(
oname
,
nname
)
<
0
)
{
wError
(
"wal:%s, failed to move to new:%s"
,
oname
,
nname
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
break
;
}
count
++
;
if
(
rename
(
oname
,
nname
)
<
0
)
{
wError
(
"wal:%s, failed to move to new:%s"
,
oname
,
nname
);
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
break
;
}
}
count
++
;
}
}
wDebug
(
"wal:%s, %d files are moved for restoration"
,
path
,
count
);
wDebug
(
"wal:%s, %d files are moved for restoration"
,
path
,
count
);
...
@@ -563,4 +559,30 @@ int64_t walGetVersion(twalh param) {
...
@@ -563,4 +559,30 @@ int64_t walGetVersion(twalh param) {
if
(
pWal
==
0
)
return
0
;
if
(
pWal
==
0
)
return
0
;
return
pWal
->
version
;
return
pWal
->
version
;
}
static
int
walGetMaxOldFileId
(
char
*
odir
)
{
int
midx
=
0
;
DIR
*
dir
=
NULL
;
struct
dirent
*
dp
=
NULL
;
int
plen
=
strlen
(
walPrefix
);
if
(
access
(
odir
,
F_OK
)
!=
0
)
return
midx
;
dir
=
opendir
(
odir
);
if
(
dir
==
NULL
)
{
wError
(
"failed to open directory %s since %s"
,
odir
,
strerror
(
errno
));
terrno
=
TAOS_SYSTEM_ERROR
(
errno
);
return
-
1
;
}
while
((
dp
=
readdir
(
dir
))
!=
NULL
)
{
if
(
strncmp
(
dp
->
d_name
,
walPrefix
,
plen
)
==
0
)
{
int
idx
=
atol
(
dp
->
d_name
+
plen
);
if
(
midx
<
idx
)
midx
=
idx
;
}
}
closedir
(
dir
);
return
midx
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录