Chcon,Relabel: do process the root entry last

Commit 8501cfd does not guarantee that the root entry is processed last -- due to parallel nature of the pwalk it one of the last to be processed, but might be not the last one. Rewrite the code to process the root entry after all the others are done. Remove the test for root entry being last as the last = p assignment is racy, and this is now very obvious from the code that the root entry is indeed the last one. Fixes: 8501cfd Signed-off-by: Kir Kolyshkin <[email protected]>
opencontainers · Oct 6, 2021 · b43035c · b43035c
1 parent 3e29a7d
commit b43035c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 18 deletions.
diff --git a/pkg/pwalk/pwalk.go b/pkg/pwalk/pwalk.go
@@ -63,7 +63,7 @@ func WalkN(root string, walkFn WalkFunc, num int) error {
 				return err
 			}
 			if len(p) == rootLen {
-				// Don't add root entry just yet.
+				// Root entry is processed separately below.
 				rootEntry = &walkArgs{path: p, info: &info}
 				return nil
 			}
@@ -78,8 +78,6 @@ func WalkN(root string, walkFn WalkFunc, num int) error {
 			}
 		})
 		if err == nil {
-			// Finally, add the root entry.
-			files <- rootEntry
 			close(files)
 		}
 		wg.Done()
@@ -102,6 +100,10 @@ func WalkN(root string, walkFn WalkFunc, num int) error {
 
 	wg.Wait()
 
+	if err == nil {
+		err = walkFn(rootEntry.path, *rootEntry.info, nil)
+	}
+
 	return err
 }
 

diff --git a/pkg/pwalk/pwalk_test.go b/pkg/pwalk/pwalk_test.go
@@ -22,10 +22,8 @@ func TestWalk(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	var last string
 	err = WalkN(dir,
-		func(p string, _ os.FileInfo, _ error) error {
-			last = p
+		func(_ string, _ os.FileInfo, _ error) error {
 			atomic.AddUint32(&count, 1)
 			return nil
 		},
@@ -37,9 +35,6 @@ func TestWalk(t *testing.T) {
 	if count != uint32(total) {
 		t.Errorf("File count mismatch: found %d, expected %d", count, total)
 	}
-	if last != dir {
-		t.Errorf("Last entry: want %q, got %q", dir, last)
-	}
 
 	t.Logf("concurrency: %d, files found: %d\n", concurrency, count)
 }

diff --git a/pkg/pwalkdir/pwalkdir.go b/pkg/pwalkdir/pwalkdir.go
@@ -64,7 +64,7 @@ func WalkN(root string, walkFn fs.WalkDirFunc, num int) error {
 				return err
 			}
 			if len(p) == rootLen {
-				// Don't add root entry just yet.
+				// Root entry is processed separately below.
 				rootEntry = &walkArgs{path: p, entry: entry}
 				return nil
 			}
@@ -79,8 +79,6 @@ func WalkN(root string, walkFn fs.WalkDirFunc, num int) error {
 			}
 		})
 		if err == nil {
-			// Finally, add the root entry.
-			files <- rootEntry
 			close(files)
 		}
 		wg.Done()
@@ -103,6 +101,10 @@ func WalkN(root string, walkFn fs.WalkDirFunc, num int) error {
 
 	wg.Wait()
 
+	if err == nil {
+		err = walkFn(rootEntry.path, rootEntry.entry, nil)
+	}
+
 	return err
 }
 

diff --git a/pkg/pwalkdir/pwalkdir_test.go b/pkg/pwalkdir/pwalkdir_test.go
@@ -26,10 +26,8 @@ func TestWalkDir(t *testing.T) {
 	}
 	defer os.RemoveAll(dir)
 
-	var last string
 	err = WalkN(dir,
-		func(p string, _ fs.DirEntry, _ error) error {
-			last = p
+		func(_ string, _ fs.DirEntry, _ error) error {
 			atomic.AddUint32(&count, 1)
 			return nil
 		},
@@ -41,9 +39,6 @@ func TestWalkDir(t *testing.T) {
 	if count != uint32(total) {
 		t.Errorf("File count mismatch: found %d, expected %d", count, total)
 	}
-	if last != dir {
-		t.Errorf("Last entry: want %q, got %q", dir, last)
-	}
 
 	t.Logf("concurrency: %d, files found: %d\n", concurrency, count)
 }