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

Avoid duplicate countitems metrics #324

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Conversation

francoisferrand
Copy link
Contributor

Metrics from both workers & managers are instantiated in both kind of
processes, leading to duplicates when merging (naively) the metrics.

Improving merge is not trivial, for now we simply are more careful about
instantiating the metrics: bucketProcessingDuration and
consolidationDuration are only instantiated on master process. Since
they have labels, bucketsCount and objectsCount are not affected, so
we can keep them as is for now (since they are used directly from
S3UtilsMongoClient, and would need a significant refactor to make it
work both in prod and tests).

Issue: S3UTILS-175

Metrics from both workers & managers are instantiated in both kind of
processes, leading to duplicates when merging (naively) the metrics.

Improving merge is not trivial, for now we simply are more careful about
instantiating the metrics: `bucketProcessingDuration` and
`consolidationDuration` are only instantiated on master process. Since
they have labels, `bucketsCount` and `objectsCount` are not affected, so
we can keep them as is for now (since they are used directly from
S3UtilsMongoClient, and would need a significant refactor to make it
work both in prod and tests).

Issue: S3UTILS-175
@bert-e
Copy link
Contributor

bert-e commented Aug 12, 2024

Hello francoisferrand,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@scality scality deleted a comment from bert-e Aug 12, 2024
@bert-e
Copy link
Contributor

bert-e commented Aug 12, 2024

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@francoisferrand
Copy link
Contributor Author

/approve

@scality scality deleted a comment from bert-e Aug 12, 2024
@bert-e
Copy link
Contributor

bert-e commented Aug 12, 2024

Build failed

The build for commit did not succeed in branch w/1.15/bugfix/S3UTILS-175.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 12, 2024

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/1.14

  • ✔️ development/1.15

The following branches have NOT changed:

  • development/1.13
  • development/1.4

Please check the status of the associated issue S3UTILS-175.

Goodbye francoisferrand.

The following options are set: approve

@bert-e bert-e merged commit c680ebf into development/1.14 Aug 12, 2024
11 checks passed
@bert-e bert-e deleted the bugfix/S3UTILS-175 branch August 12, 2024 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants