From 3e889539bd32821ec6c3d4f8fb27a837061228eb Mon Sep 17 00:00:00 2001 From: Kumar Shivendu Date: Thu, 16 May 2024 16:45:28 +0530 Subject: [PATCH 1/3] feat: Add H&M filter dataset to CI benchmarks --- .github/workflows/continuous-benchmark.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/continuous-benchmark.yaml b/.github/workflows/continuous-benchmark.yaml index 3c3f4f5a..eebf3ab6 100644 --- a/.github/workflows/continuous-benchmark.yaml +++ b/.github/workflows/continuous-benchmark.yaml @@ -25,6 +25,7 @@ jobs: declare -A DATASET_TO_ENGINE DATASET_TO_ENGINE["laion-small-clip"]="qdrant-continuous-benchmark" DATASET_TO_ENGINE["msmarco-sparse-100K"]="qdrant-sparse-vector" + DATASET_TO_ENGINE["h-and-m-2048-angular-filters"] ="qdrant-continuous-benchmark" for dataset in "${!DATASET_TO_ENGINE[@]}"; do export ENGINE_NAME=${DATASET_TO_ENGINE[$dataset]} From 132c480a49d18200f0eac537943c3d97105132f0 Mon Sep 17 00:00:00 2001 From: Kumar Shivendu Date: Thu, 16 May 2024 16:46:52 +0530 Subject: [PATCH 2/3] fix: Remove extra space --- .github/workflows/continuous-benchmark.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-benchmark.yaml b/.github/workflows/continuous-benchmark.yaml index eebf3ab6..78b22e0a 100644 --- a/.github/workflows/continuous-benchmark.yaml +++ b/.github/workflows/continuous-benchmark.yaml @@ -25,7 +25,7 @@ jobs: declare -A DATASET_TO_ENGINE DATASET_TO_ENGINE["laion-small-clip"]="qdrant-continuous-benchmark" DATASET_TO_ENGINE["msmarco-sparse-100K"]="qdrant-sparse-vector" - DATASET_TO_ENGINE["h-and-m-2048-angular-filters"] ="qdrant-continuous-benchmark" + DATASET_TO_ENGINE["h-and-m-2048-angular-filters"]="qdrant-continuous-benchmark" for dataset in "${!DATASET_TO_ENGINE[@]}"; do export ENGINE_NAME=${DATASET_TO_ENGINE[$dataset]} From 14386fa424bd18c28d4cda441b5620c2c8273ef9 Mon Sep 17 00:00:00 2001 From: tellet-q <166374656+tellet-q@users.noreply.github.com> Date: Fri, 17 May 2024 11:14:14 +0200 Subject: [PATCH 3/3] fix: Add ServerAliveInterval and ServerAliveCountMax (#141) * add runner resources monitoring * Revert "add runner resources monitoring" This reverts commit 7e5663e2cff34ecd73c115a763af471884991d42. * add ServerAliveInterval and ServerAliveCountMax --- tools/run_client_script.sh | 2 +- tools/run_server_container.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/run_client_script.sh b/tools/run_client_script.sh index da082ee3..783ae793 100644 --- a/tools/run_client_script.sh +++ b/tools/run_client_script.sh @@ -23,7 +23,7 @@ PRIVATE_IP_OF_THE_SERVER=$(bash "${SCRIPT_PATH}/${CLOUD_NAME}/get_private_ip.sh" RUN_EXPERIMENT="ENGINE_NAME=${ENGINE_NAME} DATASETS=${DATASETS} PRIVATE_IP_OF_THE_SERVER=${PRIVATE_IP_OF_THE_SERVER} bash ~/run_experiment.sh" -ssh -tt "${SERVER_USERNAME}@${IP_OF_THE_CLIENT}" "${RUN_EXPERIMENT}" +ssh -tt -o ServerAliveInterval=60 -o ServerAliveCountMax=3 "${SERVER_USERNAME}@${IP_OF_THE_CLIENT}" "${RUN_EXPERIMENT}" SEARCH_RESULT_FILE=$(ssh "${SERVER_USERNAME}@${IP_OF_THE_CLIENT}" "ls -t results/*-search-*.json | head -n 1") UPLOAD_RESULT_FILE=$(ssh "${SERVER_USERNAME}@${IP_OF_THE_CLIENT}" "ls -t results/*-upload-*.json | head -n 1") diff --git a/tools/run_server_container.sh b/tools/run_server_container.sh index 4875e83e..d04f1199 100644 --- a/tools/run_server_container.sh +++ b/tools/run_server_container.sh @@ -34,7 +34,7 @@ if [[ ${QDRANT_VERSION} == docker/* ]] || [[ ${QDRANT_VERSION} == ghcr/* ]]; the fi DOCKER_COMPOSE="export QDRANT_VERSION=${QDRANT_VERSION}; export CONTAINER_REGISTRY=${CONTAINER_REGISTRY}; docker compose down; pkill qdrant ; docker rmi ${CONTAINER_REGISTRY}/qdrant/qdrant:${QDRANT_VERSION} || true ; docker compose up -d; docker container ls" - ssh -t "${SERVER_USERNAME}@${IP_OF_THE_SERVER}" "cd ./projects/vector-db-benchmark/engine/servers/${CONTAINER_NAME} ; $DOCKER_COMPOSE" + ssh -t -o ServerAliveInterval=60 -o ServerAliveCountMax=3 "${SERVER_USERNAME}@${IP_OF_THE_SERVER}" "cd ./projects/vector-db-benchmark/engine/servers/${CONTAINER_NAME} ; $DOCKER_COMPOSE" else echo "Error: unknown version ${QDRANT_VERSION}. Version name should start with 'docker/' or 'ghcr/'" exit 1