Browse Source

Merge pull request #27311 from darrenstahlmsft/CloseStdinError

Windows: Stop returning errors that should be ignored while closing stdin
Victor Vieux 8 years ago
parent
commit
2ee6032c88
1 changed files with 2 additions and 5 deletions
  1. 2 5
      libcontainerd/process_windows.go

+ 2 - 5
libcontainerd/process_windows.go

@@ -38,17 +38,14 @@ func createStdInCloser(pipe io.WriteCloser, process hcsshim.Process) io.WriteClo
 			return err
 			return err
 		}
 		}
 
 
-		// We do not need to lock container ID here, even though
-		// we are calling into hcsshim. This is safe, because the
-		// only place that closes this process handle is this method.
 		err := process.CloseStdin()
 		err := process.CloseStdin()
-		if err != nil && !hcsshim.IsNotExist(err) {
+		if err != nil && !hcsshim.IsNotExist(err) && !hcsshim.IsAlreadyClosed(err) {
 			// This error will occur if the compute system is currently shutting down
 			// This error will occur if the compute system is currently shutting down
 			if perr, ok := err.(*hcsshim.ProcessError); ok && perr.Err != hcsshim.ErrVmcomputeOperationInvalidState {
 			if perr, ok := err.(*hcsshim.ProcessError); ok && perr.Err != hcsshim.ErrVmcomputeOperationInvalidState {
 				return err
 				return err
 			}
 			}
 		}
 		}
 
 
-		return err
+		return nil
 	})
 	})
 }
 }