Skip to content

fix(cos): [122768436] tencentcloud_cos_bucket Optimize multi zone deletion #3311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/3311.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_cos_bucket: Optimize multi zone deletion
```
32 changes: 28 additions & 4 deletions tencentcloud/services/cos/service_tencentcloud_cos.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"net/http"
"regexp"
"strings"
"time"

tccommon "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/common"

Expand Down Expand Up @@ -363,6 +364,9 @@ func (me *CosService) DeleteBucket(ctx context.Context, bucket string, forced bo
if err != nil {
return err
}

// wait cos backend sync
time.Sleep(30 * time.Second)
}

request := s3.DeleteBucketInput{
Expand Down Expand Up @@ -397,17 +401,26 @@ func (me *CosService) ForceCleanObject(ctx context.Context, bucket string, versi
return fmt.Errorf("cos force clean object error: the list of objects is truncated and the bucket[%s] needs to be deleted manually!!!", bucket)
}

// Get all object list
listObjects, err := me.ListObjects(ctx, bucket)
if err != nil {
log.Printf("[CRITAL]%s api[%s] fail, resp body [%s], reason[%s]\n",
logId, "ListObjects", resp.Body, err.Error())
return fmt.Errorf("cos force clean object error: %s, bucket: %s", err.Error(), bucket)
}

verCnt := len(objList.Version)
markerCnt := len(objList.DeleteMarker)
log.Printf("[DEBUG][ForceCleanObject]%s api[%s] success, get [%v] versions of object, get [%v] deleteMarker, versioned[%v].\n", logId, "GetObjectVersions", verCnt, markerCnt, versioned)
listObjCnt := len(listObjects)
log.Printf("[DEBUG][ForceCleanObject]%s api[%s] success, get [%v] versions of object, get [%v] deleteMarker, get [%v] listObjects. versioned[%v], multiAzed[%v].\n", logId, "GetObjectVersions", verCnt, markerCnt, listObjCnt, versioned, multiAz)

delCnt := verCnt + markerCnt
delCnt := verCnt + markerCnt + listObjCnt
if delCnt == 0 {
return nil
}

delObjs := make([]cos.Object, 0, delCnt)
if versioned || multiAz {
if versioned {
//add the versions
for _, v := range objList.Version {
delObjs = append(delObjs, cos.Object{
Expand All @@ -430,8 +443,19 @@ func (me *CosService) ForceCleanObject(ctx context.Context, bucket string, versi
}
}

if multiAz {
// add obj list
for _, v := range listObjects {
if v.Key != nil {
delObjs = append(delObjs, cos.Object{
Key: *v.Key,
})
}
}
}

opt := cos.ObjectDeleteMultiOptions{
Quiet: true,
Quiet: false,
Objects: delObjs,
}

Expand Down
Loading