1. docker
  2. Commit 72b66d56a55927687734fae392f6e451cc7db8a2
Browse code

[20.10] vendor github.com/Microsoft/hcsshim 64a2b71405dacf76c95600f4c756a991ad09cf7c (moby branch)

Brings in microsoft/hcsshim#1065, which fixes #42610.

full diff: https://github.com/Microsoft/hcsshim/compare/89a9a3b524264d34985f1d48793ab2b2d2e430f6...64a2b71405dacf76c95600f4c756a991ad09cf7c

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

Sebastiaan van Stijn authored on 2021/07/10 03:06:40
Showing 3 changed files
vendor.conf
History View file @ 72b66d5
... ... 
@@ -1,5 +1,5 @@
1 1 
 github.com/Azure/go-ansiterm                        d6e3b3328b783f23731bc4d058875b0371ff8109
2 
-github.com/Microsoft/hcsshim                        89a9a3b524264d34985f1d48793ab2b2d2e430f6 # moby branch
2 
+github.com/Microsoft/hcsshim                        64a2b71405dacf76c95600f4c756a991ad09cf7c # moby branch
3 3 
 github.com/Microsoft/go-winio                       5b44b70ab3ab4d291a7c1d28afe7b4afeced0ed4 # v0.4.15
4 4 
 github.com/docker/libtrust                          9cbd2a1374f46905c68a4eb3694a130610adc62a
5 5 
 github.com/golang/gddo                              72a348e765d293ed6d1ded7b699591f14d6cd921
vendor/github.com/Microsoft/hcsshim/errors.go
History View file @ 72b66d5
... ... 
@@ -59,7 +59,7 @@ var (
59 59 
 	// ErrVmcomputeOperationInvalidState is an error encountered when the compute system is not in a valid state for the requested operation
60 60 
 	ErrVmcomputeOperationInvalidState = hcs.ErrVmcomputeOperationInvalidState
61 61
62 
-	// ErrProcNotFound is an error encountered when the the process cannot be found
62 
+	// ErrProcNotFound is an error encountered when a procedure look up fails.
63 63 
 	ErrProcNotFound = hcs.ErrProcNotFound
64 64
65 65 
 	// ErrVmcomputeOperationAccessIsDenied is an error which can be encountered when enumerating compute systems in RS1/RS2
... ... 
@@ -177,7 +177,7 @@ func makeProcessError(process *process, operation string, extraInfo string, err
177 177 
 // IsNotExist checks if an error is caused by the Container or Process not existing.
178 178 
 // Note: Currently, ErrElementNotFound can mean that a Process has either
179 179 
 // already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
180 
-// will currently return true when the error is ErrElementNotFound or ErrProcNotFound.
180 
+// will currently return true when the error is ErrElementNotFound.
181 181 
 func IsNotExist(err error) bool {
182 182 
 	if _, ok := err.(EndpointNotFoundError); ok {
183 183 
 		return true
... ... 
@@ -210,7 +210,7 @@ func IsTimeout(err error) bool {
210 210 
 // a Container or Process being already stopped.
211 211 
 // Note: Currently, ErrElementNotFound can mean that a Process has either
212 212 
 // already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
213 
-// will currently return true when the error is ErrElementNotFound or ErrProcNotFound.
213 
+// will currently return true when the error is ErrElementNotFound.
214 214 
 func IsAlreadyStopped(err error) bool {
215 215 
 	return hcs.IsAlreadyStopped(getInnerError(err))
216 216 
 }
vendor/github.com/Microsoft/hcsshim/internal/hcs/errors.go
History View file @ 72b66d5
... ... 
@@ -60,7 +60,7 @@ var (
60 60 
 	// ErrVmcomputeOperationInvalidState is an error encountered when the compute system is not in a valid state for the requested operation
61 61 
 	ErrVmcomputeOperationInvalidState = syscall.Errno(0xc0370105)
62 62
63 
-	// ErrProcNotFound is an error encountered when the the process cannot be found
63 
+	// ErrProcNotFound is an error encountered when a procedure look up fails.
64 64 
 	ErrProcNotFound = syscall.Errno(0x7f)
65 65
66 66 
 	// ErrVmcomputeOperationAccessIsDenied is an error which can be encountered when enumerating compute systems in RS1/RS2
... ... 
@@ -242,12 +242,11 @@ func makeProcessError(process *Process, op string, err error, events []ErrorEven
242 242 
 // IsNotExist checks if an error is caused by the Container or Process not existing.
243 243 
 // Note: Currently, ErrElementNotFound can mean that a Process has either
244 244 
 // already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
245 
-// will currently return true when the error is ErrElementNotFound or ErrProcNotFound.
245 
+// will currently return true when the error is ErrElementNotFound.
246 246 
 func IsNotExist(err error) bool {
247 247 
 	err = getInnerError(err)
248 248 
 	return err == ErrComputeSystemDoesNotExist ||
249 
-		err == ErrElementNotFound ||
250 
-		err == ErrProcNotFound
249 
+		err == ErrElementNotFound
251 250 
 }
252 251
253 252 
 // IsAlreadyClosed checks if an error is caused by the Container or Process having been
... ... 
@@ -278,12 +277,11 @@ func IsTimeout(err error) bool {
278 278 
 // a Container or Process being already stopped.
279 279 
 // Note: Currently, ErrElementNotFound can mean that a Process has either
280 280 
 // already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
281 
-// will currently return true when the error is ErrElementNotFound or ErrProcNotFound.
281 
+// will currently return true when the error is ErrElementNotFound.
282 282 
 func IsAlreadyStopped(err error) bool {
283 283 
 	err = getInnerError(err)
284 284 
 	return err == ErrVmcomputeAlreadyStopped ||
285 
-		err == ErrElementNotFound ||
286 
-		err == ErrProcNotFound
285 
+		err == ErrElementNotFound
287 286 
 }
288 287
289 288 
 // IsNotSupported returns a boolean indicating whether the error is caused by