diff options
Diffstat (limited to 'weed/s3api/s3api_object_handlers.go')
| -rw-r--r-- | weed/s3api/s3api_object_handlers.go | 56 |
1 files changed, 40 insertions, 16 deletions
diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go index 0aa96b21a..ef65e201b 100644 --- a/weed/s3api/s3api_object_handlers.go +++ b/weed/s3api/s3api_object_handlers.go @@ -136,8 +136,8 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) // Check for specific version ID in query parameters versionId := r.URL.Query().Get("versionId") - // Check if versioning is enabled for the bucket - versioningEnabled, err := s3a.isVersioningEnabled(bucket) + // Check if versioning is configured for the bucket (Enabled or Suspended) + versioningConfigured, err := s3a.isVersioningConfigured(bucket) if err != nil { if err == filer_pb.ErrNotFound { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) @@ -148,9 +148,11 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) return } + glog.V(1).Infof("GetObject: bucket %s, object %s, versioningConfigured=%v, versionId=%s", bucket, object, versioningConfigured, versionId) + var destUrl string - if versioningEnabled { + if versioningConfigured { // Handle versioned GET - all versions are stored in .versions directory var targetVersionId string var entry *filer_pb.Entry @@ -167,10 +169,10 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) targetVersionId = versionId } else { // Request for latest version - glog.V(2).Infof("GetObject: requesting latest version for %s/%s", bucket, object) + glog.V(1).Infof("GetObject: requesting latest version for %s/%s", bucket, object) entry, err = s3a.getLatestObjectVersion(bucket, object) if err != nil { - glog.Errorf("Failed to get latest version: %v", err) + glog.Errorf("GetObject: Failed to get latest version for %s/%s: %v", bucket, object, err) s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchKey) return } @@ -179,6 +181,10 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) targetVersionId = string(versionIdBytes) } } + // If no version ID found in entry, this is a pre-versioning object + if targetVersionId == "" { + targetVersionId = "null" + } } // Check if this is a delete marker @@ -189,10 +195,17 @@ func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) } } - // All versions are stored in .versions directory - versionObjectPath := object + ".versions/" + s3a.getVersionFileName(targetVersionId) - destUrl = s3a.toFilerUrl(bucket, versionObjectPath) - glog.V(2).Infof("GetObject: version %s URL: %s", targetVersionId, destUrl) + // Determine the actual file path based on whether this is a versioned or pre-versioning object + if targetVersionId == "null" { + // Pre-versioning object - stored as regular file + destUrl = s3a.toFilerUrl(bucket, object) + glog.V(2).Infof("GetObject: pre-versioning object URL: %s", destUrl) + } else { + // Versioned object - stored in .versions directory + versionObjectPath := object + ".versions/" + s3a.getVersionFileName(targetVersionId) + destUrl = s3a.toFilerUrl(bucket, versionObjectPath) + glog.V(2).Infof("GetObject: version %s URL: %s", targetVersionId, destUrl) + } // Set version ID in response header w.Header().Set("x-amz-version-id", targetVersionId) @@ -215,8 +228,8 @@ func (s3a *S3ApiServer) HeadObjectHandler(w http.ResponseWriter, r *http.Request // Check for specific version ID in query parameters versionId := r.URL.Query().Get("versionId") - // Check if versioning is enabled for the bucket - versioningEnabled, err := s3a.isVersioningEnabled(bucket) + // Check if versioning is configured for the bucket (Enabled or Suspended) + versioningConfigured, err := s3a.isVersioningConfigured(bucket) if err != nil { if err == filer_pb.ErrNotFound { s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchBucket) @@ -229,7 +242,7 @@ func (s3a *S3ApiServer) HeadObjectHandler(w http.ResponseWriter, r *http.Request var destUrl string - if versioningEnabled { + if versioningConfigured { // Handle versioned HEAD - all versions are stored in .versions directory var targetVersionId string var entry *filer_pb.Entry @@ -258,6 +271,10 @@ func (s3a *S3ApiServer) HeadObjectHandler(w http.ResponseWriter, r *http.Request targetVersionId = string(versionIdBytes) } } + // If no version ID found in entry, this is a pre-versioning object + if targetVersionId == "" { + targetVersionId = "null" + } } // Check if this is a delete marker @@ -268,10 +285,17 @@ func (s3a *S3ApiServer) HeadObjectHandler(w http.ResponseWriter, r *http.Request } } - // All versions are stored in .versions directory - versionObjectPath := object + ".versions/" + s3a.getVersionFileName(targetVersionId) - destUrl = s3a.toFilerUrl(bucket, versionObjectPath) - glog.V(2).Infof("HeadObject: version %s URL: %s", targetVersionId, destUrl) + // Determine the actual file path based on whether this is a versioned or pre-versioning object + if targetVersionId == "null" { + // Pre-versioning object - stored as regular file + destUrl = s3a.toFilerUrl(bucket, object) + glog.V(2).Infof("HeadObject: pre-versioning object URL: %s", destUrl) + } else { + // Versioned object - stored in .versions directory + versionObjectPath := object + ".versions/" + s3a.getVersionFileName(targetVersionId) + destUrl = s3a.toFilerUrl(bucket, versionObjectPath) + glog.V(2).Infof("HeadObject: version %s URL: %s", targetVersionId, destUrl) + } // Set version ID in response header w.Header().Set("x-amz-version-id", targetVersionId) |