feat(runway): add orchestrator consuming merge-conflict-check and merge queues#265
Open
behinddwalls wants to merge 1 commit into
Open
feat(runway): add orchestrator consuming merge-conflict-check and merge queues#265behinddwalls wants to merge 1 commit into
behinddwalls wants to merge 1 commit into
Conversation
…ge queues ## Summary ### Why? The Runway merge-queue contract (`api/runway/messagequeue`) and SubmitQueue's client side of it already exist on main: SubmitQueue publishes `MergeRequest`s to the `merge-conflict-check` and `merge` queues and consumes the `-signal` results. The service that actually consumes those request queues — Runway itself — was missing. This adds it. ### What? A new `runway` domain with an orchestrator that consumes Runway's two request queues. The controllers reuse the existing `runwaymq.MergeRequest` contract and topic keys rather than introducing a new entity: - `runway/orchestrator/controller/mergeconflictcheck` — subscribes to `merge-conflict-check` (dry-run check). - `runway/orchestrator/controller/merge` — subscribes to `merge` (committing merge). Both currently deserialize the `MergeRequest` off the queue and log it; performing the merge and publishing a `MergeResult` to the corresponding signal queue is left as a marked TODO (no signal handling yet). Supporting pieces: - `api/runway/orchestrator` — `RunwayOrchestrator` Ping proto (registered in `tool/proto` + `Makefile` `PROTO_PACKAGES`) and a `PingController`, for parity with the submitqueue/stovepipe orchestrators. - `example/runway/orchestrator/server` — runnable consumer (MySQL queue, topic registry with both queues as consuming subscriptions, single primary consumer, gRPC Ping on `:8086`) plus `Dockerfile`, `docker-compose.yml`, and a gRPC ping client. - `Makefile` targets (`build-runway-orchestrator-linux`, `local-runway-orchestrator-start`/`-stop`, `local-init-runway-queue-schema`, `run-client-runway-orchestrator`) and root `BUILD.bazel` `gazelle:resolve` directives for the new `protopb` packages. ## Test Plan - ✅ `make build` (249 targets) - ✅ `make test` (62 tests) - ✅ `make lint` - ✅ `make check-gazelle` - ✅ `make check-tidy` Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Why?
The Runway merge-queue contract (
api/runway/messagequeue) and SubmitQueue's client side of it already exist on main: SubmitQueue publishesMergeRequests to themerge-conflict-checkandmergequeues and consumes the-signalresults. The service that actually consumes those request queues — Runway itself — was missing. This adds it.What?
A new
runwaydomain with an orchestrator that consumes Runway's two request queues. The controllers reuse the existingrunwaymq.MergeRequestcontract and topic keys rather than introducing a new entity:runway/orchestrator/controller/mergeconflictcheck— subscribes tomerge-conflict-check(dry-run check).runway/orchestrator/controller/merge— subscribes tomerge(committing merge).Both currently deserialize the
MergeRequestoff the queue and log it; performing the merge and publishing aMergeResultto the corresponding signal queue is left as a marked TODO (no signal handling yet).Supporting pieces:
api/runway/orchestrator—RunwayOrchestratorPing proto (registered intool/proto+MakefilePROTO_PACKAGES) and aPingController, for parity with the submitqueue/stovepipe orchestrators.example/runway/orchestrator/server— runnable consumer (MySQL queue, topic registry with both queues as consuming subscriptions, single primary consumer, gRPC Ping on:8086) plusDockerfile,docker-compose.yml, and a gRPC ping client.Makefiletargets (build-runway-orchestrator-linux,local-runway-orchestrator-start/-stop,local-init-runway-queue-schema,run-client-runway-orchestrator) and rootBUILD.bazelgazelle:resolvedirectives for the newprotopbpackages.Test Plan
make build(249 targets)make test(62 tests)make lintmake check-gazellemake check-tidyCo-authored-by: Cursor cursoragent@cursor.com