Fix the ObjectExists method on FSObjectClient

Signed-off-by: Michel Hollands <[email protected]>
grafana · Jan 23, 2024 · 7b32e70 · 7b32e70
1 parent de251c3
commit 7b32e70
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/storage/chunk/client/local/fs_object_client.go b/pkg/storage/chunk/client/local/fs_object_client.go
@@ -66,7 +66,8 @@ func NewFSObjectClient(cfg FSConfig) (*FSObjectClient, error) {
 func (FSObjectClient) Stop() {}
 
 func (f *FSObjectClient) ObjectExists(_ context.Context, objectKey string) (bool, error) {
-	_, err := os.Lstat(objectKey)
+	fullPath := filepath.Join(f.cfg.Directory, filepath.FromSlash(objectKey))
+	_, err := os.Lstat(fullPath)
 	if err != nil {
 		return false, err
 	}

diff --git a/pkg/storage/chunk/client/local/fs_object_client_test.go b/pkg/storage/chunk/client/local/fs_object_client_test.go
@@ -57,7 +57,7 @@ func TestFSObjectClient_DeleteChunksBefore(t *testing.T) {
 	require.Equal(t, 1, len(files), "Number of files should be 1 after enforcing retention")
 }
 
-func TestFSObjectClient_List(t *testing.T) {
+func TestFSObjectClient_List_and_ObjectExists(t *testing.T) {
 	fsObjectsDir := t.TempDir()
 
 	bucketClient, err := NewFSObjectClient(FSConfig{
@@ -152,6 +152,10 @@ func TestFSObjectClient_List(t *testing.T) {
 	require.Len(t, storageObjects, 1)
 	require.Equal(t, "outer-file1", storageObjects[0].Key)
 	require.Empty(t, commonPrefixes)
+
+	ok, err := bucketClient.ObjectExists(context.Background(), "outer-file2")
+	require.NoError(t, err)
+	require.True(t, ok)
 }
 
 func TestFSObjectClient_DeleteObject(t *testing.T) {