Skip to content

Comments

Reload certificates from disk automatically + bump to v2.7.2#26

Merged
openshift-merge-robot merged 3 commits intoopenshift:masterfrom
simonpasquier:bump-prometheus-common
Mar 13, 2019
Merged

Reload certificates from disk automatically + bump to v2.7.2#26
openshift-merge-robot merged 3 commits intoopenshift:masterfrom
simonpasquier:bump-prometheus-common

Conversation

@simonpasquier
Copy link

Branch comparison between the upstream v2.7.2 tag and this PR:

prometheus/prometheus@v2.7.2...simonpasquier:bump-prometheus-common

This includes prometheus/common#173 which makes sure that Prometheus reloads certificate files from disk automatically whenever they are rotated.

beorn7 and others added 3 commits March 12, 2019 13:09
It should be a unix timestamp, not the seconds in the minute.

Signed-off-by: beorn7 <beorn@soundcloud.com>

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Goutham Veeramachaneni <gouthamve@gmail.com>

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This change bumps github.com/prometheus/common to include the necessary
bits.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 12, 2019
@simonpasquier simonpasquier requested a review from pgier March 12, 2019 12:15
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 12, 2019
@simonpasquier
Copy link
Author

cc @brancz

Copy link

@pgier pgier left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2019
@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-merge-robot openshift-merge-robot merged commit 9966508 into openshift:master Mar 13, 2019
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/prometheus that referenced this pull request Jan 9, 2025
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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants