From 4cec3924ccbc70db744ad203b7f47473518c3e3b Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Mon, 26 Apr 2021 18:35:57 +0800 Subject: [PATCH] rename all singlenode to standalone (#5051) * rename all singlenode to standalone Signed-off-by: yudong.cai * update docker image name Signed-off-by: yudong.cai * fix merge conflict Signed-off-by: yudong.cai * Rename all singlenode to standalone (#1) Signed-off-by: quicksilver Co-authored-by: quicksilver --- Makefile | 10 +++---- build/ci/jenkins/Jenkinsfile | 2 +- cmd/distributed/roles/roles.go | 2 +- cmd/{singlenode => standalone}/main.go | 6 ++--- .../docker/distributed/docker-compose.yml | 27 +++++++------------ .../docker-compose.yml | 10 ++----- 6 files changed, 21 insertions(+), 36 deletions(-) rename cmd/{singlenode => standalone}/main.go (91%) rename deployments/docker/{singlenode => standalone}/docker-compose.yml (80%) diff --git a/Makefile b/Makefile index d3df2405c..69f4e6d3a 100644 --- a/Makefile +++ b/Makefile @@ -119,15 +119,15 @@ indexnode: build-cpp @echo "Building indexnode ..." @mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && GO111MODULE=on $(GO) build -o $(INSTALL_PATH)/indexnode $(PWD)/cmd/indexnode/main.go 1>/dev/null -singlenode: build-cpp - @echo "Building Milvus singlenode ..." - @mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && GO111MODULE=on $(GO) build -o $(INSTALL_PATH)/singlenode $(PWD)/cmd/singlenode/main.go 1>/dev/null +standalone: build-cpp + @echo "Building Milvus standalone ..." + @mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && GO111MODULE=on $(GO) build -o $(INSTALL_PATH)/standalone $(PWD)/cmd/standalone/main.go 1>/dev/null milvus: build-cpp @echo "Building Milvus distributed ..." @mkdir -p $(INSTALL_PATH) && go env -w CGO_ENABLED="1" && GO111MODULE=on $(GO) build -o $(INSTALL_PATH)/milvus $(PWD)/cmd/distributed/main.go 1>/dev/null -build-go: singlenode milvus +build-go: standalone milvus build-cpp: @(env bash $(PWD)/scripts/core_build.sh -f "$(CUSTOM_THIRDPARTY_PATH)") @@ -165,7 +165,7 @@ docker: verifiers # Builds each component and installs it to $GOPATH/bin. install: all @echo "Installing binary to './bin'" - @mkdir -p $(GOPATH)/bin && cp -f $(PWD)/bin/singlenode $(GOPATH)/bin/singlenode + @mkdir -p $(GOPATH)/bin && cp -f $(PWD)/bin/standalone $(GOPATH)/bin/standalone @mkdir -p $(GOPATH)/bin && cp -f $(PWD)/bin/milvus $(GOPATH)/bin/milvus @mkdir -p $(LIBRARY_PATH) && cp -f $(PWD)/internal/core/output/lib/* $(LIBRARY_PATH) @echo "Installation successful." diff --git a/build/ci/jenkins/Jenkinsfile b/build/ci/jenkins/Jenkinsfile index df4152f4c..6215139cc 100644 --- a/build/ci/jenkins/Jenkinsfile +++ b/build/ci/jenkins/Jenkinsfile @@ -84,7 +84,7 @@ pipeline { } } environment { - HELM_BRANCH = "main" + HELM_BRANCH = "2.0" HELM_RELEASE_NAMESPACE = "dev" HELM_RELEASE_NAME = "${PROJECT_NAME}-${SEMVER}-${env.BUILD_NUMBER}-${REGRESSION_SERVICE_TYPE}".replaceAll("\\.", "-").replaceAll("_", "-").toLowerCase() DEV_TEST_ARTIFACTS_PATH = "artifacts" diff --git a/cmd/distributed/roles/roles.go b/cmd/distributed/roles/roles.go index 4144e11a2..521fa4618 100644 --- a/cmd/distributed/roles/roles.go +++ b/cmd/distributed/roles/roles.go @@ -63,7 +63,7 @@ func (mr *MilvusRoles) EnvValue(env string) bool { } func (mr *MilvusRoles) Run(localMsg bool) { - closer := trace.InitTracing("singleNode") + closer := trace.InitTracing("standalone") if closer != nil { defer closer.Close() } diff --git a/cmd/singlenode/main.go b/cmd/standalone/main.go similarity index 91% rename from cmd/singlenode/main.go rename to cmd/standalone/main.go index 213093b00..1269a5f00 100644 --- a/cmd/singlenode/main.go +++ b/cmd/standalone/main.go @@ -45,9 +45,9 @@ func initLogCfg() log.Config { //logCfg.File.Filename = "" ciFileDir := "/milvus/logs/" if _, err := os.Stat(ciFileDir); err == nil { - logCfg.File.Filename = ciFileDir + "singlenode.log" + logCfg.File.Filename = ciFileDir + "standalone.log" } else { - logCfg.File.Filename = "/tmp/milvus/singlenode.log" + logCfg.File.Filename = "/tmp/milvus/standalone.log" } return logCfg } @@ -56,7 +56,7 @@ func main() { var roles roles.MilvusRoles initRoles(&roles) os.Setenv("QUERY_NODE_ID", "1") - os.Setenv("DEPLOY_MODE", "SINGLE_NODE") + os.Setenv("DEPLOY_MODE", "STANDALONE") logCfg := initLogCfg() logutil.SetupLogger(&logCfg) diff --git a/deployments/docker/distributed/docker-compose.yml b/deployments/docker/distributed/docker-compose.yml index 00073f925..d99c7e912 100644 --- a/deployments/docker/distributed/docker-compose.yml +++ b/deployments/docker/distributed/docker-compose.yml @@ -4,26 +4,17 @@ services: etcd: image: quay.io/coreos/etcd:latest command: etcd -listen-peer-urls=http://127.0.0.1:2380 -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 -initial-advertise-peer-urls=http://127.0.0.1:2380 --initial-cluster default=http://127.0.0.1:2380 - ports: - - "2379:2379" - - "2380:2380" - - "4001:4001" networks: - milvus pulsar: image: apachepulsar/pulsar:latest command: bin/pulsar standalone - ports: - - "6650:6650" - - "18080:8080" networks: - milvus minio: image: minio/minio:RELEASE.2020-12-03T00-03-10Z - ports: - - "9000:9000" environment: MINIO_ACCESS_KEY: minioadmin MINIO_SECRET_KEY: minioadmin @@ -37,7 +28,7 @@ services: - milvus master: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "master"] environment: ETCD_ADDRESS: etcd:2379 @@ -54,7 +45,7 @@ services: - milvus proxyservice: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "proxyservice"] environment: PULSAR_ADDRESS: pulsar://pulsar:6650 @@ -66,7 +57,7 @@ services: - milvus proxynode: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "proxynode"] environment: ETCD_ADDRESS: etcd:2379 @@ -84,7 +75,7 @@ services: - milvus queryservice: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "queryservice"] environment: MASTER_ADDRESS: master:53100 @@ -97,7 +88,7 @@ services: - milvus querynode: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "querynode"] environment: MINIO_ADDRESS: minio:9000 @@ -113,7 +104,7 @@ services: - milvus indexservice: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "indexservice"] environment: ETCD_ADDRESS: etcd:2379 @@ -127,7 +118,7 @@ services: - milvus indexnode: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "indexnode"] environment: MINIO_ADDRESS: minio:9000 @@ -138,7 +129,7 @@ services: - milvus dataservice: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "dataservice"] environment: ETCD_ADDRESS: etcd:2379 @@ -153,7 +144,7 @@ services: - milvus datanode: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release + image: registry.zilliz.com/milvus/milvus:master-release command: ["/milvus/bin/milvus", "run", "datanode"] environment: ETCD_ADDRESS: etcd:2379 diff --git a/deployments/docker/singlenode/docker-compose.yml b/deployments/docker/standalone/docker-compose.yml similarity index 80% rename from deployments/docker/singlenode/docker-compose.yml rename to deployments/docker/standalone/docker-compose.yml index 4959c027c..0924780f7 100644 --- a/deployments/docker/singlenode/docker-compose.yml +++ b/deployments/docker/standalone/docker-compose.yml @@ -4,17 +4,11 @@ services: etcd: image: quay.io/coreos/etcd:latest command: etcd -listen-peer-urls=http://127.0.0.1:2380 -advertise-client-urls=http://127.0.0.1:2379 -listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 -initial-advertise-peer-urls=http://127.0.0.1:2380 --initial-cluster default=http://127.0.0.1:2380 - ports: - - "2379:2379" - - "2380:2380" - - "4001:4001" networks: - milvus minio: image: minio/minio:RELEASE.2020-12-03T00-03-10Z - ports: - - "9000:9000" environment: MINIO_ACCESS_KEY: minioadmin MINIO_SECRET_KEY: minioadmin @@ -28,8 +22,8 @@ services: - milvus standalone: - image: registry.zilliz.com/milvus-distributed/milvus-distributed:master-release - command: ["/milvus/bin/singlenode"] + image: registry.zilliz.com/milvus/milvus:master-release + command: ["/milvus/bin/standalone"] environment: ETCD_ADDRESS: etcd:2379 MINIO_ADDRESS: minio:9000 -- GitLab