TrueCloudLab/distribution
13
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

feature/11-update_master_to_beta_release_commits #12

Merged
alexvanin merged 185 commits from r.loginov/distribution:feature/11-update_master_to_beta_release_commits into tcl/master 2024-08-19 12:13:20 +00:00
Conversation 1 Commits 185 Files changed 119 +3 -4
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f1875862cf - Show all commits

7
registry/storage/purgeuploads.go
View file

@ -93,7 +93,7 @@ func getOutstandingUploads(ctx context.Context, driver storageDriver.StorageDriv
ud.containingDir = filePath ud.containingDir = filePath
} }
if file == "startedat" { if file == "startedat" {
if t, err := readStartedAtFile(driver, filePath); err == nil { if t, err := readStartedAtFile(ctx, driver, filePath); err == nil {
ud.startedAt = t ud.startedAt = t
} else { } else {
errors = pushError(errors, filePath, err) errors = pushError(errors, filePath, err)
@ -124,9 +124,8 @@ func uuidFromPath(path string) (string, bool) {
} }
// readStartedAtFile reads the date from an upload's startedAtFile // readStartedAtFile reads the date from an upload's startedAtFile
func readStartedAtFile(driver storageDriver.StorageDriver, path string) (time.Time, error) { func readStartedAtFile(ctx context.Context, driver storageDriver.StorageDriver, path string) (time.Time, error) {
// todo:(richardscothern) - pass in a context startedAtBytes, err := driver.GetContent(ctx, path)
startedAtBytes, err := driver.GetContent(context.Background(), path)
if err != nil { if err != nil {
return time.Now(), err return time.Now(), err
} }