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

Merge pull request #27259 from LK4D4/no_map_pointers

Browse source 
daemon: do not use pointers to map
This commit is contained in:
Tõnis Tiigi 2016-10-10 13:15:03 -07:00 committed by GitHub
commit 2945f902bd
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
daemon/daemon.go
View file

@ -968,25 +968,23 @@ func (daemon *Daemon) initDiscovery(config *Config) error {
// - Daemon max concurrent uploads
// - Cluster discovery (reconfigure and restart).
// - Daemon live restore
func (daemon *Daemon) Reload(config *Config) error {
var err error
// used to hold reloaded changes
attributes := map[string]string{}
func (daemon *Daemon) Reload(config *Config) (err error) {
daemon.configStore.reloadLock.Lock()
attributes := daemon.platformReload(config)
// We need defer here to ensure the lock is released as
// daemon.SystemInfo() will try to get it too
defer func() {
// we're unlocking here, because
// LogDaemonEventWithAttributes() -> SystemInfo() -> GetAllRuntimes()
// holds that lock too.
daemon.configStore.reloadLock.Unlock()
if err == nil {
daemon.LogDaemonEventWithAttributes("reload", attributes)
}
}()
daemon.configStore.reloadLock.Lock()
defer daemon.configStore.reloadLock.Unlock()
daemon.platformReload(config, &attributes)
if err = daemon.reloadClusterDiscovery(config); err != nil {
if err := daemon.reloadClusterDiscovery(config); err != nil {
return err
}

3
daemon/daemon_solaris.go
View file

@ -78,7 +78,8 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
}
// platformReload update configuration with platform specific options
func (daemon *Daemon) platformReload(config *Config, attributes *map[string]string) {
func (daemon *Daemon) platformReload(config *Config) map[string]string {
return map[string]string{}
}
// verifyDaemonSettings performs validation of daemon config struct

8
daemon/daemon_unix.go
View file

@ -516,7 +516,7 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
}
// platformReload update configuration with platform specific options
func (daemon *Daemon) platformReload(config *Config, attributes *map[string]string) {
func (daemon *Daemon) platformReload(config *Config) map[string]string {
if config.IsValueSet("runtimes") {
daemon.configStore.Runtimes = config.Runtimes
// Always set the default one
@ -536,8 +536,10 @@ func (daemon *Daemon) platformReload(config *Config, attributes *map[string]stri
runtimeList.WriteString(fmt.Sprintf("%s:%s", name, rt))
}
(*attributes)["runtimes"] = runtimeList.String()
(*attributes)["default-runtime"] = daemon.configStore.DefaultRuntime
return map[string]string{
"runtimes": runtimeList.String(),
"default-runtime": daemon.configStore.DefaultRuntime,
}
}
// verifyDaemonSettings performs validation of daemon config struct

3
daemon/daemon_windows.go
View file

@ -153,7 +153,8 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
}
// platformReload update configuration with platform specific options
func (daemon *Daemon) platformReload(config *Config, attributes *map[string]string) {
func (daemon *Daemon) platformReload(config *Config) map[string]string {
return map[string]string{}
}
// verifyDaemonSettings performs validation of daemon config struct