lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-07 19:44:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not retry if error is NotFound

Browse Source
This commit is contained in:
chrislu
2025-09-09 08:22:12 -07:00
parent b3a401d9f9
commit 311dfa9a23
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
weed/s3api/filer_util.go
View File

@@ -65,10 +65,18 @@ func doDeleteEntry(client filer_pb.SeaweedFilerClient, parentDirectoryPath strin
glog.V(1).Infof("delete entry %v/%v: %v", parentDirectoryPath, entryName, request)
if resp, err := client.DeleteEntry(context.Background(), request); err != nil {
// Treat NotFound as success for idempotency
if strings.Contains(err.Error(), filer_pb.ErrNotFound.Error()) {
return nil
}
glog.V(0).Infof("delete entry %v: %v", request, err)
return fmt.Errorf("delete entry %s/%s: %v", parentDirectoryPath, entryName, err)
} else {
if resp.Error != "" {
// Treat NotFound as success for idempotency
if strings.Contains(resp.Error, filer_pb.ErrNotFound.Error()) {
return nil
}
return fmt.Errorf("delete entry %s/%s: %v", parentDirectoryPath, entryName, resp.Error)
}
}

31
weed/s3api/s3api_bucket_handlers.go
View File

@@ -108,6 +108,27 @@ func (s3a *S3ApiServer) PutBucketHandler(w http.ResponseWriter, r *http.Request)
return
}
// Idempotency: if bucket already exists and is owned by the requester, return success.
identityId := r.Header.Get(s3_constants.AmzIdentityId)
if existingEntry, err := s3a.getEntry(s3a.option.BucketsPath, bucket); err == nil && existingEntry != nil && existingEntry.IsDirectory {
if owner, ok := existingEntry.Extended[s3_constants.AmzIdentityId]; ok {
if string(owner) == identityId || identityId == "" {
w.Header().Set("Location", "/"+bucket)
writeSuccessResponseEmpty(w, r)
return
}
} else {
// No owner recorded; treat as success for idempotency
w.Header().Set("Location", "/"+bucket)
writeSuccessResponseEmpty(w, r)
return
}
} else if err != nil && !errors.Is(err, filer_pb.ErrNotFound) {
// Unexpected error fetching existing entry
s3err.WriteErrorResponse(w, r, s3err.ErrInternalError)
return
}
// avoid duplicated buckets
errCode := s3err.ErrNone
if err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error {
@@ -192,6 +213,16 @@ func (s3a *S3ApiServer) DeleteBucketHandler(w http.ResponseWriter, r *http.Reque
bucket, _ := s3_constants.GetBucketAndObject(r)
glog.V(3).Infof("DeleteBucketHandler %s", bucket)
// Idempotency: if the bucket doesn't exist, return NoContent (success)
if entry, err := s3a.getEntry(s3a.option.BucketsPath, bucket); err != nil || entry == nil {
if errors.Is(err, filer_pb.ErrNotFound) || entry == nil {
s3err.WriteEmptyResponse(w, r, http.StatusNoContent)
return
}
s3err.WriteErrorResponse(w, r, s3err.ErrInternalError)
return
}
if err := s3a.checkBucket(r, bucket); err != s3err.ErrNone {
s3err.WriteErrorResponse(w, r, err)
return