mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-30 17:00:48 +01:00
Chris Lu
4ef123d764
* s3vectors: reuse shared authenticated identity context * s3vectors: encode empty results as arrays * test: cover S3 Vectors with Go and Rust volume servers * ci: require both volume implementations in vector integration tests * s3vectors: keep identityOf as a shim over the shared identity context Concurrent branches add identityOf call sites; deleting the helper would break the build when they merge in either order. Route it through GetIdentityNameFromContext so every caller resolves the same identity. * test: wait for the vector engine to register before running The gateway resolves weed-vector lazily through the master cluster list, so a listening port does not mean the engine is reachable yet; the first vector write or query could race KeepConnected and fail. Restore the cluster.ps registration wait the previous harness had, and ignore the pytest cache directory the suite creates. * test: wait for master registration across OSS and enterprise Use the exact engine registration event after AddClusterNode completes. The current enterprise cluster.ps does not list vector nodes, so waiting on its output prevents the shared fixture from starting there. * s3vectors: keep contextWithIdentity as a shim alongside identityOf In-flight callers still write the caller name through it; route the write through SetIdentityNameInContext so both helpers agree on the shared key whichever lands first.
43 lines
1.2 KiB
Makefile
43 lines
1.2 KiB
Makefile
WEED := ./weed
|
|
VEC := ./weed-vector
|
|
WORKER_MANIFEST := ../../rust/sw-vector-distributed/Cargo.toml
|
|
ifneq ($(wildcard $(WORKER_MANIFEST)),)
|
|
WORKER := ./weed-vector-worker
|
|
endif
|
|
VOLUME := ./weed-volume
|
|
CARGO_PROFILE ?= release
|
|
CARGO_TARGET_DIR ?= $(abspath ../../seaweed-vector/target)
|
|
CARGO_OUTPUT := $(CARGO_TARGET_DIR)/$(if $(filter dev,$(CARGO_PROFILE)),debug,$(CARGO_PROFILE))
|
|
export CARGO_TARGET_DIR
|
|
|
|
.PHONY: all test build clean FORCE
|
|
|
|
all: test
|
|
|
|
$(WEED): FORCE
|
|
go build -o $(WEED) ../../weed
|
|
|
|
$(VEC): FORCE
|
|
cargo build --locked --profile $(CARGO_PROFILE) --manifest-path ../../seaweed-vector/Cargo.toml -p weed-vector-server
|
|
cp $(CARGO_OUTPUT)/weed-vector $(VEC)
|
|
|
|
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
|
|
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)
|
|
|
|
test: build
|
|
./run_test.sh
|
|
|
|
clean:
|
|
rm -f $(WEED) $(VEC) ./weed-vector-worker $(VOLUME)
|