diff --git a/configs/milvus.yaml b/configs/milvus.yaml index 10965fca9f..4935c657f9 100644 --- a/configs/milvus.yaml +++ b/configs/milvus.yaml @@ -21,10 +21,6 @@ etcd: rootPath: by-dev # The root path where data is stored in etcd metaSubPath: meta # metaRootPath = rootPath + '/' + metaSubPath kvSubPath: kv # kvRootPath = rootPath + '/' + kvSubPath - segmentBinlogSubPath: datacoord/binlog/segment # Full Path = rootPath/metaSubPath/segmentBinlogSubPath - collectionBinlogSubPath: datacoord/binlog/collection # Full Path = rootPath/metaSubPath/collectionBinglogSubPath - flushStreamPosSubPath: datacoord/flushstream # Full path = rootPath/metaSubPath/flushStreamPosSubPath - statsStreamPosSubPath: datacoord/statsstream # Full path = rootPath/metaSubPath/statsStreamPosSubPath # Related configuration of minio, which is responsible for data persistence for Milvus. minio: diff --git a/go.mod b/go.mod index d6ba4b235e..23a08901a9 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( go.etcd.io/etcd/client/v3 v3.5.0 go.etcd.io/etcd/server/v3 v3.5.0 go.uber.org/atomic v1.7.0 - go.uber.org/automaxprocs v1.4.0 // indirect + go.uber.org/automaxprocs v1.4.0 go.uber.org/zap v1.17.0 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect diff --git a/internal/util/paramtable/global_param.go b/internal/util/paramtable/global_param.go index 7d43945aa8..f1c4173d91 100644 --- a/internal/util/paramtable/global_param.go +++ b/internal/util/paramtable/global_param.go @@ -1262,11 +1262,9 @@ type dataCoordConfig struct { Address string // --- ETCD --- - MetaRootPath string - KvRootPath string - SegmentBinlogSubPath string - CollectionBinlogSubPath string - ChannelWatchSubPath string + MetaRootPath string + KvRootPath string + ChannelWatchSubPath string // --- MinIO --- MinioAddress string @@ -1282,9 +1280,6 @@ type dataCoordConfig struct { // --- Rocksmq --- RocksmqPath string - FlushStreamPosSubPath string - StatsStreamPosSubPath string - // --- SEGMENTS --- SegmentMaxSize float64 SegmentSealProportion float64 @@ -1317,8 +1312,6 @@ func (p *dataCoordConfig) init(bp *BaseParamTable) { p.initMetaRootPath() p.initKvRootPath() - p.initSegmentBinlogSubPath() - p.initCollectionBinlogSubPath() p.initChannelWatchPrefix() p.initPulsarAddress() @@ -1335,9 +1328,6 @@ func (p *dataCoordConfig) init(bp *BaseParamTable) { p.initSegmentInfoChannelName() p.initDataCoordSubscriptionName() - p.initFlushStreamPosSubPath() - p.initStatsStreamPosSubPath() - p.initEnableCompaction() p.initMinioAddress() @@ -1396,22 +1386,6 @@ func (p *dataCoordConfig) initKvRootPath() { p.KvRootPath = rootPath + "/" + subPath } -func (p *dataCoordConfig) initSegmentBinlogSubPath() { - subPath, err := p.BaseParams.Load("etcd.segmentBinlogSubPath") - if err != nil { - panic(err) - } - p.SegmentBinlogSubPath = subPath -} - -func (p *dataCoordConfig) initCollectionBinlogSubPath() { - subPath, err := p.BaseParams.Load("etcd.collectionBinlogSubPath") - if err != nil { - panic(err) - } - p.CollectionBinlogSubPath = subPath -} - func (p *dataCoordConfig) initSegmentMaxSize() { p.SegmentMaxSize = p.BaseParams.ParseFloatWithDefault("dataCoord.segment.maxSize", 512.0) } @@ -1468,22 +1442,6 @@ func (p *dataCoordConfig) initDataCoordSubscriptionName() { p.DataCoordSubscriptionName = strings.Join(s, "-") } -func (p *dataCoordConfig) initFlushStreamPosSubPath() { - subPath, err := p.BaseParams.Load("etcd.flushStreamPosSubPath") - if err != nil { - panic(err) - } - p.FlushStreamPosSubPath = subPath -} - -func (p *dataCoordConfig) initStatsStreamPosSubPath() { - subPath, err := p.BaseParams.Load("etcd.statsStreamPosSubPath") - if err != nil { - panic(err) - } - p.StatsStreamPosSubPath = subPath -} - func (p *dataCoordConfig) initChannelWatchPrefix() { // WARN: this value should not be put to milvus.yaml. It's a default value for channel watch path. // This will be removed after we reconstruct our config module.