mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove quota FIFO support (#1492)

Browse Source
This commit is contained in:
Harshavardhana
2022-01-31 09:10:06 -08:00
committed by GitHub
parent 06e1592b54
commit 1e00111b00
13 changed files with 196 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
restapi/user_objects.go
View File

@@ -659,7 +659,7 @@ func deleteMultipleObjects(ctx context.Context, client MCClient, recursive bool,
// TODO: support older Versions
contentCh := make(chan *mc.ClientContent, 1)
errorCh := client.remove(ctx, isIncomplete, isRemoveBucket, isBypass, contentCh)
resultCh := client.remove(ctx, isIncomplete, isRemoveBucket, isBypass, contentCh)
OUTER_LOOP:
for content := range client.list(ctx, listOpts) {
if content.Err != nil {
@@ -677,31 +677,31 @@ OUTER_LOOP:
select {
case contentCh <- content:
sent = true
case pErr := <-errorCh:
if pErr != nil {
switch pErr.ToGoError().(type) {
case result := <-resultCh:
if result.Err != nil {
switch result.Err.ToGoError().(type) {
// ignore same as mc
case mc.PathInsufficientPermission:
// Ignore Permission error.
continue
}
close(contentCh)
return pErr.Cause
return result.Err.Cause
}
break OUTER_LOOP
}
}
}
close(contentCh)
for pErr := range errorCh {
if pErr != nil {
switch pErr.ToGoError().(type) {
for result := range resultCh {
if result.Err != nil {
switch result.Err.ToGoError().(type) {
// ignore same as mc
case mc.PathInsufficientPermission:
// Ignore Permission error.
continue
}
return pErr.Cause
return result.Err.Cause
}
}
return nil
@@ -718,16 +718,16 @@ func deleteSingleObject(ctx context.Context, client MCClient, bucket, object str
isIncomplete := false
isBypass := false
errorCh := client.remove(ctx, isIncomplete, isRemoveBucket, isBypass, contentCh)
for pErr := range errorCh {
if pErr != nil {
switch pErr.ToGoError().(type) {
resultCh := client.remove(ctx, isIncomplete, isRemoveBucket, isBypass, contentCh)
for result := range resultCh {
if result.Err != nil {
switch result.Err.ToGoError().(type) {
// ignore same as mc
case mc.PathInsufficientPermission:
// Ignore Permission error.
continue
}
return pErr.Cause
return result.Err.Cause
}
}
return nil