diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2025-03-09 23:49:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-09 23:49:42 -0700 |
| commit | 02773a61074d1a130419318d05d4d0b027cac4b4 (patch) | |
| tree | 590918137bc7edfd23653e377249c45145ec7e54 /docker | |
| parent | 14cb8a24c68ce3fd0d3df716295805a8c5c1b8ef (diff) | |
| download | seaweedfs-02773a61074d1a130419318d05d4d0b027cac4b4.tar.xz seaweedfs-02773a61074d1a130419318d05d4d0b027cac4b4.zip | |
Accumulated changes for message queue (#6600)
* rename
* set agent address
* refactor
* add agent sub
* pub messages
* grpc new client
* can publish records via agent
* send init message with session id
* fmt
* check cancelled request while waiting
* use sessionId
* handle possible nil stream
* subscriber process messages
* separate debug port
* use atomic int64
* less logs
* minor
* skip io.EOF
* rename
* remove unused
* use saved offsets
* do not reuse session, since always session id is new after restart
remove last active ts from SessionEntry
* simplify printing
* purge unused
* just proxy the subscription, skipping the session step
* adjust offset types
* subscribe offset type and possible value
* start after the known tsns
* avoid wrongly set startPosition
* move
* remove
* refactor
* typo
* fix
* fix changed path
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Makefile | 9 | ||||
| -rwxr-xr-x | docker/agent_pub_record | bin | 0 -> 30207836 bytes | |||
| -rw-r--r-- | docker/compose/local-mq-test.yml | 11 |
3 files changed, 13 insertions, 7 deletions
diff --git a/docker/Makefile b/docker/Makefile index b4a61fb01..d4dd70b6b 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -9,10 +9,8 @@ binary: export SWCOMMIT=$(shell git rev-parse --short HEAD) export SWLDFLAGS="-X github.com/seaweedfs/seaweedfs/weed/util.COMMIT=$(SWCOMMIT)" cd ../weed && CGO_ENABLED=$(cgo) GOOS=linux go build $(options) -tags "$(tags)" -ldflags "-s -w -extldflags -static $(SWLDFLAGS)" && mv weed ../docker/ - cd ../weed/mq/client/cmd/weed_pub_kv && CGO_ENABLED=$(cgo) GOOS=linux go build && mv weed_pub_kv ../../../../../docker/ - cd ../weed/mq/client/cmd/weed_pub_record && CGO_ENABLED=$(cgo) GOOS=linux go build && mv weed_pub_record ../../../../../docker/ - cd ../weed/mq/client/cmd/weed_sub_kv && CGO_ENABLED=$(cgo) GOOS=linux go build && mv weed_sub_kv ../../../../../docker/ - cd ../weed/mq/client/cmd/weed_sub_record && CGO_ENABLED=$(cgo) GOOS=linux go build && mv weed_sub_record ../../../../../docker/ + cd ../other/mq_client_example/agent_pub_record && CGO_ENABLED=$(cgo) GOOS=linux go build && mv agent_pub_record ../../../docker/ + cd ../other/mq_client_example/agent_sub_record && CGO_ENABLED=$(cgo) GOOS=linux go build && mv agent_sub_record ../../../docker/ binary_race: options = -race binary_race: cgo = 1 @@ -97,6 +95,9 @@ s3tests: build s3tests_build brokers: build docker compose -f compose/local-brokers-compose.yml -p seaweedfs up +agent: build + docker compose -f compose/local-mq-test.yml -p seaweedfs up + filer_etcd: build docker stack deploy -c compose/swarm-etcd.yml fs diff --git a/docker/agent_pub_record b/docker/agent_pub_record Binary files differnew file mode 100755 index 000000000..03c1a7879 --- /dev/null +++ b/docker/agent_pub_record diff --git a/docker/compose/local-mq-test.yml b/docker/compose/local-mq-test.yml index d4b071039..fef68cac8 100644 --- a/docker/compose/local-mq-test.yml +++ b/docker/compose/local-mq-test.yml @@ -1,5 +1,3 @@ -version: '3.9' - services: server: image: chrislusf/seaweedfs:local @@ -19,9 +17,16 @@ services: depends_on: server: condition: service_healthy + mq_agent: + image: chrislusf/seaweedfs:local + ports: + - 16777:16777 + command: "mq.agent -broker=mq_broker:17777 -port=16777" + depends_on: + - mq_broker mq_client: image: chrislusf/seaweedfs:local # run a custom command instead of entrypoint command: "ls -al" depends_on: - - mq_broker + - mq_agent |