Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
野花太放肆
oceanbase
提交
150a34cc
O
oceanbase
项目概览
野花太放肆
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
150a34cc
编写于
9月 22, 2021
作者:
Y
ym0
提交者:
wangzelin.wzl
9月 22, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix memory overread problem
上级
1765522f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
10 deletion
+10
-10
src/rootserver/ob_root_service.cpp
src/rootserver/ob_root_service.cpp
+10
-10
未找到文件。
src/rootserver/ob_root_service.cpp
浏览文件 @
150a34cc
...
@@ -9695,7 +9695,7 @@ int ObRootService::set_config_pre_hook(obrpc::ObAdminSetConfigArg& arg)
...
@@ -9695,7 +9695,7 @@ int ObRootService::set_config_pre_hook(obrpc::ObAdminSetConfigArg& arg)
if
(
item
->
name_
.
is_empty
())
{
if
(
item
->
name_
.
is_empty
())
{
ret
=
OB_INVALID_ARGUMENT
;
ret
=
OB_INVALID_ARGUMENT
;
LOG_WARN
(
"empty config name"
,
"item"
,
*
item
,
K
(
ret
));
LOG_WARN
(
"empty config name"
,
"item"
,
*
item
,
K
(
ret
));
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
_RECYCLEBIN_OBJECT_PURGE_FREQUENCY
,
strlen
(
item
->
name_
.
ptr
())
))
{
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
_RECYCLEBIN_OBJECT_PURGE_FREQUENCY
))
{
int64_t
purge_interval
=
ObConfigTimeParser
::
get
(
item
->
value_
.
ptr
(),
valid
);
int64_t
purge_interval
=
ObConfigTimeParser
::
get
(
item
->
value_
.
ptr
(),
valid
);
if
(
!
valid
)
{
if
(
!
valid
)
{
ret
=
OB_INVALID_ARGUMENT
;
ret
=
OB_INVALID_ARGUMENT
;
...
@@ -9705,7 +9705,7 @@ int ObRootService::set_config_pre_hook(obrpc::ObAdminSetConfigArg& arg)
...
@@ -9705,7 +9705,7 @@ int ObRootService::set_config_pre_hook(obrpc::ObAdminSetConfigArg& arg)
LOG_WARN
(
"it is not allow that purge_interval is zero when daily merge is off"
,
"item"
,
*
item
,
K
(
ret
));
LOG_WARN
(
"it is not allow that purge_interval is zero when daily merge is off"
,
"item"
,
*
item
,
K
(
ret
));
LOG_USER_ERROR
(
OB_OP_NOT_ALLOW
,
"_recyclebin_object_purge_frequency is zero when daily merge is off"
);
LOG_USER_ERROR
(
OB_OP_NOT_ALLOW
,
"_recyclebin_object_purge_frequency is zero when daily merge is off"
);
}
}
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
CLOG_DISK_USAGE_LIMIT_PERCENTAGE
,
strlen
(
item
->
name_
.
ptr
())
))
{
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
CLOG_DISK_USAGE_LIMIT_PERCENTAGE
))
{
int64_t
clog_disk_usage_limit_percent
=
ObConfigIntParser
::
get
(
item
->
value_
.
ptr
(),
valid
);
int64_t
clog_disk_usage_limit_percent
=
ObConfigIntParser
::
get
(
item
->
value_
.
ptr
(),
valid
);
const
int64_t
clog_disk_utilization_threshold
=
ObServerConfig
::
get_instance
().
clog_disk_utilization_threshold
;
const
int64_t
clog_disk_utilization_threshold
=
ObServerConfig
::
get_instance
().
clog_disk_utilization_threshold
;
if
(
!
valid
)
{
if
(
!
valid
)
{
...
@@ -9722,7 +9722,7 @@ int ObRootService::set_config_pre_hook(obrpc::ObAdminSetConfigArg& arg)
...
@@ -9722,7 +9722,7 @@ int ObRootService::set_config_pre_hook(obrpc::ObAdminSetConfigArg& arg)
"clog_disk_usage_limit_percentage, it should be greater than clog_disk_utilization_threshold"
);
"clog_disk_usage_limit_percentage, it should be greater than clog_disk_utilization_threshold"
);
}
else
{
}
else
{
}
}
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
CLOG_DISK_UTILIZATION_THRESHOLD
,
strlen
(
item
->
name_
.
ptr
())
))
{
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
CLOG_DISK_UTILIZATION_THRESHOLD
))
{
int64_t
clog_disk_utilization_threshold
=
ObConfigIntParser
::
get
(
item
->
value_
.
ptr
(),
valid
);
int64_t
clog_disk_utilization_threshold
=
ObConfigIntParser
::
get
(
item
->
value_
.
ptr
(),
valid
);
const
int64_t
clog_disk_usage_limit_percent
=
ObServerConfig
::
get_instance
().
clog_disk_usage_limit_percentage
;
const
int64_t
clog_disk_usage_limit_percent
=
ObServerConfig
::
get_instance
().
clog_disk_usage_limit_percentage
;
if
(
!
valid
)
{
if
(
!
valid
)
{
...
@@ -9756,8 +9756,8 @@ int ObRootService::set_config_post_hook(const obrpc::ObAdminSetConfigArg& arg)
...
@@ -9756,8 +9756,8 @@ int ObRootService::set_config_post_hook(const obrpc::ObAdminSetConfigArg& arg)
if
(
item
->
name_
.
is_empty
())
{
if
(
item
->
name_
.
is_empty
())
{
ret
=
OB_INVALID_ARGUMENT
;
ret
=
OB_INVALID_ARGUMENT
;
LOG_WARN
(
"empty config name"
,
"item"
,
*
item
,
K
(
ret
));
LOG_WARN
(
"empty config name"
,
"item"
,
*
item
,
K
(
ret
));
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
ENABLE_REBALANCE
,
strlen
(
item
->
name_
.
ptr
())
)
||
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
ENABLE_REBALANCE
)
||
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
ENABLE_REREPLICATION
,
strlen
(
item
->
name_
.
ptr
())
))
{
0
==
STRCMP
(
item
->
name_
.
ptr
(),
ENABLE_REREPLICATION
))
{
ObString
value
(
item
->
value_
.
ptr
());
ObString
value
(
item
->
value_
.
ptr
());
ObString
false_str
(
"FALSE"
);
ObString
false_str
(
"FALSE"
);
ObString
zero_str
(
"0"
);
ObString
zero_str
(
"0"
);
...
@@ -9769,28 +9769,28 @@ int ObRootService::set_config_post_hook(const obrpc::ObAdminSetConfigArg& arg)
...
@@ -9769,28 +9769,28 @@ int ObRootService::set_config_post_hook(const obrpc::ObAdminSetConfigArg& arg)
}
else
if
(
OB_FAIL
(
rebalance_task_mgr_
.
clear_task
(
tenant_ids
,
type
)))
{
}
else
if
(
OB_FAIL
(
rebalance_task_mgr_
.
clear_task
(
tenant_ids
,
type
)))
{
LOG_WARN
(
"fail to clear balance task"
,
K
(
ret
));
LOG_WARN
(
"fail to clear balance task"
,
K
(
ret
));
}
else
{
}
else
{
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
ENABLE_REREPLICATION
,
strlen
(
item
->
name_
.
ptr
())
))
{
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
ENABLE_REREPLICATION
))
{
root_balancer_
.
reset_task_count
();
root_balancer_
.
reset_task_count
();
LOG_INFO
(
"clear balance task after modify balance config"
,
K
(
ret
),
K
(
arg
));
LOG_INFO
(
"clear balance task after modify balance config"
,
K
(
ret
),
K
(
arg
));
}
}
}
}
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
MERGER_CHECK_INTERVAL
,
strlen
(
item
->
name_
.
ptr
())
))
{
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
MERGER_CHECK_INTERVAL
))
{
daily_merge_scheduler_
.
wakeup
();
daily_merge_scheduler_
.
wakeup
();
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
ENABLE_AUTO_LEADER_SWITCH
,
strlen
(
item
->
name_
.
ptr
())
))
{
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
ENABLE_AUTO_LEADER_SWITCH
))
{
ObString
value
(
item
->
value_
.
ptr
());
ObString
value
(
item
->
value_
.
ptr
());
ObString
false_str
(
"FALSE"
);
ObString
false_str
(
"FALSE"
);
ObString
zero_str
(
"0"
);
ObString
zero_str
(
"0"
);
if
(
0
!=
value
.
case_compare
(
false_str
)
&&
0
!=
value
.
case_compare
(
zero_str
))
{
if
(
0
!=
value
.
case_compare
(
false_str
)
&&
0
!=
value
.
case_compare
(
zero_str
))
{
leader_coordinator_
.
wakeup
();
leader_coordinator_
.
wakeup
();
}
}
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
OBCONFIG_URL
,
strlen
(
item
->
name_
.
ptr
())
))
{
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
OBCONFIG_URL
))
{
int
tmp_ret
=
OB_SUCCESS
;
int
tmp_ret
=
OB_SUCCESS
;
bool
force_update
=
true
;
bool
force_update
=
true
;
if
(
OB_SUCCESS
!=
(
tmp_ret
=
submit_update_rslist_task
(
force_update
)))
{
if
(
OB_SUCCESS
!=
(
tmp_ret
=
submit_update_rslist_task
(
force_update
)))
{
LOG_WARN
(
"fail to submit update rs list task"
,
KR
(
ret
),
K
(
tmp_ret
));
LOG_WARN
(
"fail to submit update rs list task"
,
KR
(
ret
),
K
(
tmp_ret
));
}
}
LOG_INFO
(
"obconfig_url parameters updated, force submit update rslist task"
,
KR
(
tmp_ret
),
KPC
(
item
));
LOG_INFO
(
"obconfig_url parameters updated, force submit update rslist task"
,
KR
(
tmp_ret
),
KPC
(
item
));
}
else
if
(
0
==
MEMCMP
(
item
->
name_
.
ptr
(),
_SCHEMA_HISTORY_RECYCLE_INTERVAL
,
strlen
(
item
->
name_
.
ptr
())
))
{
}
else
if
(
0
==
STRCMP
(
item
->
name_
.
ptr
(),
_SCHEMA_HISTORY_RECYCLE_INTERVAL
))
{
schema_history_recycler_
.
wakeup
();
schema_history_recycler_
.
wakeup
();
LOG_INFO
(
"_schema_history_recycle_interval parameters updated, wakeup schema_history_recycler"
,
KPC
(
item
));
LOG_INFO
(
"_schema_history_recycle_interval parameters updated, wakeup schema_history_recycler"
,
KPC
(
item
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录