Merge pull request #83 from qdrant/fix/checking-old-release

fix: Checking any release from tags
qdrant · Dec 11, 2023 · 007d127 · 007d127
2 parents fc6ac26 + b37da8b
commit 007d127
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/manual-benchmark.yaml b/.github/workflows/manual-benchmark.yaml
@@ -4,16 +4,16 @@ on:
   repository_dispatch:
   workflow_dispatch:
     inputs:
-        qdrant_branch:
-            description: "Branch of qdrant to benchmark"
+        qdrant_version:
+            description: "Version of qdrant to benchmark (tags/v1.6.1, <commit-id>, my-branch, docker/v1.5.1)"
             default: dev
         dataset:
             description: "Dataset to benchmark"
             default: laion-small-clip
 
 jobs:
   runManualBenchmark:
-    name: manual benchmark - ${{ inputs.qdrant_branch }} - ${{ inputs.dataset }}
+    name: manual benchmark - ${{ inputs.qdrant_version }} - ${{ inputs.dataset }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
           export GCS_SECRET=${{ secrets.GCS_SECRET }}
           export POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
           export POSTGRES_HOST=${{ secrets.POSTGRES_HOST }}
-          export QDRANT_VERSION=${{ inputs.qdrant_branch }}
+          export QDRANT_VERSION=${{ inputs.qdrant_version }}
           export DATASETS=${{ inputs.dataset }}
           export POSTGRES_TABLE=benchmark_manual
           bash -x tools/run_ci.sh
diff --git a/tools/run_server_container.sh b/tools/run_server_container.sh
@@ -20,13 +20,14 @@ IP_OF_THE_SERVER=$(bash "${SCRIPT_PATH}/${CLOUD_NAME}/get_public_ip.sh" "$BENCH_
 
 bash -x "${SCRIPT_PATH}/sync_servers.sh" "root@$IP_OF_THE_SERVER"
 
-if [ "${QDRANT_VERSION}" == "dev" ]; then
-    # if version is dev, run in docker
+# if version is dev or if starts with "docker", run in docker
+if [ "${QDRANT_VERSION}" == "dev" ] || [[ ${QDRANT_VERSION} == docker/* ]]; then
+    QDRANT_VERSION=${QDRANT_VERSION#docker/}
     DOCKER_COMPOSE="export QDRANT_VERSION=${QDRANT_VERSION}; docker compose down ; pkill qdrant ; docker rmi qdrant/qdrant:${QDRANT_VERSION} || true ; docker compose up -d"
     ssh -t "${SERVER_USERNAME}@${IP_OF_THE_SERVER}" "cd ./projects/vector-db-benchmark/engine/servers/${CONTAINER_NAME} ; $DOCKER_COMPOSE"
 else
     # else run natively in the server
     DOCKER_QDRANT_STOP="docker stop qdrant-continuous || true"
-    QDRANT_BUILD="git checkout ${QDRANT_VERSION}; nohup mold -run cargo run --bin qdrant --release &"
+    QDRANT_BUILD="git fetch --tags; git checkout ${QDRANT_VERSION}; git pull; nohup mold -run cargo run --bin qdrant --release &"
     ssh -t "${SERVER_USERNAME}@${IP_OF_THE_SERVER}" "cd ./projects/qdrant; ${DOCKER_QDRANT_STOP}; $QDRANT_BUILD"
 fi