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

Fix queue populator shared metrics #2612

Open
wants to merge 3 commits into
base: development/9.0
Choose a base branch
from

Conversation

Kerkesni
Copy link
Contributor

  • Queue Populator can be used for a single or multiple extensions at once. Currently the 'origin' label in the metrics is always set to "replication" which is not always true, we change this to make it hold the list of loaded extensions in the current queue populator instance.
  • Some queue populator metrics are shared between all extensions and not specific to replication. We change their prefix to s3_backbeat_populator instead of s3_replication

Issue: BB-527

@bert-e
Copy link
Contributor

bert-e commented Jan 16, 2025

Hello kerkesni,

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.

@Kerkesni Kerkesni changed the title Fix queue populatr metrics Fix queue populator shared metrics Jan 16, 2025
@scality scality deleted a comment from bert-e Jan 16, 2025
@bert-e
Copy link
Contributor

bert-e commented Jan 16, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Copy link

codecov bot commented Jan 16, 2025

Codecov Report

Attention: Patch coverage is 88.88889% with 1 line in your changes missing coverage. Please review.

Project coverage is 71.39%. Comparing base (287b942) to head (b2eeb64).

Files with missing lines Patch % Lines
lib/queuePopulator/QueuePopulator.js 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

Files with missing lines Coverage Δ
lib/queuePopulator/BucketFileLogReader.js 60.00% <100.00%> (+38.94%) ⬆️
lib/queuePopulator/KafkaLogReader.js 64.70% <100.00%> (+45.95%) ⬆️
lib/queuePopulator/MongoLogReader.js 64.70% <100.00%> (+39.70%) ⬆️
lib/queuePopulator/RaftLogReader.js 88.88% <100.00%> (+59.47%) ⬆️
lib/queuePopulator/QueuePopulator.js 35.11% <0.00%> (-0.45%) ⬇️

... and 2 files with indirect coverage changes

Components Coverage Δ
Bucket Notification 75.37% <ø> (ø)
Core Library 76.41% <88.88%> (+0.66%) ⬆️
Ingestion 69.24% <ø> (ø)
Lifecycle 76.14% <ø> (ø)
Oplog Populator 85.06% <ø> (ø)
Replication 57.79% <ø> (ø)
Bucket Scanner 85.60% <ø> (ø)
@@                 Coverage Diff                 @@
##           development/9.0    #2612      +/-   ##
===================================================
+ Coverage            71.11%   71.39%   +0.27%     
===================================================
  Files                  201      201              
  Lines                13334    13338       +4     
===================================================
+ Hits                  9483     9522      +39     
+ Misses                3841     3806      -35     
  Partials                10       10              
Flag Coverage Δ
api:retry 9.52% <0.00%> (-0.01%) ⬇️
api:routes 9.33% <0.00%> (-0.01%) ⬇️
bucket-scanner 85.60% <ø> (ø)
ingestion 12.28% <0.00%> (-0.01%) ⬇️
lib 7.36% <0.00%> (-0.01%) ⬇️
lifecycle 18.81% <0.00%> (-0.01%) ⬇️
notification 1.07% <0.00%> (-0.01%) ⬇️
replication 18.62% <0.00%> (+0.03%) ⬆️
unit 48.38% <88.88%> (+0.23%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Some queue populator metrics are shared between all extensions and not
specific to replication.

Issue: BB-527
Queue Populator can be used for a single or multiple
extensions at once. Currently the 'origin' label in the
metrics is always set to "replication" which is not always
true,  we change this to make it hold the list of loaded
extensions in the current queue populator instance.

Issue: BB-527
oras was removed from from Ubuntu 24.04 GitHub runner images

Issue: BB-527
@@ -27,6 +27,13 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ github.token }}

- name: Install Oras
Copy link
Contributor

Choose a reason for hiding this comment

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

not needed, please rebase...

@@ -45,6 +46,7 @@ class BucketFileLogReader extends LogReader {

getMetricLabels() {
return {
origin: this._extensionNames,
Copy link
Contributor

Choose a reason for hiding this comment

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

should we not "join" the strings in the array? (here or maybe better in the constructor)

this._extensionNames.join(',')

Copy link
Contributor

@francoisferrand francoisferrand left a comment

Choose a reason for hiding this comment

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

it would be nice to document somewhere what "origin" really is : i.e. not the pod/process which generated the metric, but the kind of workflow/process from which the 'processing' was triggered... (i.e. so that we have replication count either from "replication" rules and "transition")

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.

3 participants