kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Add containerd.WithTimeout(60*time.Second) to match old calls

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2018-08-22 15:32:39 -07:00
parent 2e5222a346
commit 5accd82634
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
daemon/daemon.go
View file

@ -741,7 +741,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)), grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(defaults.DefaultMaxSendMsgSize)),
} }
if config.ContainerdAddr != "" { if config.ContainerdAddr != "" {
d.containerdCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(ContainersNamespace), containerd.WithDialOpts(gopts)) d.containerdCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(ContainersNamespace), containerd.WithDialOpts(gopts), containerd.WithTimeout(60*time.Second))
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to dial %q", config.ContainerdAddr) return nil, errors.Wrapf(err, "failed to dial %q", config.ContainerdAddr)
} }
@ -753,7 +753,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
// Windows is not currently using containerd, keep the // Windows is not currently using containerd, keep the
// client as nil // client as nil
if config.ContainerdAddr != "" { if config.ContainerdAddr != "" {
pluginCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(pluginexec.PluginNamespace), containerd.WithDialOpts(gopts)) pluginCli, err = containerd.New(config.ContainerdAddr, containerd.WithDefaultNamespace(pluginexec.PluginNamespace), containerd.WithDialOpts(gopts), containerd.WithTimeout(60*time.Second))
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "failed to dial %q", config.ContainerdAddr) return nil, errors.Wrapf(err, "failed to dial %q", config.ContainerdAddr)
} }

2
libcontainerd/supervisor/remote_daemon.go
View file

@ -268,7 +268,7 @@ func (r *remote) monitorDaemon(ctx context.Context) {
continue continue
} }
client, err = containerd.New(r.GRPC.Address) client, err = containerd.New(r.GRPC.Address, containerd.WithTimeout(60*time.Second))
if err != nil { if err != nil {
r.logger.WithError(err).Error("failed connecting to containerd") r.logger.WithError(err).Error("failed connecting to containerd")
delay = time.After(100 * time.Millisecond) delay = time.After(100 * time.Millisecond)