Skip to content

Commit 6bab477

Browse files
Improve volumes and logging (qdrant#202)
* Add logging to search requests * Use default volumes instead of bind * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 6e0f4b3 commit 6bab477

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

engine/clients/qdrant/search.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def init_client(cls, host, distance, connection_params: dict, search_params: dic
2525
host,
2626
prefer_grpc=True,
2727
limits=httpx.Limits(max_connections=None, max_keepalive_connections=0),
28-
**connection_params
28+
**connection_params,
2929
)
3030
cls.search_params = search_params
3131

@@ -50,11 +50,15 @@ def search_one(cls, query: Query, top: int) -> List[Tuple[int, float]]:
5050
),
5151
)
5252

53-
res = cls.client.search(
54-
collection_name=QDRANT_COLLECTION_NAME,
55-
query_vector=query_vector,
56-
query_filter=cls.parser.parse(query.meta_conditions),
57-
limit=top,
58-
search_params=rest.SearchParams(**cls.search_params.get("config", {})),
59-
)
53+
try:
54+
res = cls.client.search(
55+
collection_name=QDRANT_COLLECTION_NAME,
56+
query_vector=query_vector,
57+
query_filter=cls.parser.parse(query.meta_conditions),
58+
limit=top,
59+
search_params=rest.SearchParams(**cls.search_params.get("config", {})),
60+
)
61+
except Exception as ex:
62+
print(f"Something went wrong during search: {ex}")
63+
raise ex
6064
return [(hit.id, hit.score) for hit in res]

engine/servers/qdrant-continuous-benchmarks-with-volume/docker-compose.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,3 @@ services:
2222
volumes:
2323
qdrant_storage:
2424
name: "qdrant_storage"
25-
driver: local
26-
driver_opts:
27-
type: none
28-
device: ${PWD}/qdrant_storage
29-
o: bind

tools/run_server_container_with_volume.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ if [[ ${QDRANT_VERSION} == docker/* ]] || [[ ${QDRANT_VERSION} == ghcr/* ]]; the
3636
fi
3737

3838
if [[ "$EXECUTION_MODE" == "init" ]]; then
39-
# create volume qdrant_storage
40-
echo "Initialize qdrant from scratch"
41-
DOCKER_VOLUME_SET_UP="docker volume rm -f qdrant_storage; sudo rm -rf qdrant_storage; mkdir qdrant_storage"
42-
DOCKER_COMPOSE="export QDRANT_VERSION=${QDRANT_VERSION}; export CONTAINER_REGISTRY=${CONTAINER_REGISTRY}; export CONTAINER_MEM_LIMIT=${CONTAINER_MEM_LIMIT}; docker compose down; pkill qdrant; docker rm -f qdrant-continuous || true; docker rmi -f ${CONTAINER_REGISTRY}/qdrant/qdrant:${QDRANT_VERSION} || true ; ${DOCKER_VOLUME_SET_UP}; docker compose up -d; docker container ls -a"
39+
echo "Initialize qdrant from scratch, with qdrant_storage volume"
40+
DOCKER_COMPOSE="export QDRANT_VERSION=${QDRANT_VERSION}; export CONTAINER_REGISTRY=${CONTAINER_REGISTRY}; export CONTAINER_MEM_LIMIT=${CONTAINER_MEM_LIMIT}; docker compose down; pkill qdrant; docker rm -f qdrant-continuous || true; docker rmi -f ${CONTAINER_REGISTRY}/qdrant/qdrant:${QDRANT_VERSION} || true; docker volume rm -f qdrant_storage || true; docker compose up -d; docker container ls -a"
4341
else
4442
# suggest that volume qdrant_storage exist and start qdrant
4543
echo "Reload qdrant with existing data"

0 commit comments

Comments
 (0)