Skip to content

Commit 255d473

Browse files
committed
Revert "feat: Add taskbroker + worker + scheduler (#3738)"
This reverts commit c8ee02d.
1 parent 66c057b commit 255d473

File tree

4 files changed

+1
-25
lines changed

4 files changed

+1
-25
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ SENTRY_IMAGE=getsentry/sentry:nightly
1313
SNUBA_IMAGE=getsentry/snuba:nightly
1414
RELAY_IMAGE=getsentry/relay:nightly
1515
SYMBOLICATOR_IMAGE=getsentry/symbolicator:nightly
16-
TASKBROKER_IMAGE=getsentry/taskbroker:nightly
1716
VROOM_IMAGE=getsentry/vroom:nightly
1817
HEALTHCHECK_INTERVAL=30s
1918
HEALTHCHECK_TIMEOUT=1m30s

.github/ISSUE_TEMPLATE/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ body:
1515
- [ ] [`snuba`](https://github.com/getsentry/snuba/actions/workflows/release.yml)
1616
- [ ] [`symbolicator`](https://github.com/getsentry/symbolicator/actions/workflows/release.yml)
1717
- [ ] [`vroom`](https://github.com/getsentry/vroom/actions/workflows/release.yaml)
18-
- [ ] [`taskbroker`](https://github.com/getsentry/taskbroker/actions/workflows/release.yml)
1918
- [ ] Release self-hosted.
2019
- [ ] [Prepare the `self-hosted` release](https://github.com/getsentry/self-hosted/actions/workflows/release.yml) (_replace with publish issue repo link_).
2120
- [ ] Check to make sure the new release branch in self-hosted includes the appropriate CalVer images.

docker-compose.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -487,24 +487,6 @@ services:
487487
<<: *depends_on-healthy
488488
web:
489489
<<: *depends_on-healthy
490-
taskbroker:
491-
<<: *restart_policy
492-
image: "$TASKBROKER_IMAGE"
493-
environment:
494-
TASKBROKER_KAFKA_CLUSTER: "kafka:9092"
495-
TASKBROKER_KAFKA_DEADLETTER_CLUSTER: "kafka:9092"
496-
TASKBROKER_DB_PATH: "/opt/sqlite/taskbroker-activations.sqlite"
497-
volumes:
498-
- sentry-taskbroker:/opt/sqlite
499-
depends_on:
500-
kafka:
501-
<<: *depends_on-healthy
502-
taskscheduler:
503-
<<: *sentry_defaults
504-
command: run taskworker-scheduler
505-
taskworker:
506-
<<: *sentry_defaults
507-
command: run taskworker --concurrency=4 --rpc-host=taskbroker:50051 --num-brokers=1
508490
vroom:
509491
<<: *restart_policy
510492
image: "$VROOM_IMAGE"
@@ -559,10 +541,6 @@ volumes:
559541
# Not being external will still persist data across restarts.
560542
# It won't persist if someone does a docker compose down -v.
561543
sentry-vroom:
562-
# This volume stores task data that is inflight
563-
# It should persist across restarts. If this volume is
564-
# deleted, up to ~2048 tasks will be lost.
565-
sentry-taskbroker:
566544
# These store ephemeral data that needn't persist across restarts.
567545
# That said, volumes will be persisted across restarts until they are deleted.
568546
sentry-secrets:

scripts/bump-version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44
OLD_VERSION="$1"
55
NEW_VERSION="$2"
66

7-
sed -i -e "s/^\(SENTRY\|SNUBA\|RELAY\|SYMBOLICATOR\|TASKBROKER\|VROOM\)_IMAGE=\([^:]\+\):.\+\$/\1_IMAGE=\2:$NEW_VERSION/" .env
7+
sed -i -e "s/^\(SENTRY\|SNUBA\|RELAY\|SYMBOLICATOR\|VROOM\)_IMAGE=\([^:]\+\):.\+\$/\1_IMAGE=\2:$NEW_VERSION/" .env
88
sed -i -e "s/^\# Self-Hosted Sentry .*/# Self-Hosted Sentry $NEW_VERSION/" README.md
99

1010
[ -z "$OLD_VERSION" ] || echo "Previous version: $OLD_VERSION"

0 commit comments

Comments
 (0)