objstorage: minor fixes

Author: RaduBerinde

objstorage/objstorageprovider/remoteobjcat/catalog.go

@@ -8,7 +8,6 @@ import (
 	"cmp"
 	"fmt"
 	"io"
-	"path/filepath"
 	"slices"
 	"sync"
 
@@ -386,8 +385,8 @@ func (c *Catalog) Checkpoint(fs vfs.FS, dir string) error {
 
 	// NB: Every write to recWriter is flushed. We don't need to worry about
 	// this new file descriptor not getting all the saved catalog entries.
-	existingCatalogFilepath := filepath.Join(c.dirname, c.mu.catalogFilename)
-	destPath := filepath.Join(dir, c.mu.catalogFilename)
+	existingCatalogFilepath := c.fs.PathJoin(c.dirname, c.mu.catalogFilename)
+	destPath := fs.PathJoin(dir, c.mu.catalogFilename)
 	if err := vfs.CopyAcrossFS(c.fs, existingCatalogFilepath, fs, destPath); err != nil {
 		return err
 	}

objstorage/objstorageprovider/vfs.go

@@ -64,6 +64,8 @@ func (ls *localLockedState) objChanged(meta objstorage.ObjectMetadata) {
 	if meta.Local.Tier == base.HotTier {
 		ls.hotTier.objChangeCounter++
 	} else {
+		// We dual-write the metadata part of the object.
+		ls.hotTier.objChangeCounter++
 		ls.coldTier.objChangeCounter++
 	}
 }

objstorage/remote/localfs.go

@@ -51,6 +51,7 @@ func (s *localFSStore) ReadObject(
 	}
 	stat, err := f.Stat()
 	if err != nil {
+		_ = f.Close()
 		return nil, 0, err
 	}
 
@@ -75,9 +76,9 @@ func (r *localFSReader) ReadAt(_ context.Context, p []byte, offset int64) error
 
 // Close is part of the shared.ObjectReader interface.
 func (r *localFSReader) Close() error {
-	r.file.Close()
+	err := r.file.Close()
 	r.file = nil
-	return nil
+	return err
 }
 
 func (f *localFSStore) sync() error {