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

Remove the node from dnsmasq config when shutting down #19987

Merged
merged 3 commits into from
Jun 14, 2018

Conversation

smarterclayton
Copy link
Contributor

@smarterclayton smarterclayton commented Jun 12, 2018

Prevents dnsmasq from pending a dead server when the network pod dies or is interrupted. Also prevents us serving DNS before our caches fill.

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

@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 12, 2018
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 12, 2018
@smarterclayton smarterclayton requested review from knobunc and removed request for liggitt and juanvallejo June 12, 2018 21:00
@smarterclayton
Copy link
Contributor Author

@liggitt

@smarterclayton
Copy link
Contributor Author

Well, at least I know I broke DNS.

@@ -115,14 +116,26 @@ var networkLong = templates.LongDesc(`

// NewCommandStartNetwork provides a CLI handler for 'start network' command
func NewCommandStartNetwork(basename string, out, errout io.Writer) (*cobra.Command, *NodeOptions) {
options := &NodeOptions{Output: out}
options := &NodeOptions{
ExpireDays: crypto.DefaultCertificateLifetimeInDays,
Copy link
Contributor

Choose a reason for hiding this comment

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

?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You can't start openshift start network anymore without args - someone broke it in a refactor at some point in the last month or so.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ugh :-(

interrupt.New(func(s os.Signal) {
close(ch)
fmt.Fprintf(errout, "interrupt: Gracefully shutting down ...\n")
time.Sleep(200 * time.Millisecond)
Copy link
Contributor

Choose a reason for hiding this comment

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

This is much better than 1 second?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

5 times better.

@smarterclayton
Copy link
Contributor Author

/test launch-gcp

Copy link
Contributor

@knobunc knobunc left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks Clayton. BTW the 5 times better comment made me laugh :-)

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2018
@smarterclayton smarterclayton removed the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2018
@smarterclayton
Copy link
Contributor Author

This is not ready to merge, there are failing tests.

@smarterclayton
Copy link
Contributor Author

/test launch-gcp

@smarterclayton
Copy link
Contributor Author

/test extended_conformance_install

@smarterclayton
Copy link
Contributor Author

/test unit

@smarterclayton
Copy link
Contributor Author

Ok, unit tests are fine. @liggitt I need to make sure I pick a port number that won't get used in the near future on the kubelet.

@smarterclayton
Copy link
Contributor Author

/retest

@liggitt liggitt added this to the v3.10 milestone Jun 14, 2018
@knobunc
Copy link
Contributor

knobunc commented Jun 14, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 14, 2018
Allow graceful shutdown of the DNS server so that we can remove
ourselves from dnsmasq.
This prevents dnsmasq from timing out trying to talk to us.
This was a regression from 3.9
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 14, 2018
@smarterclayton
Copy link
Contributor Author

@liggitt moved it to 11256 and added a comment

@smarterclayton
Copy link
Contributor Author

/retest

@smarterclayton
Copy link
Contributor Author

smarterclayton commented Jun 14, 2018 via email

@liggitt
Copy link
Contributor

liggitt commented Jun 14, 2018

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: knobunc, liggitt, 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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 42a5965 into openshift:master Jun 14, 2018
@sdodson
Copy link
Member

sdodson commented Jun 15, 2018

/cherrypick release-3.10

@openshift-cherrypick-robot

@sdodson: new pull request could not be created: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:release-3.10 and openshift-cherrypick-robot:cherry-pick-19987-to-release-3.10"}],"documentation_url":"https://developer.github.com/v3/pulls/#create-a-pull-request"}

In response to this:

/cherrypick release-3.10

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.

@sdodson
Copy link
Member

sdodson commented Jun 15, 2018

Nevermind, already on release-3.10, just waiting on an ocp build.

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

Successfully merging this pull request may close these issues.

8 participants