Skip to content

Conversation

@bnoon
Copy link

@bnoon bnoon commented Feb 2, 2017

Send the haproxy container a HUP instead of restarting it.

Send the haproxy container a HUP instead of restarting it.
rebuild.sh Outdated
@@ -0,0 +1,6 @@
#!/bin/bash
Copy link
Owner

Choose a reason for hiding this comment

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

This is not needed.

Copy link
Author

Choose a reason for hiding this comment

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

Sorry, didn't mean to commit that file.

if err := p.client.ContainerKill(context.Background(), cnt.ID, "HUP"); err != nil {
log().Errorf("error reloading container: id=%s err=%s", cnt.ID[:12], err)
continue
}
Copy link
Owner

Choose a reason for hiding this comment

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

Are you sure this catches all cases? A default with log probably wouldn't hurt.

Copy link
Author

Choose a reason for hiding this comment

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

I will add it and update the PR.

// update the proxy container status
cInfo, err := p.client.ContainerInspect(context.Background(), cnt.ID)
if err != nil {
log().Errorf("unable to inspect proxy container: %s", err)
Copy link
Owner

Choose a reason for hiding this comment

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

This will fall through without a continue.

Copy link
Author

Choose a reason for hiding this comment

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

The continue is there.

Copy link
Owner

Choose a reason for hiding this comment

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

Ah I didn't see it from the diff. 👍

}
case "running":
log().Debugf("reloading proxy container: id=%s", cnt.ID)
if err := p.client.ContainerKill(context.Background(), cnt.ID, "HUP"); err != nil {
Copy link
Owner

Choose a reason for hiding this comment

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

Are you sure HAProxy handles this properly? I believe we've tried HUP before and found that it didn't always reload the config.

Copy link
Owner

Choose a reason for hiding this comment

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

That being said, if we can test it I would love to get rid of the TCP hacks. :)

Copy link
Author

Choose a reason for hiding this comment

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

Pretty sure it is stable in v1.7.x. I have been using it (outside of interlock) for a while.

log().Infof("restarted proxy container: id=%s name=%s", cnt.ID[:12], cnt.Names[0])
}

if err := p.resumeSYN(); err != nil {
Copy link
Owner

Choose a reason for hiding this comment

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

This is needed to safely reload (see above comment).

ehazlett added a commit that referenced this pull request Aug 16, 2019
test/integration: Remove test.hosts fixture
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants