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

LOG-1681: Delay refresh to allow startup to bind metrics listener #1134

Merged
merged 1 commit into from Aug 10, 2021

Conversation

jcantrill
Copy link
Contributor

Description

This PR delays in_tail file refresh watcher at startup to allow the metrics endpoint to bind and complete initialization.

cc @vimalk78 @syedriko

Links

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2021
Copy link
Contributor

@syedriko syedriko left a comment

Choose a reason for hiding this comment

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

/lgtm
The alignment is off on new lines in the _test.go files

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 9, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, syedriko

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@syedriko
Copy link
Contributor

/test e2e-gcp

@openshift-ci openshift-ci bot merged commit 9f7149e into openshift:master Aug 10, 2021
@jcantrill jcantrill deleted the log1681 branch August 10, 2021 12:46
@jcantrill
Copy link
Contributor Author

/cherrypick release-5.1

@openshift-cherrypick-robot

@jcantrill: #1134 failed to apply on top of branch "release-5.1":

Applying: LOG-1681: Delay refresh to allow startup to bind metrics listener
Using index info to reconstruct a base tree...
M	pkg/generators/forwarding/fluentd/fluent_conf_test.go
M	pkg/generators/forwarding/fluentd/output_conf_legacy_test.go
M	pkg/generators/forwarding/fluentd/source_test.go
M	pkg/generators/forwarding/fluentd/templates.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/generators/forwarding/fluentd/templates.go
Auto-merging pkg/generators/forwarding/fluentd/source_test.go
CONFLICT (content): Merge conflict in pkg/generators/forwarding/fluentd/source_test.go
Auto-merging pkg/generators/forwarding/fluentd/output_conf_legacy_test.go
Auto-merging pkg/generators/forwarding/fluentd/fluent_conf_test.go
CONFLICT (content): Merge conflict in pkg/generators/forwarding/fluentd/fluent_conf_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 LOG-1681: Delay refresh to allow startup to bind metrics listener
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-5.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

pmoogi-redhat pushed a commit to pmoogi-redhat/cluster-logging-operator that referenced this pull request Apr 26, 2022
LOG-1681: Delay refresh to allow startup to bind metrics listener
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.

None yet

3 participants