mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-15 08:18:42 +01:00
s3vectors: name weed-vector processes servers (#12627)
* s3vectors: call the registered weed-vector processes servers The gateway's discovery named them workers, the name of the admin plugin workers. Also drops two comments left without a function. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011UpvafvK8JpagF94MHWqwK * test/s3vectors: build the Enterprise engine as weed-vector In an Enterprise checkout, make ./weed-vector builds the distributed engine, which also serves VectorService, instead of a separate weed-vector-worker. An open-source checkout builds weed-vector-server as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011UpvafvK8JpagF94MHWqwK * test/s3vectors: distributed mode starts two more weed-vector engines It started weed-vector-worker, which no target builds now, and waited for a gateway log line that no longer exists. The Enterprise weed-vector's engines all join the placement controller. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011UpvafvK8JpagF94MHWqwK --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Chris LuandClaude Opus 5.5 authored and GitHub committed
1 parent
a8436a621a
commit
63c99183d1
7 files changed
+66
-79
No files matched your search
+8
-13
@@ -1,10 +1,7 @@
|
||||
WEED := ./weed
|
||||
VEC := ./weed-vector
|
||||
CLI := ./weed-vector-cli
|
||||
WORKER_MANIFEST := ../../rust/sw-vector-distributed/Cargo.toml
|
||||
ifneq ($(wildcard $(WORKER_MANIFEST)),)
|
||||
WORKER := ./weed-vector-worker
|
||||
endif
|
||||
ENGINE_MANIFEST := ../../rust/sw-vector-distributed/Cargo.toml
|
||||
VOLUME := ./weed-volume
|
||||
LANCE_WORKER := ./weed-worker
|
||||
CARGO_PROFILE ?= release
|
||||
@@ -21,7 +18,11 @@ $(WEED): FORCE
|
||||
go build -o $(WEED) ../../weed
|
||||
|
||||
$(VEC): FORCE
|
||||
ifneq ($(wildcard $(ENGINE_MANIFEST)),)
|
||||
cargo build --locked --profile $(CARGO_PROFILE) --manifest-path ../../rust/Cargo.toml -p sw-vector-distributed --bin weed-vector
|
||||
else
|
||||
cd ../../seaweed-vector && cargo build --locked --profile $(CARGO_PROFILE) -p weed-vector-server
|
||||
endif
|
||||
cp $(CARGO_OUTPUT)/weed-vector $(VEC)
|
||||
|
||||
$(CLI): FORCE
|
||||
@@ -32,19 +33,13 @@ $(LANCE_WORKER): FORCE
|
||||
cargo build --locked --profile $(CARGO_PROFILE) --manifest-path ../../seaweed-worker/Cargo.toml -p weed-lance-worker --bin weed-worker
|
||||
cp $(CARGO_OUTPUT)/weed-worker $(LANCE_WORKER)
|
||||
|
||||
ifneq ($(WORKER),)
|
||||
$(WORKER): $(VEC) FORCE
|
||||
cargo build --locked --profile $(CARGO_PROFILE) --manifest-path ../../rust/Cargo.toml -p sw-vector-distributed --bin weed-vector
|
||||
cp $(CARGO_OUTPUT)/weed-vector $(WORKER)
|
||||
endif
|
||||
|
||||
$(VOLUME): $(VEC) $(WORKER) FORCE
|
||||
$(VOLUME): $(VEC) FORCE
|
||||
cargo build --locked --profile $(CARGO_PROFILE) --manifest-path ../../seaweed-volume/Cargo.toml --bin weed-volume
|
||||
cp $(CARGO_OUTPUT)/weed-volume $(VOLUME)
|
||||
|
||||
FORCE:
|
||||
|
||||
build: $(WEED) $(VEC) $(WORKER) $(VOLUME)
|
||||
build: $(WEED) $(VEC) $(VOLUME)
|
||||
ifneq ($(VECTOR_WORKER),)
|
||||
build: $(CLI) $(LANCE_WORKER)
|
||||
endif
|
||||
@@ -56,4 +51,4 @@ perf: build $(CLI)
|
||||
./run_perf.sh
|
||||
|
||||
clean:
|
||||
rm -f $(WEED) $(VEC) $(CLI) $(LANCE_WORKER) ./weed-vector-worker $(VOLUME)
|
||||
rm -f $(WEED) $(VEC) $(CLI) $(LANCE_WORKER) $(VOLUME)
|
||||
+13
-13
@@ -242,7 +242,6 @@ def run_cluster(param, tmp_path_factory, identities):
|
||||
# VECTOR_WORKER=1 adds the admin server and the Lance maintenance worker,
|
||||
# for the tests that build vector indexes through a plugin job.
|
||||
lance_worker = binary("LANCE_WORKER_BINARY", "weed-worker") if os.environ.get("VECTOR_WORKER") else None
|
||||
worker = binary("VECTOR_WORKER_BINARY", "weed-vector-worker") if mode == "distributed" else None
|
||||
volume_binary = binary("RUST_VOLUME_SERVER_BINARY", "weed-volume") if volume == "rust" else weed
|
||||
processes = {}
|
||||
with contextlib.ExitStack() as stack:
|
||||
@@ -252,13 +251,13 @@ def run_cluster(param, tmp_path_factory, identities):
|
||||
sock = reservations.enter_context(socket.socket())
|
||||
sock.bind(("127.0.0.1", 0))
|
||||
ports.append(sock.getsockname()[1])
|
||||
(master, master_grpc, vol, vol_grpc, filer, filer_grpc, s3, s3_grpc, lance, vector, worker1, worker2,
|
||||
(master, master_grpc, vol, vol_grpc, filer, filer_grpc, s3, s3_grpc, lance, vector, engine1, engine2,
|
||||
admin, admin_grpc, vector_metrics) = ports
|
||||
master_addr = f"127.0.0.1:{master}.{master_grpc}"
|
||||
filer_addr = f"127.0.0.1:{filer}.{filer_grpc}"
|
||||
|
||||
# VECTOR_READ_JWT=1 makes volume reads need a JWT; every weed process
|
||||
# and the workers sign with the key.
|
||||
# and the engines sign with the key.
|
||||
read_jwt_key = os.environ.get("VECTOR_READ_JWT") and uuid.uuid4().hex
|
||||
# The cluster's filer signing key: the gateway's catalog authenticates
|
||||
# the worker and the CLI by the token they derive from it.
|
||||
@@ -346,18 +345,19 @@ def run_cluster(param, tmp_path_factory, identities):
|
||||
"vector engine never registered with the master",
|
||||
)
|
||||
|
||||
if worker:
|
||||
for i, port in enumerate((worker1, worker2)):
|
||||
start(f"worker-{i}", [worker, "--masters", master_addr, "--listen", f"127.0.0.1:{port}"])
|
||||
wait_for(lambda: listening(port), processes, "vector worker not ready")
|
||||
# Distributed mode needs the Enterprise weed-vector, whose engines all
|
||||
# join the masters' placement controller.
|
||||
if mode == "distributed":
|
||||
for i, port in enumerate((engine1, engine2), 1):
|
||||
start(f"vector-{i}", [engine, "--masters", master_addr, "--listen", f"127.0.0.1:{port}",
|
||||
"--filer-group", filer_group, "--state-dir", str(directory / f"vector-{i}"),
|
||||
"--capacity-bytes", str(1 << 30), "--drain-timeout", "5s"])
|
||||
wait_for(lambda: listening(port), processes, f"vector-{i} not ready")
|
||||
wait_for(
|
||||
lambda: all(
|
||||
f"S3 Vectors: discovered search worker 127.0.0.1:{port}"
|
||||
in (directory / "s3.log").read_text()
|
||||
for port in (worker1, worker2)
|
||||
),
|
||||
lambda: all(f"joined at 127.0.0.1:{port}" in (directory / "master.log").read_text()
|
||||
for port in (engine1, engine2)),
|
||||
processes,
|
||||
"gateway did not discover both search workers",
|
||||
"the engines never joined the placement controller",
|
||||
)
|
||||
admin_url = None
|
||||
if lance_worker:
|
||||
|
||||
Reference in new issue
Block a user