mirror of
https://github.com/qdrant/qdrant.git
synced 2026-08-03 00:20:57 -05:00
* ci: parallelize consensus tests with pytest-xdist
Enable pytest-xdist for consensus_tests to run tests across multiple
workers in parallel, significantly reducing CI wall time (~20min → ~5-7min).
Changes:
- Add `-n auto --dist=loadfile` to the consensus test pytest invocation
- Remove hardcoded port_seed from tests that don't need fixed ports for
restart/rejoin (test_order_by, test_consensus_compaction,
test_named_vector_crud, test_listener_node)
- Give test_cluster_rejoin its own PORT_SEED=15000 to avoid port
conflicts with auth tests (PORT_SEED=10000)
- Derive restart ports from killed PeerProcess objects instead of
hardcoded arithmetic where possible
- Add xdist_group("auth") marker to auth test files to ensure they
run on the same worker (they share PORT_SEED=10000)
Made-with: Cursor
* fix: remove remaining hardcoded port_seed=20000 causing parallel test conflicts
8 test files were using port_seed=20000 as a positional argument to
start_cluster(), which was missed in the initial change. When running
in parallel with pytest-xdist, multiple workers would try to bind to
the same port range (20000-20x02), causing port conflicts and cascading
test failures.
Also remove port_seed=23000 from test_snapshot_recovery_kill.py since
it doesn't need fixed ports for restart.
Made-with: Cursor
* fix: use saved port for restart in test_two_follower_nodes_down
The test was restarting killed peers on hardcoded ports (20200/20100)
that previously matched port_seed=20000. After switching to random
ports, the restart ports no longer match the original peer ports,
causing raft state URI mismatches and peer startup failures.
Save the p2p_port from the killed PeerProcess and reuse it for restart.
Made-with: Cursor
* Reuse p2p ports when restarting killed peers in consensus tests
When a peer is killed and restarted with random ports, it gets a new
consensus URI. The cluster needs a Raft operation to update this URI,
which under CPU contention from parallel test workers can exceed the
30-second timeout. Fix by capturing each peer's p2p_port before killing
and reusing it on restart, so the URI stays the same and no consensus
update is needed.
Made-with: Cursor
* A few improvements for parallel runs (#8731)
* fix: make auth tests' PORT_SEED per-worker to avoid port collisions
* ci: improve failure visibility for parallel consensus tests
* Three small changes to make hangs, interleaved output, and coverage runs behave predictably under pytest-xdist
* fix: two test bugs surfaced by parallel runs and revert drop PR_SET_PDEATHSIG helper
* fix: wait for count convergence in test_triple_replication
* fix: clean leaked peer processes at test start
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Cursor Agent <agent@cursor.com>
Co-authored-by: tellet-q <166374656+tellet-q@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
419 lines
13 KiB
Python
419 lines
13 KiB
Python
import concurrent.futures
|
|
import pathlib
|
|
import threading
|
|
|
|
from .custom_sharding import create_collection_with_custom_sharding, create_shard, delete_shard
|
|
from .fixtures import *
|
|
from .utils import *
|
|
|
|
N_PEERS = 3
|
|
N_SHARDS = 1
|
|
N_REPLICAS = 1
|
|
|
|
COLLECTION_NAME = "test_collection"
|
|
|
|
|
|
def test_shard_consistency(tmp_path: pathlib.Path):
|
|
assert_project_root()
|
|
|
|
peer_api_uris, peer_dirs, bootstrap_uri = start_cluster(tmp_path, N_PEERS)
|
|
|
|
create_collection_with_custom_sharding(peer_api_uris[0], shard_number=N_SHARDS, replication_factor=N_REPLICAS)
|
|
wait_collection_exists_and_active_on_all_peers(collection_name=COLLECTION_NAME, peer_api_uris=peer_api_uris)
|
|
|
|
# Wait until all peers submit their metadata to consensus
|
|
time.sleep(2)
|
|
|
|
# Create shards
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="cats",
|
|
shard_number=1,
|
|
replication_factor=1
|
|
)
|
|
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="dogs",
|
|
shard_number=1,
|
|
replication_factor=1
|
|
)
|
|
|
|
# Insert data
|
|
|
|
# Create points in first peer's collection
|
|
r = requests.put(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points?wait=true", json={
|
|
"shard_key": "cats",
|
|
"points": [
|
|
{"id": 1, "vector": [0.29, 0.81, 0.75, 0.11], "payload": {"name": "Barsik"}},
|
|
{"id": 2, "vector": [0.19, 0.11, 0.15, 0.21], "payload": {"name": "Murzik"}},
|
|
{"id": 3, "vector": [0.99, 0.81, 0.75, 0.31], "payload": {"name": "Vaska"}},
|
|
{"id": 4, "vector": [0.29, 0.01, 0.05, 0.91], "payload": {"name": "Chubais"}},
|
|
]
|
|
})
|
|
assert_http_ok(r)
|
|
|
|
r = requests.put(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points?wait=true", json={
|
|
"shard_key": "dogs",
|
|
"points": [
|
|
{"id": 5, "vector": [0.29, 0.81, 0.75, 0.11], "payload": {"name": "Sharik"}},
|
|
{"id": 6, "vector": [0.19, 0.11, 0.15, 0.21], "payload": {"name": "Tuzik"}},
|
|
{"id": 7, "vector": [0.99, 0.81, 0.75, 0.31], "payload": {"name": "Bobik"}},
|
|
{"id": 8, "vector": [0.29, 0.01, 0.05, 0.91], "payload": {"name": "Muhtar"}},
|
|
]
|
|
})
|
|
assert_http_ok(r)
|
|
|
|
# Check total number of points
|
|
r = requests.post(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points/count",
|
|
json={
|
|
"exact": True,
|
|
}
|
|
)
|
|
assert_http_ok(r)
|
|
assert r.json()["result"]["count"] == 8
|
|
|
|
# Search points within the shard
|
|
r = requests.post(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points/search",
|
|
json={
|
|
"vector": [0.29, 0.81, 0.75, 0.11],
|
|
"shard_key": "cats",
|
|
"limit": 10,
|
|
"with_payload": True,
|
|
}
|
|
)
|
|
|
|
assert_http_ok(r)
|
|
result = r.json()["result"]
|
|
assert len(result) == 4
|
|
for point in result:
|
|
assert point["payload"]["name"] in ["Barsik", "Murzik", "Vaska", "Chubais"]
|
|
assert point["shard_key"] == "cats"
|
|
|
|
# Search points within 2 shards
|
|
r = requests.post(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points/search",
|
|
json={
|
|
"vector": [0.29, 0.81, 0.75, 0.11],
|
|
"shard_key": ["cats", "dogs"],
|
|
"limit": 10,
|
|
"with_payload": True,
|
|
}
|
|
)
|
|
|
|
assert_http_ok(r)
|
|
result = r.json()["result"]
|
|
assert len(result) == 8
|
|
for point in result:
|
|
assert point["shard_key"] in ["cats", "dogs"]
|
|
|
|
# Search across all the shards
|
|
r = requests.post(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points/search",
|
|
json={
|
|
"vector": [0.29, 0.81, 0.75, 0.11],
|
|
"limit": 10,
|
|
}
|
|
)
|
|
|
|
assert_http_ok(r)
|
|
result = r.json()["result"]
|
|
assert len(result) == 8
|
|
for point in result:
|
|
assert point["shard_key"] in ["cats", "dogs"]
|
|
|
|
delete_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="cats",
|
|
)
|
|
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="birds",
|
|
shard_number=1,
|
|
replication_factor=1
|
|
)
|
|
|
|
r = requests.put(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points?wait=true", json={
|
|
"shard_key": "birds",
|
|
"points": [
|
|
{"id": 9, "vector": [0.29, 0.81, 0.75, 0.11], "payload": {"name": "Kesha"}},
|
|
{"id": 10, "vector": [0.19, 0.11, 0.15, 0.21], "payload": {"name": "Gosha"}},
|
|
]
|
|
})
|
|
assert_http_ok(r)
|
|
|
|
# Search across all the shards
|
|
r = requests.post(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points/search",
|
|
json={
|
|
"vector": [0.29, 0.81, 0.75, 0.11],
|
|
"limit": 10,
|
|
}
|
|
)
|
|
|
|
assert_http_ok(r)
|
|
result = r.json()["result"]
|
|
|
|
assert len(result) == 6
|
|
for point in result:
|
|
assert point["shard_key"] in ["dogs", "birds"]
|
|
|
|
|
|
def test_shard_key_storage(tmp_path: pathlib.Path):
|
|
"""
|
|
Creates cluster with custom sharding. Asserts custom sharding keys are
|
|
loaded correctly on node restart.
|
|
|
|
Tests bug: <https://github.com/qdrant/qdrant/pull/5838>
|
|
"""
|
|
assert_project_root()
|
|
|
|
peer_api_uris, peer_dirs, bootstrap_uri = start_cluster(tmp_path, N_PEERS)
|
|
|
|
create_collection_with_custom_sharding(peer_api_uris[0], shard_number=N_SHARDS, replication_factor=N_PEERS)
|
|
wait_collection_exists_and_active_on_all_peers(collection_name=COLLECTION_NAME, peer_api_uris=peer_api_uris)
|
|
|
|
# Create shards with string and number shard keys
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="cats",
|
|
shard_number=1,
|
|
replication_factor=N_PEERS,
|
|
)
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="dogs",
|
|
shard_number=1,
|
|
replication_factor=N_PEERS,
|
|
)
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key=123,
|
|
shard_number=1,
|
|
replication_factor=N_PEERS,
|
|
)
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key=456,
|
|
shard_number=1,
|
|
replication_factor=N_PEERS,
|
|
)
|
|
|
|
# Shards must show keys in correct format
|
|
info = get_collection_cluster_info(peer_api_uris[-1], COLLECTION_NAME)
|
|
assert len(info['local_shards']) == 4
|
|
for shard in info['local_shards']:
|
|
assert shard['shard_key'] in ["cats", "dogs", 123, 456]
|
|
|
|
# Kill the last peer
|
|
p = processes.pop()
|
|
restart_port = p.p2p_port
|
|
p.kill()
|
|
|
|
# Restart the last peer
|
|
restarted_peer_url = start_peer(peer_dirs[-1], "peer_1_restarted.log", bootstrap_uri, port=restart_port)
|
|
peer_api_uris[-1] = restarted_peer_url
|
|
|
|
wait_for_peer_online(peer_api_uris[-1])
|
|
|
|
# After restart, shards must show keys in correct format
|
|
info = get_collection_cluster_info(peer_api_uris[-1], COLLECTION_NAME)
|
|
assert len(info['local_shards']) == 4
|
|
for shard in info['local_shards']:
|
|
# This was previously broken, changing numbers into strings on restart
|
|
assert shard['shard_key'] in ["cats", "dogs", 123, 456]
|
|
|
|
|
|
def test_create_shard_key_read_availability(tmp_path: pathlib.Path):
|
|
"""
|
|
Creates shard key and asserts that read requests do not return error while custom shard is being
|
|
created.
|
|
"""
|
|
|
|
assert_project_root()
|
|
|
|
# Bootstrap cluster
|
|
peer_urls, _, _ = start_cluster(tmp_path, N_PEERS)
|
|
|
|
# Wait until all peers submit their metadata to consensus 🙄
|
|
wait_for_peer_metadata(peer_urls[0])
|
|
|
|
create_collection_with_custom_sharding(peer_urls[0], shard_number = N_SHARDS, replication_factor = N_PEERS)
|
|
wait_collection_exists_and_active_on_all_peers(collection_name = COLLECTION_NAME, peer_api_uris = peer_urls)
|
|
|
|
# Spawn background search tasks for each peer
|
|
cancel = threading.Event()
|
|
executor = concurrent.futures.ThreadPoolExecutor(max_workers = N_PEERS)
|
|
search_futures = [executor.submit(try_search_random, peer_urls[peer_idx], cancel) for peer_idx in range(N_PEERS)]
|
|
|
|
# Create shard keys
|
|
for idx in range(3):
|
|
create_shard(
|
|
peer_urls[0],
|
|
COLLECTION_NAME,
|
|
shard_key = f"shard_key_{idx}",
|
|
shard_number = 1,
|
|
replication_factor = 1,
|
|
)
|
|
|
|
# Stop search tasks
|
|
cancel.set()
|
|
|
|
# Assert that all search requests succeeded while custom shard was being created
|
|
assert all(search_future.result() for search_future in concurrent.futures.as_completed(search_futures))
|
|
|
|
|
|
def test_shard_key_initial_state_partial(tmp_path: pathlib.Path):
|
|
"""
|
|
Creates shard key with initial_state set to Partial. Asserts that shard is created in Partial state.
|
|
"""
|
|
assert_project_root()
|
|
|
|
peer_api_uris, peer_dirs, bootstrap_uri = start_cluster(tmp_path, N_PEERS)
|
|
|
|
create_collection_with_custom_sharding(peer_api_uris[0], shard_number=N_SHARDS, replication_factor=3)
|
|
wait_collection_exists_and_active_on_all_peers(collection_name=COLLECTION_NAME, peer_api_uris=peer_api_uris)
|
|
|
|
# Wait until all peers submit their metadata to consensus
|
|
wait_for_peer_metadata(peer_api_uris[0])
|
|
|
|
# Trying to create shard with initial state other than Active or Partial must fail
|
|
with pytest.raises(Exception) as e:
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="bar",
|
|
shard_number=1,
|
|
replication_factor=1,
|
|
initial_state="Dead",
|
|
)
|
|
|
|
assert "Bad request: Initial state cannot be Dead, only Active or Partial are allowed" in str(e.value)
|
|
|
|
# Create shard with initial_state = Partial
|
|
create_shard(
|
|
peer_api_uris[0],
|
|
COLLECTION_NAME,
|
|
shard_key="foo",
|
|
shard_number=1,
|
|
replication_factor=1,
|
|
initial_state="Partial",
|
|
)
|
|
|
|
# Check that all shards are in Partial state
|
|
def check_partial_state():
|
|
info = get_collection_cluster_info(peer_api_uris[-1], COLLECTION_NAME)
|
|
for shard in info['local_shards'] + info['remote_shards']:
|
|
if shard['shard_key'] == "foo":
|
|
return shard['state'] == "Partial"
|
|
return False
|
|
|
|
wait_for(check_partial_state)
|
|
|
|
|
|
def wait_for_peer_metadata(peer_url: str):
|
|
try:
|
|
wait_for(check_peer_metadata, peer_url)
|
|
except Exception as e:
|
|
import json
|
|
print(json.dumps(get_telemetry(peer_url), indent = 2))
|
|
raise e
|
|
|
|
|
|
def check_peer_metadata(peer_url: str):
|
|
telemetry = get_telemetry(peer_url)
|
|
|
|
cluster = telemetry.get("cluster")
|
|
|
|
metadata = cluster and cluster.get("peer_metadata")
|
|
peers = cluster and cluster.get("peers")
|
|
|
|
return metadata and peers and all(metadata.get(peer) for peer in peers)
|
|
|
|
|
|
def get_telemetry(peer_url: str):
|
|
resp = requests.get(f"{peer_url}/telemetry?details_level=3")
|
|
assert_http_ok(resp)
|
|
|
|
return resp.json()["result"]
|
|
|
|
|
|
def try_search_random(peer_url: str, cancel: threading.Event):
|
|
while not cancel.is_set():
|
|
resp = requests.post(f"{peer_url}/collections/{COLLECTION_NAME}/points/search", json = {
|
|
"vector": random_dense_vector(),
|
|
"limit": 10,
|
|
"with_vectors": True,
|
|
"with_payload": True,
|
|
})
|
|
|
|
if not resp.ok:
|
|
print(f"Search on {peer_url} failed: {resp.json()}")
|
|
return False
|
|
|
|
time.sleep(0.05)
|
|
|
|
return True
|
|
|
|
def test_no_shards_payload_index(tmp_path: pathlib.Path):
|
|
"""
|
|
Test that only payload index creation is allowed on custom sharded collections without shard keys.
|
|
"""
|
|
assert_project_root()
|
|
|
|
peer_api_uris, _peer_dirs, _bootstrap_uri = start_cluster(tmp_path, N_PEERS)
|
|
|
|
# Create collection with custom sharding but don't create any shard keys
|
|
create_collection_with_custom_sharding(peer_api_uris[0], shard_number=N_SHARDS, replication_factor=N_REPLICAS)
|
|
wait_collection_exists_and_active_on_all_peers(collection_name=COLLECTION_NAME, peer_api_uris=peer_api_uris)
|
|
|
|
wait_for_peer_metadata(peer_api_uris[0])
|
|
|
|
# Verify collection has no shard keys
|
|
info = get_collection_cluster_info(peer_api_uris[0], COLLECTION_NAME)
|
|
assert len(info.get('local_shards', [])) == 0
|
|
|
|
# Verify collection info can be retrieved correctly (tests CollectionInfo.empty with payload_schema)
|
|
collection_info = get_collection_info(peer_api_uris[0], COLLECTION_NAME)
|
|
assert collection_info["payload_schema"] == {}
|
|
|
|
# Try to upsert points without shard key - should be rejected
|
|
r = requests.put(
|
|
f"{peer_api_uris[0]}/collections/{COLLECTION_NAME}/points?wait=true",
|
|
json={
|
|
"points": [
|
|
{"id": 1, "vector": [0.1, 0.2, 0.3, 0.4], "payload": {"name": "test1"}},
|
|
{"id": 2, "vector": [0.2, 0.3, 0.4, 0.5], "payload": {"name": "test2"}},
|
|
]
|
|
}
|
|
)
|
|
assert r.status_code == 400, f"Expected upsert to be rejected, got status {r.status_code}: {r.text}"
|
|
assert r.json()["status"]["error"] == "Wrong input: Shard key not specified"
|
|
|
|
# Payload index creation without shard key - should be accepted
|
|
create_field_index(
|
|
peer_api_uris[0],
|
|
collection=COLLECTION_NAME,
|
|
field_name="test_field",
|
|
field_schema="keyword"
|
|
)
|
|
|
|
# Verify the payload index was created by checking collection info
|
|
collection_info = get_collection_info(peer_api_uris[0], COLLECTION_NAME)
|
|
assert "payload_schema" in collection_info
|
|
assert "test_field" in collection_info["payload_schema"]
|