Browse code

daemon: translateContainerdStartErr(): remove unused cmd argument

This argument was no longer used since commit 225e046d9d1bdf0f06f4c97bef239b5909463885

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2022/02/16 23:04:09
Showing 4 changed files
... ...
@@ -132,7 +132,7 @@ func (e startInvalidConfigError) Error() string {
132 132
 
133 133
 func (e startInvalidConfigError) InvalidParameter() {} // Is this right???
134 134
 
135
-func translateContainerdStartErr(cmd string, setExitCode func(int), err error) error {
135
+func translateContainerdStartErr(setExitCode func(int), err error) error {
136 136
 	errDesc := status.Convert(err).Message()
137 137
 	contains := func(s1, s2 string) bool {
138 138
 		return strings.Contains(strings.ToLower(s1), s2)
... ...
@@ -288,7 +288,7 @@ func (daemon *Daemon) ContainerExecStart(ctx context.Context, name string, optio
288 288
 	close(ec.Started)
289 289
 	if err != nil {
290 290
 		defer ec.Unlock()
291
-		return translateContainerdStartErr(ec.Entrypoint, ec.SetExitCode, err)
291
+		return translateContainerdStartErr(ec.SetExitCode, err)
292 292
 	}
293 293
 	ec.Unlock()
294 294
 
... ...
@@ -179,7 +179,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C
179 179
 
180 180
 	ctr, err := libcontainerd.ReplaceContainer(ctx, daemon.containerd, container.ID, spec, shim, createOptions)
181 181
 	if err != nil {
182
-		return translateContainerdStartErr(container.Path, container.SetExitCode, err)
182
+		return translateContainerdStartErr(container.SetExitCode, err)
183 183
 	}
184 184
 
185 185
 	// TODO(mlaventure): we need to specify checkpoint options here
... ...
@@ -191,7 +191,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, container *container.C
191 191
 			logrus.WithError(err).WithField("container", container.ID).
192 192
 				Error("failed to delete failed start container")
193 193
 		}
194
-		return translateContainerdStartErr(container.Path, container.SetExitCode, err)
194
+		return translateContainerdStartErr(container.SetExitCode, err)
195 195
 	}
196 196
 
197 197
 	container.HasBeenManuallyRestarted = false
... ...
@@ -17,7 +17,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
17 17
 
18 18
 	rt, err := daemon.getRuntime(container.HostConfig.Runtime)
19 19
 	if err != nil {
20
-		return "", nil, translateContainerdStartErr(container.Path, container.SetExitCode, err)
20
+		return "", nil, translateContainerdStartErr(container.SetExitCode, err)
21 21
 	}
22 22
 
23 23
 	return rt.Shim.Binary, rt.Shim.Opts, nil