Skip to content

Commit 05d5c54

Browse files
committed
WIP: try different machines
1 parent c590d85 commit 05d5c54

5 files changed

Lines changed: 22 additions & 17 deletions

File tree

.github/workflows/continuous-benchmark-transfer.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ concurrency:
3535
env:
3636
HCLOUD_TOKEN: ${{ secrets.HCLOUD_TOKEN }}
3737
# Defaults for push trigger (inputs.* is empty on push)
38-
SERVER_TYPE: ${{ inputs.server_type || 'cpx42' }}
39-
CLIENT_TYPE: ${{ inputs.client_type || 'cpx42' }}
38+
SERVER_TYPE: ${{ inputs.server_type || 'ccx13' }}
39+
CLIENT_TYPE: ${{ inputs.client_type || 'cx32' }}
4040
REGION: ${{ inputs.region || 'fsn1' }}
4141
DATASET_NAME: ${{ inputs.dataset_name || 'dbpedia-openai-100K-1536-angular' }}
4242
QDRANT_VERSIONS: ${{ inputs.qdrant_versions || 'ghcr/dev,docker/master' }}

ansible/playbooks/files/transfer-speed/docker-compose-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
qdrant:
33
image: ${CONTAINER_REGISTRY}/qdrant/qdrant:${QDRANT_VERSION}
4-
container_name: qdrant-node
4+
container_name: qdrant-continuous
55
restart: unless-stopped
66
ports:
77
- "6333:6333"

ansible/playbooks/playbook-transfer-speed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
# dataset_name=$(echo "$results" | jq -r '.params.dataset')
4949
# measure_timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
5050
#
51-
# pg_query="INSERT INTO transfer_speed (
51+
# pg_query="INSERT INTO benchmark_shard_transfer (
5252
# engine, engine_version, dataset, measure_timestamp, throughput_pts_s, duration_s
5353
# ) VALUES (
5454
# '{{ server.name }}', '{{ server.version }}', '\${dataset_name}', '\${measure_timestamp}', \${throughput_pts_s}, \${duration_s}

ansible/playbooks/roles/run-transfer-speed/files/shard_transfer.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,12 @@ def setup_collection(self, dims: int):
8888
self.primary.create_collection(
8989
COLLECTION_NAME,
9090
vectors_config=models.VectorParams(size=dims, distance=models.Distance.COSINE, on_disk=True),
91-
# Disable optimization threads during upload for faster ingestion
92-
optimizers_config=models.OptimizersConfigDiff(max_optimization_threads=0),
91+
# Match framework settings - allow optimization during upload
92+
optimizers_config=models.OptimizersConfigDiff(
93+
default_segment_number=3,
94+
max_segment_size=1_000_000,
95+
memmap_threshold=10_000_000,
96+
),
9397
)
9498

9599
def upload_vectors(self, vectors: np.ndarray):
@@ -101,22 +105,24 @@ def upload_vectors(self, vectors: np.ndarray):
101105
batch_size=1024,
102106
parallel=16,
103107
)
104-
# Re-enable optimization after upload
105-
self.primary.update_collection(
106-
collection_name=COLLECTION_NAME,
107-
optimizer_config=models.OptimizersConfigDiff(max_optimization_threads=100_000),
108-
)
109108

110109
def wait_for_green(self, timeout: int = 1800):
111110
print("Waiting for green status...", end="", flush=True)
112-
start = time.time()
113-
while time.time() - start < timeout:
111+
wait_time = 5.0
112+
total = 0
113+
while total < timeout:
114+
time.sleep(wait_time)
115+
total += wait_time
116+
info = self.primary.get_collection(COLLECTION_NAME)
117+
if info.status != models.CollectionStatus.GREEN:
118+
print(".", end="", flush=True)
119+
continue
120+
# Double-check: status can briefly flip to GREEN during optimization
121+
time.sleep(wait_time)
114122
info = self.primary.get_collection(COLLECTION_NAME)
115123
if info.status == models.CollectionStatus.GREEN:
116-
print(f" done ({time.time() - start:.1f}s)")
124+
print(f" done ({total:.1f}s)")
117125
return
118-
time.sleep(1)
119-
print(".", end="", flush=True)
120126
print(f" timeout after {timeout}s")
121127

122128
def get_collection_cluster_info(self) -> dict:

ansible/playbooks/roles/setup-qdrant-cluster/tasks/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
- name: Stop existing containers
1818
ansible.builtin.shell: |
1919
cd {{ working_dir }} && docker compose down 2>/dev/null || true
20-
docker rm -f qdrant-node 2>/dev/null || true
2120
docker rm -f qdrant-continuous 2>/dev/null || true
2221
# Kill any container using port 6333
2322
docker ps -q --filter "publish=6333" | xargs -r docker rm -f 2>/dev/null || true

0 commit comments

Comments
 (0)