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

Restore graceful shutdown of DNS server #21009

Conversation

Miciah
Copy link
Contributor

@Miciah Miciah commented Sep 18, 2018

Restore signal handling and graceful shutdown of DNS that had been added in c802e22 but was subsequently lost during rebase in 564ee03.

Graceful shutdown is necessary to ensure that when OpenShift's DNS server shuts down, we remove it from the dnsmasq configuration.

This commit fixes bug 1624448.

https://bugzilla.redhat.com/show_bug.cgi?id=1624448

@knobunc @ironcladlou @sdodson @smarterclayton

Restore signal handling and graceful shutdown of DNS that had been added in
commit 564ee03 but was subsequently lost
during rebase in commit 564ee03.

Graceful shutdown is necessary to ensure that when OpenShift's DNS server
shuts down, we remove it from the dnsmasq configuration.

This commit fixes bug 1624448.

https://bugzilla.redhat.com/show_bug.cgi?id=1624448
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 18, 2018
@Miciah
Copy link
Contributor Author

Miciah commented Sep 18, 2018

/retest

Looks like a flake:

+ ssh -F /var/lib/jenkins/jobs/test_pull_request_origin_extended_conformance_install/workspace/.config/origin-ci-tool/inventory/.ssh_config openshiftdevel sudo chmod o+rw /etc/environment
++ export status=FAILURE
++ status=FAILURE
+ set +o xtrace
########## FINISHED STAGE: FAILURE: FORWARD PARAMETERS TO THE REMOTE HOST [00h 00m 00s] ##########

@Miciah
Copy link
Contributor Author

Miciah commented Sep 18, 2018

/retest

@smarterclayton
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 18, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah, smarterclayton

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 18, 2018
@smarterclayton
Copy link
Contributor

/cherrypick release-3.11

@openshift-cherrypick-robot

@smarterclayton: once the present PR merges, I will cherry-pick it on top of release-3.11 in a new PR and assign it to you.

In response to this:

/cherrypick release-3.11

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.

@openshift-merge-robot openshift-merge-robot merged commit 256f7ea into openshift:master Sep 18, 2018
@openshift-cherrypick-robot

@smarterclayton: #21009 failed to apply on top of branch "release-3.11":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	pkg/cmd/server/start/network/start_network.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cmd/server/start/start_network.go
CONFLICT (content): Merge conflict in pkg/cmd/server/start/start_network.go
Patch failed at 0001 Restore graceful shutdown of DNS server

In response to this:

/cherrypick release-3.11

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.

@Miciah
Copy link
Contributor Author

Miciah commented Sep 18, 2018

@smarterclayton, cherry picking failed because 2924ec1, which renames pkg/cmd/server/start/start_network.go to pkg/cmd/server/start/network/start_network.go, is in master but not in release-3.11. We don't want that commit in release-3.11, right?

@smarterclayton
Copy link
Contributor

smarterclayton commented Sep 18, 2018 via email

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants