github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-04-03 01:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix batching again

Browse Source
This commit is contained in:
Bryan Boreham
2019-06-08 13:07:33 +00:00
parent e46514c24a
commit 424a18cf2b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extras/scanner/main.go
View File

@@ -233,15 +233,15 @@ func (sc *scanner) deleteOneOrgHour(ctx context.Context, org string, hour int) i
end = len(keys)
}
wait.Add(1)
go func(start, end int) {
sc.deleteFromS3(ctx, keys[start:end])
for _, key := range keys {
go func(batchKeys []map[string]*dynamodb.AttributeValue) {
sc.deleteFromS3(ctx, batchKeys)
for _, key := range batchKeys {
delete(key, reportField) // not part of key in dynamoDB
}
sc.deleteFromDynamoDB(keys[start:end])
s3ItemsDeleted.Add(float64(end - start))
sc.deleteFromDynamoDB(batchKeys)
s3ItemsDeleted.Add(float64(len(batchKeys)))
wait.Done()
}(start, end)
}(keys[start:end])
}
wait.Wait()
return len(keys)