diff options
| -rw-r--r-- | weed/s3api/filer_util.go | 2 | ||||
| -rw-r--r-- | weed/s3api/s3api_bucket_handlers.go | 2 | ||||
| -rw-r--r-- | weed/s3api/s3api_object_handlers.go | 7 | ||||
| -rw-r--r-- | weed/s3api/s3api_object_handlers_list.go | 1 |
4 files changed, 2 insertions, 10 deletions
diff --git a/weed/s3api/filer_util.go b/weed/s3api/filer_util.go index e6090b458..e02b945cd 100644 --- a/weed/s3api/filer_util.go +++ b/weed/s3api/filer_util.go @@ -116,7 +116,7 @@ func (s3a *S3ApiServer) updateEntriesTTL(parentDirectoryPath string, ttlSec int3 if entry.IsDirectory { return s3a.updateEntriesTTL(fmt.Sprintf("%s/%s", parentDirectoryPath, entry.Name), ttlSec) } - if entry.Attributes != nil { + if entry.Attributes == nil { entry.Attributes = &filer_pb.FuseAttributes{} } if entry.Attributes.TtlSec == ttlSec { diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go index 390b19dbf..c643a5e67 100644 --- a/weed/s3api/s3api_bucket_handlers.go +++ b/weed/s3api/s3api_bucket_handlers.go @@ -630,7 +630,7 @@ func (s3a *S3ApiServer) PutBucketLifecycleConfigurationHandler(w http.ResponseWr } ttlSec := int32((time.Duration(rule.Expiration.Days) * util.LifeCycleInterval).Seconds()) if updErr := s3a.updateEntriesTTL(locationPrefix, ttlSec); updErr != nil { - glog.Errorf("PutBucketLifecycleConfigurationHandler update: %s", err) + glog.Errorf("PutBucketLifecycleConfigurationHandler update: %s", updErr) } changed = true } diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index 424987377..a7b6ed736 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -388,7 +388,6 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) // Restore the original Range header for SSE processing if sseObject && originalRangeHeader != "" { r.Header.Set("Range", originalRangeHeader) - } // Add SSE metadata headers based on object metadata before SSE processing @@ -503,11 +502,6 @@ func (s3a *S3ApiServer) HeadObjectHandler(w http.ResponseWriter, r *http.Request // Add object lock metadata to response headers if present s3a.addObjectLockHeadersToResponse(w, entry) } else { - if s3a.option.AllowDeleteObjectsByTTL && entry.IsExpired() { - s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) - s3a.removeExpiredObject(w, r, entry, bucket, object) - return - } // Handle regular HEAD (non-versioned) destUrl = s3a.toFilerUrl(bucket, object) } @@ -621,7 +615,6 @@ func (s3a *S3ApiServer) proxyToFiler(w http.ResponseWriter, r *http.Request, des resp.Body.Close() return } - setUserMetadataKeyToLowercase(resp) responseStatusCode, bytesTransferred := responseFn(resp, w) diff --git a/weed/s3api/s3api_object_handlers_list.go b/weed/s3api/s3api_object_handlers_list.go index 5730df613..cf4caa743 100644 --- a/weed/s3api/s3api_object_handlers_list.go +++ b/weed/s3api/s3api_object_handlers_list.go @@ -304,7 +304,6 @@ func (s3a *S3ApiServer) listFilerEntries(bucket string, originalPrefix string, m } } if s3a.option.AllowDeleteObjectsByTTL && entry.IsExpired() { - glog.V(1).Infof("Do delete expired entry %s/%s", dirName, entryName) if delErr := doDeleteEntry(client, dirName, entryName, true, false); delErr != nil { glog.Errorf("delete expired entries %s/%s: %v", dirName, entryName, delErr) } |