Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
b6effd73
M
milvus
项目概览
milvus
/
milvus
10 个月 前同步成功
通知
260
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
b6effd73
编写于
8月 08, 2023
作者:
Y
yihao.dai
提交者:
GitHub
8月 08, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Disable deny writing when the growing segment size exceeds the watermark (#26163)
Signed-off-by:
N
bigsheeper
<
yihao.dai@zilliz.com
>
上级
54c0e640
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
37 addition
and
22 deletion
+37
-22
configs/milvus.yaml
configs/milvus.yaml
+4
-3
internal/rootcoord/quota_center.go
internal/rootcoord/quota_center.go
+7
-12
internal/rootcoord/quota_center_test.go
internal/rootcoord/quota_center_test.go
+5
-4
pkg/util/paramtable/quota_param.go
pkg/util/paramtable/quota_param.go
+20
-3
pkg/util/paramtable/quota_param_test.go
pkg/util/paramtable/quota_param_test.go
+1
-0
未找到文件。
configs/milvus.yaml
浏览文件 @
b6effd73
...
...
@@ -582,10 +582,11 @@ quotaAndLimits:
queryNodeMemoryLowWaterLevel
:
0.85
# (0, 1], memoryLowWaterLevel in QueryNodes
queryNodeMemoryHighWaterLevel
:
0.95
# (0, 1], memoryHighWaterLevel in QueryNodes
growingSegmentsSizeProtection
:
#
1. No action will be taken if the ratio of growing segments size is less than the low water level
.
#
2. The DML rate will be reduced if the ratio of growing segments size is greater than the low water level and less than the high water level.
#
3. All DML requests will be rejected if the ratio of growing segments size is greater than the high water level
.
#
No action will be taken if the growing segments size is less than the low watermark
.
#
When the growing segments size exceeds the low watermark, the dml rate will be reduced,
#
but the rate will not be lower than `minRateRatio * dmlRate`
.
enabled
:
false
minRateRatio
:
0.5
lowWaterLevel
:
0.2
highWaterLevel
:
0.4
diskProtection
:
...
...
internal/rootcoord/quota_center.go
浏览文件 @
b6effd73
...
...
@@ -658,24 +658,19 @@ func (q *QuotaCenter) getGrowingSegmentsSizeFactor() map[int64]float64 {
if
cur
<=
low
{
continue
}
if
cur
>=
high
{
log
.
RatedWarn
(
10
,
"QuotaCenter: QueryNode growing segments size to high water level"
,
zap
.
String
(
"Node"
,
fmt
.
Sprintf
(
"%s-%d"
,
typeutil
.
QueryNodeRole
,
nodeID
)),
zap
.
Int64s
(
"collections"
,
metric
.
Effect
.
CollectionIDs
),
zap
.
Int64
(
"segmentsSize"
,
metric
.
GrowingSegmentsSize
),
zap
.
Uint64
(
"TotalMem"
,
metric
.
Hms
.
Memory
),
zap
.
Float64
(
"highWaterLevel"
,
high
))
updateCollectionFactor
(
0
,
metric
.
Effect
.
CollectionIDs
)
continue
}
factor
:=
(
high
-
cur
)
/
(
high
-
low
)
if
factor
<
Params
.
QuotaConfig
.
GrowingSegmentsSizeMinRateRatio
.
GetAsFloat
()
{
factor
=
Params
.
QuotaConfig
.
GrowingSegmentsSizeMinRateRatio
.
GetAsFloat
()
}
updateCollectionFactor
(
factor
,
metric
.
Effect
.
CollectionIDs
)
log
.
RatedWarn
(
10
,
"QuotaCenter: QueryNode growing segments size
to low water level
, limit writing rate"
,
log
.
RatedWarn
(
10
,
"QuotaCenter: QueryNode growing segments size
exceeds watermark
, limit writing rate"
,
zap
.
String
(
"Node"
,
fmt
.
Sprintf
(
"%s-%d"
,
typeutil
.
QueryNodeRole
,
nodeID
)),
zap
.
Int64s
(
"collections"
,
metric
.
Effect
.
CollectionIDs
),
zap
.
Int64
(
"segmentsSize"
,
metric
.
GrowingSegmentsSize
),
zap
.
Uint64
(
"TotalMem"
,
metric
.
Hms
.
Memory
),
zap
.
Float64
(
"lowWaterLevel"
,
low
))
zap
.
Float64
(
"highWatermark"
,
high
),
zap
.
Float64
(
"lowWatermark"
,
low
),
zap
.
Float64
(
"factor"
,
factor
))
}
return
collectionFactor
}
...
...
internal/rootcoord/quota_center_test.go
浏览文件 @
b6effd73
...
...
@@ -438,6 +438,7 @@ func TestQuotaCenter(t *testing.T) {
meta
:=
mockrootcoord
.
NewIMetaTable
(
t
)
meta
.
EXPECT
()
.
GetCollectionByID
(
mock
.
Anything
,
mock
.
Anything
,
mock
.
Anything
,
mock
.
Anything
,
mock
.
Anything
)
.
Return
(
nil
,
merr
.
ErrCollectionNotFound
)
.
Maybe
()
quotaCenter
:=
NewQuotaCenter
(
pcm
,
qc
,
&
dataCoordMockForQuota
{},
core
.
tsoAllocator
,
meta
)
defaultRatio
:=
Params
.
QuotaConfig
.
GrowingSegmentsSizeMinRateRatio
.
GetAsFloat
()
tests
:=
[]
struct
{
low
float64
high
float64
...
...
@@ -449,15 +450,15 @@ func TestQuotaCenter(t *testing.T) {
{
0.8
,
0.9
,
80
,
100
,
1
},
{
0.8
,
0.9
,
82
,
100
,
0.8
},
{
0.8
,
0.9
,
85
,
100
,
0.5
},
{
0.8
,
0.9
,
88
,
100
,
0.2
},
{
0.8
,
0.9
,
90
,
100
,
0
},
{
0.8
,
0.9
,
88
,
100
,
defaultRatio
},
{
0.8
,
0.9
,
90
,
100
,
defaultRatio
},
{
0.85
,
0.95
,
25
,
100
,
1
},
{
0.85
,
0.95
,
85
,
100
,
1
},
{
0.85
,
0.95
,
87
,
100
,
0.8
},
{
0.85
,
0.95
,
90
,
100
,
0.5
},
{
0.85
,
0.95
,
93
,
100
,
0.2
},
{
0.85
,
0.95
,
95
,
100
,
0
},
{
0.85
,
0.95
,
93
,
100
,
defaultRatio
},
{
0.85
,
0.95
,
95
,
100
,
defaultRatio
},
}
quotaCenter
.
writableCollections
=
append
(
quotaCenter
.
writableCollections
,
1
,
2
,
3
)
...
...
pkg/util/paramtable/quota_param.go
浏览文件 @
b6effd73
...
...
@@ -107,6 +107,7 @@ type quotaConfig struct {
QueryNodeMemoryLowWaterLevel
ParamItem
`refreshable:"true"`
QueryNodeMemoryHighWaterLevel
ParamItem
`refreshable:"true"`
GrowingSegmentsSizeProtectionEnabled
ParamItem
`refreshable:"true"`
GrowingSegmentsSizeMinRateRatio
ParamItem
`refreshable:"true"`
GrowingSegmentsSizeLowWaterLevel
ParamItem
`refreshable:"true"`
GrowingSegmentsSizeHighWaterLevel
ParamItem
`refreshable:"true"`
DiskProtectionEnabled
ParamItem
`refreshable:"true"`
...
...
@@ -1014,13 +1015,29 @@ When memory usage < memoryLowWaterLevel, no action.`,
Key
:
"quotaAndLimits.limitWriting.growingSegmentsSizeProtection.enabled"
,
Version
:
"2.2.9"
,
DefaultValue
:
"false"
,
Doc
:
`
1. No action will be taken if the ratio of growing segments size is less than the low water level
.
2. The DML rate will be reduced if the ratio of growing segments size is greater than the low water level and less than the high water level.
3. All DML requests will be rejected if the ratio of growing segments size is greater than the high water level
.`
,
Doc
:
`
No action will be taken if the growing segments size is less than the low watermark
.
When the growing segments size exceeds the low watermark, the dml rate will be reduced,
but the rate will not be lower than minRateRatio * dmlRate
.`
,
Export
:
true
,
}
p
.
GrowingSegmentsSizeProtectionEnabled
.
Init
(
base
.
mgr
)
defaultGrowingSegSizeMinRateRatio
:=
"0.5"
p
.
GrowingSegmentsSizeMinRateRatio
=
ParamItem
{
Key
:
"quotaAndLimits.limitWriting.growingSegmentsSizeProtection.minRateRatio"
,
Version
:
"2.3.0"
,
DefaultValue
:
defaultGrowingSegSizeMinRateRatio
,
Formatter
:
func
(
v
string
)
string
{
level
:=
getAsFloat
(
v
)
if
level
<=
0
||
level
>
1
{
return
defaultGrowingSegSizeMinRateRatio
}
return
v
},
Export
:
true
,
}
p
.
GrowingSegmentsSizeMinRateRatio
.
Init
(
base
.
mgr
)
defaultGrowingSegSizeLowWaterLevel
:=
"0.2"
p
.
GrowingSegmentsSizeLowWaterLevel
=
ParamItem
{
Key
:
"quotaAndLimits.limitWriting.growingSegmentsSizeProtection.lowWaterLevel"
,
...
...
pkg/util/paramtable/quota_param_test.go
浏览文件 @
b6effd73
...
...
@@ -187,6 +187,7 @@ func TestQuotaParam(t *testing.T) {
assert
.
Equal
(
t
,
defaultLowWaterLevel
,
qc
.
QueryNodeMemoryLowWaterLevel
.
GetAsFloat
())
assert
.
Equal
(
t
,
defaultHighWaterLevel
,
qc
.
QueryNodeMemoryHighWaterLevel
.
GetAsFloat
())
assert
.
Equal
(
t
,
false
,
qc
.
GrowingSegmentsSizeProtectionEnabled
.
GetAsBool
())
assert
.
Equal
(
t
,
0.5
,
qc
.
GrowingSegmentsSizeMinRateRatio
.
GetAsFloat
())
assert
.
Equal
(
t
,
0.2
,
qc
.
GrowingSegmentsSizeLowWaterLevel
.
GetAsFloat
())
assert
.
Equal
(
t
,
0.4
,
qc
.
GrowingSegmentsSizeHighWaterLevel
.
GetAsFloat
())
assert
.
Equal
(
t
,
true
,
qc
.
DiskProtectionEnabled
.
GetAsBool
())
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录