Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
530aa3e5
T
TDengine
项目概览
哥们要飞
/
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,发现更多精彩内容 >>
提交
530aa3e5
编写于
5月 15, 2020
作者:
陶建辉(Jeff)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
set file version correctly
上级
c094c957
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
14 deletion
+21
-14
src/inc/tsync.h
src/inc/tsync.h
+2
-2
src/vnode/inc/vnodeInt.h
src/vnode/inc/vnodeInt.h
+7
-7
src/vnode/src/vnodeMain.c
src/vnode/src/vnodeMain.c
+12
-5
未找到文件。
src/inc/tsync.h
浏览文件 @
530aa3e5
...
@@ -57,7 +57,7 @@ typedef struct {
...
@@ -57,7 +57,7 @@ typedef struct {
// if name is empty(name[0] is zero), get the file from index or after, used by master
// if name is empty(name[0] is zero), get the file from index or after, used by master
// if name is provided(name[0] is not zero), get the named file at the specified index, used by unsynced node
// if name is provided(name[0] is not zero), get the named file at the specified index, used by unsynced node
// it returns the file magic number and size, if file not there, magic shall be 0.
// it returns the file magic number and size, if file not there, magic shall be 0.
typedef
uint32_t
(
*
FGetFileInfo
)(
void
*
ahandle
,
char
*
name
,
uint32_t
*
index
,
int32_t
*
size
);
typedef
uint32_t
(
*
FGetFileInfo
)(
void
*
ahandle
,
char
*
name
,
uint32_t
*
index
,
int32_t
*
size
,
uint64_t
*
fversion
);
// get the wal file from index or after
// get the wal file from index or after
// return value, -1: error, 1:more wal files, 0:last WAL. if name[0]==0, no WAL file
// return value, -1: error, 1:more wal files, 0:last WAL. if name[0]==0, no WAL file
...
@@ -73,7 +73,7 @@ typedef void (*FConfirmForward)(void *ahandle, void *mhandle, int32_t code);
...
@@ -73,7 +73,7 @@ typedef void (*FConfirmForward)(void *ahandle, void *mhandle, int32_t code);
typedef
void
(
*
FNotifyRole
)(
void
*
ahandle
,
int8_t
role
);
typedef
void
(
*
FNotifyRole
)(
void
*
ahandle
,
int8_t
role
);
// when data file is synced successfully, notity app
// when data file is synced successfully, notity app
typedef
void
(
*
FNotifyFileSynced
)(
void
*
ahandle
);
typedef
void
(
*
FNotifyFileSynced
)(
void
*
ahandle
,
uint64_t
fversion
);
typedef
struct
{
typedef
struct
{
int32_t
vgId
;
// vgroup ID
int32_t
vgId
;
// vgroup ID
...
...
src/vnode/inc/vnodeInt.h
浏览文件 @
530aa3e5
...
@@ -37,8 +37,8 @@ typedef struct {
...
@@ -37,8 +37,8 @@ typedef struct {
int32_t
refCount
;
// reference count
int32_t
refCount
;
// reference count
int
status
;
int
status
;
int8_t
role
;
int8_t
role
;
int64_t
version
;
int64_t
version
;
// current version
int64_t
savedVersion
;
int64_t
fversion
;
// version on saved data file
void
*
wqueue
;
void
*
wqueue
;
void
*
rqueue
;
void
*
rqueue
;
void
*
wal
;
void
*
wal
;
...
@@ -46,11 +46,11 @@ typedef struct {
...
@@ -46,11 +46,11 @@ typedef struct {
void
*
sync
;
void
*
sync
;
void
*
events
;
void
*
events
;
void
*
cq
;
// continuous query
void
*
cq
;
// continuous query
int32_t
cfgVersion
;
int32_t
cfgVersion
;
STsdbCfg
tsdbCfg
;
STsdbCfg
tsdbCfg
;
SSyncCfg
syncCfg
;
SSyncCfg
syncCfg
;
SWalCfg
walCfg
;
SWalCfg
walCfg
;
char
*
rootDir
;
char
*
rootDir
;
}
SVnodeObj
;
}
SVnodeObj
;
int
vnodeWriteToQueue
(
void
*
param
,
void
*
pHead
,
int
type
);
int
vnodeWriteToQueue
(
void
*
param
,
void
*
pHead
,
int
type
);
...
...
src/vnode/src/vnodeMain.c
浏览文件 @
530aa3e5
...
@@ -196,6 +196,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
...
@@ -196,6 +196,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
}
}
vnodeReadVersion
(
pVnode
);
vnodeReadVersion
(
pVnode
);
pVnode
->
fversion
=
pVnode
->
version
;
pVnode
->
wqueue
=
dnodeAllocateWqueue
(
pVnode
);
pVnode
->
wqueue
=
dnodeAllocateWqueue
(
pVnode
);
pVnode
->
rqueue
=
dnodeAllocateRqueue
(
pVnode
);
pVnode
->
rqueue
=
dnodeAllocateRqueue
(
pVnode
);
...
@@ -394,7 +395,7 @@ static int vnodeProcessTsdbStatus(void *arg, int status) {
...
@@ -394,7 +395,7 @@ static int vnodeProcessTsdbStatus(void *arg, int status) {
SVnodeObj
*
pVnode
=
arg
;
SVnodeObj
*
pVnode
=
arg
;
if
(
status
==
TSDB_STATUS_COMMIT_START
)
{
if
(
status
==
TSDB_STATUS_COMMIT_START
)
{
pVnode
->
savedV
ersion
=
pVnode
->
version
;
pVnode
->
fv
ersion
=
pVnode
->
version
;
return
walRenew
(
pVnode
->
wal
);
return
walRenew
(
pVnode
->
wal
);
}
}
...
@@ -404,8 +405,9 @@ static int vnodeProcessTsdbStatus(void *arg, int status) {
...
@@ -404,8 +405,9 @@ static int vnodeProcessTsdbStatus(void *arg, int status) {
return
0
;
return
0
;
}
}
static
uint32_t
vnodeGetFileInfo
(
void
*
ahandle
,
char
*
name
,
uint32_t
*
index
,
int32_t
*
size
)
{
static
uint32_t
vnodeGetFileInfo
(
void
*
ahandle
,
char
*
name
,
uint32_t
*
index
,
int32_t
*
size
,
uint64_t
*
fversion
)
{
SVnodeObj
*
pVnode
=
ahandle
;
SVnodeObj
*
pVnode
=
ahandle
;
*
fversion
=
pVnode
->
fversion
;
return
tsdbGetFileInfo
(
pVnode
->
tsdb
,
name
,
index
,
size
);
return
tsdbGetFileInfo
(
pVnode
->
tsdb
,
name
,
index
,
size
);
}
}
...
@@ -425,12 +427,17 @@ static void vnodeNotifyRole(void *ahandle, int8_t role) {
...
@@ -425,12 +427,17 @@ static void vnodeNotifyRole(void *ahandle, int8_t role) {
cqStop
(
pVnode
->
cq
);
cqStop
(
pVnode
->
cq
);
}
}
static
void
vnodeNotifyFileSynced
(
void
*
ahandle
)
{
static
void
vnodeNotifyFileSynced
(
void
*
ahandle
,
uint64_t
fversion
)
{
SVnodeObj
*
pVnode
=
ahandle
;
SVnodeObj
*
pVnode
=
ahandle
;
vTrace
(
"vgId:%d, data file is synced"
,
pVnode
->
vgId
);
vTrace
(
"vgId:%d, data file is synced"
,
pVnode
->
vgId
);
pVnode
->
fversion
=
fversion
;
pVnode
->
version
=
fversion
;
vnodeSaveVersion
(
pVnode
);
char
rootDir
[
128
]
=
"
\0
"
;
char
rootDir
[
128
]
=
"
\0
"
;
sprintf
(
rootDir
,
"%s/tsdb"
,
pVnode
->
rootDir
);
sprintf
(
rootDir
,
"%s/tsdb"
,
pVnode
->
rootDir
);
// close tsdb, then open tsdb
// close tsdb, then open tsdb
tsdbCloseRepo
(
pVnode
->
tsdb
);
tsdbCloseRepo
(
pVnode
->
tsdb
);
STsdbAppH
appH
=
{
0
};
STsdbAppH
appH
=
{
0
};
...
@@ -706,14 +713,14 @@ static int32_t vnodeSaveVersion(SVnodeObj *pVnode) {
...
@@ -706,14 +713,14 @@ static int32_t vnodeSaveVersion(SVnodeObj *pVnode) {
char
*
content
=
calloc
(
1
,
maxLen
+
1
);
char
*
content
=
calloc
(
1
,
maxLen
+
1
);
len
+=
snprintf
(
content
+
len
,
maxLen
-
len
,
"{
\n
"
);
len
+=
snprintf
(
content
+
len
,
maxLen
-
len
,
"{
\n
"
);
len
+=
snprintf
(
content
+
len
,
maxLen
-
len
,
"
\"
version
\"
: %"
PRId64
"
\n
"
,
pVnode
->
savedV
ersion
);
len
+=
snprintf
(
content
+
len
,
maxLen
-
len
,
"
\"
version
\"
: %"
PRId64
"
\n
"
,
pVnode
->
fv
ersion
);
len
+=
snprintf
(
content
+
len
,
maxLen
-
len
,
"}
\n
"
);
len
+=
snprintf
(
content
+
len
,
maxLen
-
len
,
"}
\n
"
);
fwrite
(
content
,
1
,
len
,
fp
);
fwrite
(
content
,
1
,
len
,
fp
);
fclose
(
fp
);
fclose
(
fp
);
free
(
content
);
free
(
content
);
vPrint
(
"vgId:%d, save vnode version:%"
PRId64
" succeed"
,
pVnode
->
vgId
,
pVnode
->
savedV
ersion
);
vPrint
(
"vgId:%d, save vnode version:%"
PRId64
" succeed"
,
pVnode
->
vgId
,
pVnode
->
fv
ersion
);
return
0
;
return
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录