mirror of https://github.com/milvus-io/milvus.git
[skip ci] Update standalone and cluster deployment code on benchmark (#9879)
Signed-off-by: wangting0128 <ting.wang@zilliz.com>pull/9884/head
parent
6378f6face
commit
76a24886ad
|
@ -80,20 +80,30 @@ def update_values(src_values_file, deploy_params_file):
|
|||
cpus = res["cpus"]
|
||||
mems = res["mems"]
|
||||
gpus = res["gpus"]
|
||||
if cpus and mems:
|
||||
# Set the scope of cpu application according to the configuration
|
||||
if cpus:
|
||||
resources = {
|
||||
"limits": {
|
||||
"cpu": str(int(cpus)) + ".0",
|
||||
"memory": str(int(mems)) + "Gi"
|
||||
},
|
||||
"requests": {
|
||||
"cpu": str(int(cpus) // 2 + 1) + ".0",
|
||||
"memory": str(int(mems) // 2 + 1) + "Gi"
|
||||
# "cpu": "4.0"
|
||||
# "cpu": str(int(cpus) - 1) + ".0"
|
||||
}
|
||||
"limits": {
|
||||
"cpu": str(int(cpus)) + ".0"
|
||||
},
|
||||
"requests": {
|
||||
"cpu": str(int(cpus) // 2 + 1) + ".0"
|
||||
# "cpu": "4.0"
|
||||
# "cpu": str(int(cpus) - 1) + ".0"
|
||||
}
|
||||
}
|
||||
if cpus and mems:
|
||||
resources_cluster = {
|
||||
"limits": {
|
||||
"cpu": str(int(cpus)) + ".0",
|
||||
"memory": str(int(mems)) + "Gi"
|
||||
},
|
||||
"requests": {
|
||||
"cpu": str(int(cpus) // 2 + 1) + ".0",
|
||||
"memory": str(int(mems) // 2 + 1) + "Gi"
|
||||
# "cpu": "4.0"
|
||||
# "cpu": str(int(cpus) - 1) + ".0"
|
||||
}
|
||||
}
|
||||
# use external minio/s3
|
||||
|
||||
# TODO: disable temp
|
||||
|
@ -135,9 +145,9 @@ def update_values(src_values_file, deploy_params_file):
|
|||
# values_dict['etcd']['nodeSelector'] = node_config
|
||||
# # set limit/request cpus in resources
|
||||
# values_dict['proxy']['resources'] = resources
|
||||
values_dict['queryNode']['resources'] = resources
|
||||
values_dict['indexNode']['resources'] = resources
|
||||
values_dict['dataNode']['resources'] = resources
|
||||
values_dict['queryNode']['resources'] = resources_cluster
|
||||
values_dict['indexNode']['resources'] = resources_cluster
|
||||
values_dict['dataNode']['resources'] = resources_cluster
|
||||
# values_dict['minio']['resources'] = resources
|
||||
# values_dict['pulsarStandalone']['resources'] = resources
|
||||
if mems:
|
||||
|
|
Loading…
Reference in New Issue