Merge pull request cri-o#4148 from kolyshkin/pinns-debug

openshift-merge-robot · web-flow · commit 257b378ce5a1 · 2020-09-01T22:33:49.000-04:00
Fix pinns error diagnostics, cleanup, and return
diff --git a/internal/lib/sandbox/namespaces_linux.go b/internal/lib/sandbox/namespaces_linux.go
@@ -95,7 +95,7 @@ func pinNamespaces(nsTypes []NSType, cfg *config.Config, idMappings *idtools.IDM
 			return nil, errors.Errorf("Invalid namespace type: %s", nsType)
 		}
 		pinnsArgs = append(pinnsArgs, arg)
-		pinPath := filepath.Join(cfg.NamespacesDir, fmt.Sprintf("%sns", string(nsType)), pinnedNamespace)
+		pinPath := filepath.Join(cfg.NamespacesDir, string(nsType)+"ns", pinnedNamespace)
 		mountedNamespaces = append(mountedNamespaces, namespaceInfo{
 			path:   pinPath,
 			nsType: nsType,
@@ -122,28 +122,21 @@ func pinNamespaces(nsTypes []NSType, cfg *config.Config, idMappings *idtools.IDM
 			fmt.Sprintf("--gid-mapping=%s", getMappingsForPinns(idMappings.GIDs())))
 	}
 
-	pinns := cfg.PinnsPath
-
 	logrus.Debugf("calling pinns with %v", pinnsArgs)
-	output, err := exec.Command(pinns, pinnsArgs...).Output()
-	if len(output) != 0 {
-		logrus.Debugf("pinns output: %s", string(output))
-	}
+	output, err := exec.Command(cfg.PinnsPath, pinnsArgs...).CombinedOutput()
 	if err != nil {
-		// cleanup after ourselves
-		failedUmounts := make([]string, 0)
+		logrus.Warnf("pinns %v failed: %s (%v)", pinnsArgs, string(output), err)
+		// cleanup the mounts
 		for _, info := range mountedNamespaces {
-			if unmountErr := unix.Unmount(info.path, unix.MNT_DETACH); unmountErr != nil {
-				failedUmounts = append(failedUmounts, info.path)
+			if mErr := unix.Unmount(info.path, unix.MNT_DETACH); mErr != nil && mErr != unix.EINVAL {
+				logrus.Warnf("failed to unmount %s: %v", info.path, mErr)
 			}
 		}
-		if len(failedUmounts) != 0 {
-			return nil, fmt.Errorf("failed to cleanup %v after pinns failure %s %v", failedUmounts, output, err)
-		}
+
 		return nil, fmt.Errorf("failed to pin namespaces %v: %s %v", nsTypes, output, err)
 	}
 
-	returnedNamespaces := make([]NamespaceIface, 0)
+	returnedNamespaces := make([]NamespaceIface, 0, len(nsTypes))
 	for _, info := range mountedNamespaces {
 		ret, err := nspkg.GetNS(info.path)
 		if err != nil {
