Commit 30dcfa67 authored by 余昆's avatar 余昆
Browse files

fix conflict in SchedInst

parents 7f5c2fef 6d9ed166

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#322 - Add option to enable / disable prometheus

- \#358 - Add more information in build.sh and install.md

- \#255 - Add ivfsq8 test report detailed version

- \#404 - Add virtual method Init() in Pass abstract class

- \#409 - Add a Fallback pass in optimizer



## Task

ci/jenkins/step/deploySingle2Dev.groovy

+1 −5
Original line number Diff line number Diff line
@@ -3,11 +3,7 @@ sh 'helm repo update' 
dir ('milvus-helm') {

    checkout([$class: 'GitSCM', branches: [[name: "0.6.0"]], userRemoteConfigs: [[url: "https://github.com/milvus-io/milvus-helm.git", name: 'origin', refspec: "+refs/heads/0.6.0:refs/remotes/origin/0.6.0"]]])

    dir ("milvus") {

    	if ("${env.BINRARY_VERSION}" == "gpu") {

        	sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f gpu_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    	} else {

    		sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/filebeat/values.yaml --namespace milvus ."

    	}

        sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/sqlite_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    }

}

ci/jenkins/step/singleDevNightlyTest.groovy

+1 −5
Original line number Diff line number Diff line
@@ -13,11 +13,7 @@ timeout(time: 90, unit: 'MINUTES') { 
    }

    dir ("milvus-helm") {

        dir ("milvus") {

            if ("${env.BINRARY_VERSION}" == "gpu") {

                sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f gpu_values.yaml -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

            } else {

                sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

            }

            sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

        }

    }

    dir ("tests/milvus_python_test") {

ci/jenkins/step/singleDevTest.groovy

+1 −5
Original line number Diff line number Diff line
@@ -14,11 +14,7 @@ timeout(time: 60, unit: 'MINUTES') { 
    // }

    // dir ("milvus-helm") {

    //     dir ("milvus") {

    //         if ("${env.BINRARY_VERSION}" == "gpu") {

    //             sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f gpu_values.yaml -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    //         } else {

    //             sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    //         }

    //         sh "helm install --wait --timeout 300 --set engine.image.tag=${DOCKER_VERSION} --set expose.type=clusterIP --name ${env.PIPELINE_NAME}-${env.BUILD_NUMBER}-single-${env.BINRARY_VERSION} -f ci/db_backend/mysql_${env.BINRARY_VERSION}_values.yaml -f ci/filebeat/values.yaml --namespace milvus ."

    //     }

    // }

    // dir ("tests/milvus_python_test") {

core/src/scheduler/SchedInst.cpp

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ load_simple_config() { 
void

StartSchedulerService() {

    load_simple_config();

    OptimizerInst::GetInstance()->Init();

    ResMgrInst::GetInstance()->Start();

    SchedInst::GetInstance()->Start();

    JobMgrInst::GetInstance()->Start();