Merge #48144

48144: storage: fix Pebble.DeleteDirAndFiles r=petermattis a=petermattis

Fix `Pebble.DeleteDirAndFiles` to actually delete the specified
directory. Previously it was only recursively deleting the directory's
contents. Not deleting the directory was causing the `TestDiskQueue` and
`TestSpillingQueue` tests to fail which assert that the queue directory
does not exist at the end of the test.

This fix also addresses a TODO to use a `RemoveAll` function which has
been implemented in `pebble/vfs.FS` for a while.

Release note: None

Co-authored-by: Peter Mattis <petermattis@gmail.com>

pkg/storage/pebble.go

@@ -970,31 +970,14 @@ func (p *Pebble) DeleteFile(filename string) error {
 
 // DeleteDirAndFiles implements the Engine interface.
 func (p *Pebble) DeleteDirAndFiles(dir string) error {
-	// TODO(itsbilal): Implement FS.RemoveAll then call that here instead.
-	files, err := p.fs.List(dir)
+	// NB RemoveAll does not return an error if dir does not exist, but we want
+	// DeleteDirAndFiles to return an error in that case to match the RocksDB
+	// behavior.
+	_, err := p.fs.Stat(dir)
 	if err != nil {
 		return err
 	}
-
-	// Recurse through all files, calling DeleteFile or DeleteDirAndFiles as
-	// appropriate.
-	for _, filename := range files {
-		path := p.fs.PathJoin(dir, filename)
-		stat, err := p.fs.Stat(path)
-		if err != nil {
-			return err
-		}
-
-		if stat.IsDir() {
-			err = p.DeleteDirAndFiles(path)
-		} else {
-			err = p.DeleteFile(path)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+	return p.fs.RemoveAll(dir)
 }
 
 // LinkFile implements the FS interface.