beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Setup embedded DNS server correctly on container restart

Browse source 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
This commit is contained in:
Santhosh Manohar 2016-01-14 09:56:32 -08:00
parent aea47afd59
commit 05bd52dbb6
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libnetwork/resolver.go
View file

@ -15,7 +15,8 @@ import (
type Resolver interface {
// Start starts the name server for the container
Start() error
// Stop stops the name server for the container
// Stop stops the name server for the container. Stopped resolver
// can be reused after running the SetupFunc again.
Stop()
// SetupFunc() provides the setup function that should be run
// in the container's network namespace.
@ -102,6 +103,8 @@ func (r *resolver) Stop() {
if r.server != nil {
r.server.Shutdown()
}
r.conn = nil
r.err = fmt.Errorf("setup not done yet")
}
func (r *resolver) SetExtServers(dns []string) {

18
libnetwork/sandbox.go
View file

@ -488,23 +488,22 @@ func (sb *sandbox) resolveName(req string, networkName string, epList []*endpoin
}
func (sb *sandbox) SetKey(basePath string) error {
var err error
if basePath == "" {
return types.BadRequestErrorf("invalid sandbox key")
}
sb.Lock()
osSbox := sb.osSbox
oldosSbox := sb.osSbox
sb.Unlock()
if osSbox != nil {
if oldosSbox != nil {
// If we already have an OS sandbox, release the network resources from that
// and destroy the OS snab. We are moving into a new home further down. Note that none
// of the network resources gets destroyed during the move.
sb.releaseOSSbox()
}
osSbox, err = osl.GetSandboxForExternalKey(basePath, sb.Key())
osSbox, err := osl.GetSandboxForExternalKey(basePath, sb.Key())
if err != nil {
return err
}
@ -520,6 +519,17 @@ func (sb *sandbox) SetKey(basePath string) error {
}
}()
// If the resolver was setup before stop it and set it up in the
// new osl sandbox.
if oldosSbox != nil && sb.resolver != nil {
sb.resolver.Stop()
sb.osSbox.InvokeFunc(sb.resolver.SetupFunc())
if err := sb.resolver.Start(); err != nil {
log.Errorf("Resolver Setup/Start failed for container %s, %q", sb.ContainerID(), err)
}
}
for _, ep := range sb.getConnectedEndpoints() {
if err = sb.populateNetworkResources(ep); err != nil {
return err