Fix fix storage lisring to be aling with virtual index (#78)

open-gpdb · Nov 11, 2024 · 81fa571 · 81fa571
1 parent ddcbe32
commit 81fa571
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/proc/delete_handler.go b/pkg/proc/delete_handler.go
@@ -116,7 +116,7 @@ func (dh *BasicDeleteHandler) ListGarbageFiles(msg message.DeleteMessage) ([]str
 	}
 
 	//list files in storage
-	ylogger.Zero.Info().Str("path", msg.Name).Msg("going to list path")
+	ylogger.Zero.Info().Str("path", msg.Name).Msg("listing prefix")
 	objectMetas, err := dh.StorageInterractor.ListPath(msg.Name)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not list objects")

diff --git a/pkg/storage/s3storage.go b/pkg/storage/s3storage.go
@@ -174,8 +174,16 @@ func (s *S3StorageInteractor) ListPath(prefix string) ([]*object.ObjectInfo, err
 		}
 
 		for _, obj := range out.Contents {
+			path := *obj.Key
+
+			ylogger.Zero.Debug().Str("path", path).Msg("listing file")
+
+			cPath, ok := strings.CutPrefix(path, s.cnf.StoragePrefix)
+			if !ok {
+				continue
+			}
 			metas = append(metas, &object.ObjectInfo{
-				Path: *obj.Key,
+				Path: "/" + cPath,
 				Size: *obj.Size,
 			})
 		}