Skip to content

Commit a7ef238

Browse files
committed
fix minio
1 parent a96be7c commit a7ef238

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

routers/api/actions/artifactsv4.go

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -361,29 +361,19 @@ type Latest struct {
361361

362362
func (r *artifactV4Routes) readBlockList(runID, artifactID int64) (*BlockList, error) {
363363
blockListName := fmt.Sprintf("tmpv4%d/%d-%d-blocklist", runID, runID, artifactID)
364-
// Workaround minio and azureite storage availability problems via retries
365-
var s storage.Object
366-
var err error
367-
for i := 0; i < 5; i++ {
368-
if i != 0 {
369-
time.Sleep(1000)
370-
}
371-
s, err = r.fs.Open(blockListName)
372-
if err == nil {
373-
break
374-
}
375-
}
364+
s, err := r.fs.Open(blockListName)
376365
if err != nil {
377366
return nil, err
378367
}
379-
err = r.fs.Delete(blockListName)
380-
if err != nil {
381-
log.Warn("Failed to delete blockList %s: %v", blockListName, err)
382-
}
383368

384369
xdec := xml.NewDecoder(s)
385370
blockList := &BlockList{}
386371
err = xdec.Decode(blockList)
372+
373+
delerr := r.fs.Delete(blockListName)
374+
if delerr != nil {
375+
log.Warn("Failed to delete blockList %s: %v", blockListName, delerr)
376+
}
387377
return blockList, err
388378
}
389379

0 commit comments

Comments
 (0)