From 64288feac97bd7c4d4a25905df8039be6e4f1d33 Mon Sep 17 00:00:00 2001 From: Lyn Date: Tue, 28 Feb 2023 16:49:53 -0800 Subject: [PATCH 1/2] fix(query-subscriptions-consumer): Accidentally changed the default/help text on the wrong consumer Reverting the parts of the query subscriptions consumer that were changed in https://github.com/getsentry/sentry/pull/45182 This was supposed to apply to the post process forwarder instead. --- src/sentry/runner/commands/run.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sentry/runner/commands/run.py b/src/sentry/runner/commands/run.py index 96a193e37b2e8c..548e932f338315 100644 --- a/src/sentry/runner/commands/run.py +++ b/src/sentry/runner/commands/run.py @@ -344,13 +344,13 @@ def cron(**options): "--commit-batch-size", default=1000, type=int, - help="How many messages to process (may or may not result in an enqueued task) before committing offsets.", + help="Deprecated. Remove once no longer passed in production.", ) @click.option( "--commit-batch-timeout-ms", default=5000, type=int, - help="Time (in milliseconds) to wait before closing current batch and committing offsets.", + help="Deprecated. Remove once no longer passed in production.", ) @click.option( "--concurrency", @@ -405,9 +405,9 @@ def post_process_forwarder(**options): @click.option("--topic", default=None, help="Topic to get subscription updates from.") @click.option( "--commit-batch-size", - default=1000, + default=100, type=int, - help="Deprecated. Remove once no longer passed in production.", + help="How many messages to process before committing offsets.", ) @click.option( "--commit-batch-timeout-ms", From 4e0e0363f3f280c29c3b26a43519ef1de1349792 Mon Sep 17 00:00:00 2001 From: Lyn Date: Tue, 28 Feb 2023 16:53:06 -0800 Subject: [PATCH 2/2] revert help text --- src/sentry/runner/commands/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/runner/commands/run.py b/src/sentry/runner/commands/run.py index 548e932f338315..5a4a73fa25c710 100644 --- a/src/sentry/runner/commands/run.py +++ b/src/sentry/runner/commands/run.py @@ -413,7 +413,7 @@ def post_process_forwarder(**options): "--commit-batch-timeout-ms", default=5000, type=int, - help="Deprecated. Remove once no longer passed in production.", + help="Time (in milliseconds) to wait before closing current batch and committing offsets.", ) @click.option( "--initial-offset-reset",