Skip to content

Comments

Bump v2.19.2#50

Merged
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
pgier:bump-v2.19.2
Jun 30, 2020
Merged

Bump v2.19.2#50
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
pgier:bump-v2.19.2

Conversation

@pgier
Copy link

@pgier pgier commented Jun 29, 2020

Merge v2.19.2

Julien Pivotto and others added 4 commits June 19, 2020 12:37
…theus#7419)

Sections with three backticks require a blank line before them.

Signed-off-by: Alex Vandiver <alex@chmrr.net>

Co-authored-by: Alex Vandiver <github@chmrr.net>
Right now Queue Manager metrics are registered when the metrics struct
is created, which happens before a changed queue is shutdown and the old
metrics are unregistered. In the case of named queues or updates to
external labels the apply config will panic due to duplicate metrics.

Instead, register the metrics as part of starting the queue as we always
guarantee that Stop will be called before a new Start.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2020
@simonpasquier
Copy link

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pgier, simonpasquier

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [pgier,simonpasquier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 30, 2020
@openshift-merge-robot openshift-merge-robot merged commit 6676e94 into openshift:master Jun 30, 2020
openshift-merge-bot bot pushed a commit that referenced this pull request Oct 9, 2025
When doing a config reload that need to stop some providers while also sending SIGTERM to Prometheus at the same time can sometimes hang

1: sync.WaitGroup.Wait [83 minutes] [Created by run.(*Group).Run in goroutine 1 @ group.go:37]
    sync         sema.go:110              runtime_SemacquireWaitGroup(*uint32(#166))
    sync         waitgroup.go:118         (*WaitGroup).Wait(*WaitGroup(#23))
    discovery    manager.go:276           (*Manager).ApplyConfig(#23, #167)
    main         main.go:964              main.func5(#120)
    main         main.go:1505             reloadConfig({#183, 0x1b}, 1, #40, #43, #50, {#31, 0xa, 0})
    main         main.go:1182             main.func22()
    run          group.go:38              (*Group).Run.func1(*Group(#26), #51)

Add a test for it.

Signed-off-by: Lukasz Mierzwa <l.mierzwa@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants