Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove multi-collection. #3481

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Remove multi-collection. #3481

merged 1 commit into from
Nov 14, 2024

Conversation

branlwyd
Copy link
Contributor

DAP-11 removed the ability to collect a batch more than once (with differing aggregation parameters). This commit also includes related changes to a few messages, and removes the max_batch_query_count task parameter.

@branlwyd branlwyd added the allow-changed-migrations Override the ci-migrations check to allow migrations that have changed. label Nov 13, 2024
@branlwyd branlwyd requested a review from a team as a code owner November 13, 2024 23:25
@branlwyd branlwyd force-pushed the bran/no-multi-collection branch from d3a0c10 to 3264784 Compare November 13, 2024 23:27
@branlwyd
Copy link
Contributor Author

Part of #3436.

@branlwyd branlwyd force-pushed the bran/no-multi-collection branch from 3264784 to 9591330 Compare November 13, 2024 23:34
@branlwyd
Copy link
Contributor Author

(apologies, a couple of force-pushes to clean up formatting & a few merge issues with the rebase onto the renaming PR)

DAP-11 removed the ability to collect a batch more than once (with
differing aggregation parameters). This commit also includes related
changes to a few messages, and removes the max_batch_query_count task
parameter.
@branlwyd branlwyd force-pushed the bran/no-multi-collection branch from 9591330 to cbef95e Compare November 13, 2024 23:41
Comment on lines -196 to -211

/// Batch identifier, encoded with base64url
#[clap(
long,
conflicts_with_all = ["batch_interval_start", "batch_interval_duration", "current_batch"],
help_heading = "Collect Request Parameters (Leader Selected)",
)]
batch_id: Option<BatchId>,
/// Have the aggregator select a batch that has not yet been collected
#[clap(
long,
action = ArgAction::SetTrue,
conflicts_with_all = ["batch_interval_start", "batch_interval_duration", "batch_id"],
help_heading = "Collect Request Parameters (Leader Selected)",
)]
current_batch: bool,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, so now without explicit --batch-interval-{start,duration}, we automatically assume we're operating on a fixed size task.

I suppose that's fine. Maybe we can think of a better way to clean up this CLI for this, but I don't think its important.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that's correct. I thought about this for a bit & came up with the same conclusion you did. We could introduce something like a --leader-selected flag to indicate a leader-selected query, but I'm not fully sure it's necessary.

@branlwyd branlwyd merged commit 111ee9c into main Nov 14, 2024
7 of 8 checks passed
@branlwyd branlwyd deleted the bran/no-multi-collection branch November 14, 2024 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
allow-changed-migrations Override the ci-migrations check to allow migrations that have changed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants