From 3cd47cd89e1a1027ca057e0220122fbbca642900 Mon Sep 17 00:00:00 2001 From: Xiaofan <83447078+xiaofan-luan@users.noreply.github.com> Date: Fri, 12 Nov 2021 18:53:11 +0800 Subject: [PATCH] Remove common.yaml and component.yaml (#11662) Signed-off-by: xiaofan-luan --- configs/advanced/common.yaml | 19 ---------- configs/milvus.yaml | 53 +++++++++++++++++++++++++++ internal/proxy/param_table.go | 10 +---- internal/rootcoord/param_table.go | 10 +---- internal/util/paramtable/basetable.go | 2 - 5 files changed, 57 insertions(+), 37 deletions(-) delete mode 100644 configs/advanced/common.yaml diff --git a/configs/advanced/common.yaml b/configs/advanced/common.yaml deleted file mode 100644 index 1881d10467..0000000000 --- a/configs/advanced/common.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the LF AI & Data foundation under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -common: - defaultPartitionName: "_default" # default partition name for a collection - defaultIndexName: "_default_idx" # default index name diff --git a/configs/milvus.yaml b/configs/milvus.yaml index 2d72607e9d..479f0215d7 100644 --- a/configs/milvus.yaml +++ b/configs/milvus.yaml @@ -59,6 +59,12 @@ rootCoord: clientMaxRecvSize: 104857600 # 100 MB, 100 * 1024 * 1024 clientMaxSendSize: 104857600 # 100 MB, 100 * 1024 * 1024 + dmlChannelNum: 256 # The number of dml channels created at system startup + maxPartitionNum: 4096 # Maximum number of partitions in a collection + minSegmentSizeToEnableIndex: 1024 # It's a threshold. When the segment size is less than this value, the segment will not be indexed + timeout: 3600 # time out, 5 seconds + timeTickInterval: 200 # ms, the interval that proxy synchronize the time tick + # Related configuration of proxy, used to validate client requests and reduce the returned results. proxy: port: 19530 @@ -69,6 +75,23 @@ proxy: clientMaxRecvSize: 104857600 # 100 MB, 100 * 1024 * 1024 clientMaxSendSize: 104857600 # 100 MB, 100 * 1024 * 1024 + timeTickInterval: 200 # ms, the interval that proxy synchronize the time tick + msgStream: + insert: + bufSize: 1024 # msgPack chan buffer size + search: + bufSize: 512 + searchResult: + recvBufSize: 1024 # msgPack chan buffer size + pulsarBufSize: 1024 # pulsar chan buffer size + timeTick: + bufSize: 512 + maxNameLength: 255 # max name length of collection or alias + maxFieldNum: 64 # max field number of a collection + maxDimension: 32768 # Maximum dimension of vector + maxShardNum: 256 # Maximum number of shards in a collection + maxTaskNum: 1024 # max task number of proxy task queue + # Related configuration of queryCoord, used to manage topology and load balancing for the query nodes, and handoff from growing segments to sealed segments. queryCoord: address: localhost @@ -97,6 +120,23 @@ queryNode: clientMaxRecvSize: 104857600 # 100 MB, 100 * 1024 * 1024 clientMaxSendSize: 104857600 # 100 MB, 100 * 1024 * 1024 + stats: + publishInterval: 1000 # Interval for querynode to report node information (milliseconds) + dataSync: + flowGraph: + maxQueueLength: 1024 # Maximum length of task queue in flowgraph + maxParallelism: 1024 # Maximum number of tasks executed in parallel in the flowgraph + msgStream: + search: + recvBufSize: 512 # msgPack channel buffer size + pulsarBufSize: 512 # pulsar channel buffer size + searchResult: + recvBufSize: 64 # msgPack channel buffer size + # Segcore will divide a segment into multiple chunks. + segcore: + chunkRows: 32768 # The number of vectors in a chunk. + + indexCoord: address: localhost port: 31000 @@ -128,6 +168,11 @@ dataCoord: enableCompaction: false enableGarbageCollection: false + segment: + maxSize: 512 # Maximum size of a segment in MB + sealProportion: 0.75 # It's the minimum proportion for a segment which can be sealed + assignmentExpiration: 2000 # ms + dataNode: port: 21124 @@ -137,6 +182,14 @@ dataNode: clientMaxRecvSize: 104857600 # 100 MB, 100 * 1024 * 1024 clientMaxSendSize: 104857600 # 100 MB, 100 * 1024 * 1024 + dataSync: + flowGraph: + maxQueueLength: 1024 # Maximum length of task queue in flowgraph + maxParallelism: 1024 # Maximum number of tasks executed in parallel in the flowgraph + flush: + # Max buffer size to flush for a single segment. + insertBufSize: 16777216 # Bytes, 16 MB + # Configure whether to store the vector and the local path when querying/searching in Querynode. localStorage: path: /var/lib/milvus/data/ diff --git a/internal/proxy/param_table.go b/internal/proxy/param_table.go index 5a412ce1b8..0257b3ee1b 100644 --- a/internal/proxy/param_table.go +++ b/internal/proxy/param_table.go @@ -211,18 +211,12 @@ func (pt *ParamTable) initMaxDimension() { } func (pt *ParamTable) initDefaultPartitionName() { - name, err := pt.Load("common.defaultPartitionName") - if err != nil { - panic(err) - } + name := pt.LoadWithDefault("common.defaultPartitionName", "_default") pt.DefaultPartitionName = name } func (pt *ParamTable) initDefaultIndexName() { - name, err := pt.Load("common.defaultIndexName") - if err != nil { - panic(err) - } + name := pt.LoadWithDefault("common.defaultIndexName", "_default_idx") pt.DefaultIndexName = name } diff --git a/internal/rootcoord/param_table.go b/internal/rootcoord/param_table.go index 6f190dce43..6ab9d1680a 100644 --- a/internal/rootcoord/param_table.go +++ b/internal/rootcoord/param_table.go @@ -198,18 +198,12 @@ func (p *ParamTable) initMinSegmentSizeToEnableIndex() { } func (p *ParamTable) initDefaultPartitionName() { - name, err := p.Load("common.defaultPartitionName") - if err != nil { - panic(err) - } + name := p.LoadWithDefault("common.defaultPartitionName", "_default") p.DefaultPartitionName = name } func (p *ParamTable) initDefaultIndexName() { - name, err := p.Load("common.defaultIndexName") - if err != nil { - panic(err) - } + name := p.LoadWithDefault("common.defaultIndexName", "_default_idx") p.DefaultIndexName = name } diff --git a/internal/util/paramtable/basetable.go b/internal/util/paramtable/basetable.go index 2f00effe52..dc0422d2af 100644 --- a/internal/util/paramtable/basetable.go +++ b/internal/util/paramtable/basetable.go @@ -116,7 +116,6 @@ func (gp *BaseTable) loadFromComponentYaml() bool { } return true } - log.Debug("failed to find component.yaml in config, skip..") return false } @@ -128,7 +127,6 @@ func (gp *BaseTable) loadFromCommonYaml() bool { } return true } - log.Debug("failed to find common.yaml in config, skip..") return false }