UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 08:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add --restart-mode to docker config CLI

Browse Source 
This change adds a --restart-mode option to the docker config CLI.
This mirrors the option added for containerd and allows 'none' to be
specified to disable the restart of docker. This is useful in
cases where the updated docker config should be reloaded out of
band.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2022-02-08 14:09:07 +01:00
parent a2060c74b3
commit d8ed16585a
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/container/docker/docker.go
View File

@ -32,6 +32,9 @@ import (
) )
const ( const (
restartModeSignal = "signal"
restartModeNone = "none"
nvidiaRuntimeName = "nvidia" nvidiaRuntimeName = "nvidia"
nvidiaRuntimeBinary = "nvidia-container-runtime" nvidiaRuntimeBinary = "nvidia-container-runtime"
nvidiaExperimentalRuntimeName = "nvidia-experimental" nvidiaExperimentalRuntimeName = "nvidia-experimental"
@ -42,6 +45,7 @@ const (
defaultSetAsDefault = true defaultSetAsDefault = true
// defaultRuntimeName specifies the NVIDIA runtime to be use as the default runtime if setting the default runtime is enabled // defaultRuntimeName specifies the NVIDIA runtime to be use as the default runtime if setting the default runtime is enabled
defaultRuntimeName = nvidiaRuntimeName defaultRuntimeName = nvidiaRuntimeName
defaultRestartMode = restartModeSignal
reloadBackoff = 5 * time.Second reloadBackoff = 5 * time.Second
maxReloadAttempts = 6 maxReloadAttempts = 6
@ -63,6 +67,7 @@ type options struct {
runtimeName string runtimeName string
setAsDefault bool setAsDefault bool
runtimeDir string runtimeDir string
restartMode string
} }
func main() { func main() {
@ -137,6 +142,13 @@ func main() {
EnvVars: []string{"DOCKER_SET_AS_DEFAULT"}, EnvVars: []string{"DOCKER_SET_AS_DEFAULT"},
Hidden: true, Hidden: true,
}, },
&cli.StringFlag{
Name: "restart-mode",
Usage: "Specify how docker should be restarted; If NONE is selected, docker will not be restarted [signal | none]",
Value: defaultRestartMode,
Destination: &options.restartMode,
EnvVars: []string{"DOCKER_RESTART_MODE"},
},
} }
// Update the subcommand flags with the common subcommand flags // Update the subcommand flags with the common subcommand flags
@ -175,9 +187,9 @@ func Setup(c *cli.Context, o *options) error {
return fmt.Errorf("unable to flush config: %v", err) return fmt.Errorf("unable to flush config: %v", err)
} }
err = SignalDocker(o.socket) err = RestartDocker(o)
if err != nil { if err != nil {
return fmt.Errorf("unable to signal docker: %v", err) return fmt.Errorf("unable to restart docker: %v", err)
} }
log.Infof("Completed 'setup' for %v", c.App.Name) log.Infof("Completed 'setup' for %v", c.App.Name)
@ -209,7 +221,7 @@ func Cleanup(c *cli.Context, o *options) error {
return fmt.Errorf("unable to flush config: %v", err) return fmt.Errorf("unable to flush config: %v", err)
} }
err = SignalDocker(o.socket) err = RestartDocker(o)
if err != nil { if err != nil {
return fmt.Errorf("unable to signal docker: %v", err) return fmt.Errorf("unable to signal docker: %v", err)
} }
@ -340,6 +352,23 @@ func FlushConfig(cfg map[string]interface{}, config string) error {
return nil return nil
} }
// RestartDocker restarts docker depending on the value of restartModeFlag
func RestartDocker(o *options) error {
switch o.restartMode {
case restartModeNone:
log.Warnf("Skipping sending signal to docker due to --restart-mode=%v", o.restartMode)
case restartModeSignal:
err := SignalDocker(o.socket)
if err != nil {
return fmt.Errorf("unable to signal docker: %v", err)
}
default:
return fmt.Errorf("invalid restart mode specified: %v", o.restartMode)
}
return nil
}
// SignalDocker sends a SIGHUP signal to docker daemon // SignalDocker sends a SIGHUP signal to docker daemon
func SignalDocker(socket string) error { func SignalDocker(socket string) error {
log.Infof("Sending SIGHUP signal to docker") log.Infof("Sending SIGHUP signal to docker")