Revert "Fix a bug in checking CopyObject response"

Summary: This reverts commit f314650.

Test Plan: N/A. just revert

Reviewers: igor, dhruba, #platform

Reviewed By: dhruba, #platform

Differential Revision: https://rockset.phacility.com/D6336

Author: Duc Hieu Pham

cloud/aws/aws_s3.cc

@@ -52,7 +52,6 @@
 #include "util/string_util.h"
 
 namespace rocksdb {
-
 #ifdef USE_AWS
 class CloudRequestCallbackGuard {
  public:
@@ -160,25 +159,12 @@ class AwsS3ClientWrapper {
     return outcome;
   }
 
-  // The copy RPC is only successful iff outcome is success and etags between
-  // src and dst match.
-  static bool isCopyCloudObjectSuccess(
-      Aws::S3::Model::CopyObjectOutcome& outcome, const Aws::String& src_etag) {
-    bool success = false;
-    if (outcome.IsSuccess()) {
-      const auto& detail = outcome.GetResult().GetCopyObjectResultDetails();
-      success = (detail.ETagHasBeenSet() && detail.GetETag() == src_etag);
-    }
-    return success;
-  }
-
   Aws::S3::Model::CopyObjectOutcome CopyCloudObject(
-      const Aws::S3::Model::CopyObjectRequest& request,
-      const Aws::String& src_etag) {
+      const Aws::S3::Model::CopyObjectRequest& request) {
     CloudRequestCallbackGuard t(cloud_request_callback_.get(),
                                 CloudRequestOpType::kCopyOp);
     auto outcome = client_->CopyObject(request);
-    t.SetSuccess(isCopyCloudObjectSuccess(outcome, src_etag));
+    t.SetSuccess(outcome.IsSuccess());
     return outcome;
   }
 
@@ -760,25 +746,6 @@ Status S3StorageProvider::CopyCloudObject(const std::string& bucket_name_src,
 
   Aws::String src_url = src_bucket + src_object;
 
-  // Get the metadata of the source object. We need the metadata so that we can
-  // compare the ETag between the source object and dest object. Only when these
-  // ETags match can we conclude this CopyObject operations succeed.
-  //
-  // More details:
-  // https://sdk.amazonaws.com/cpp/api/LATEST/class_aws_1_1_s3_1_1_model_1_1_copy_object_result_details.html
-  // https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html
-  Aws::S3::Model::HeadObjectRequest head_request;
-  head_request.SetBucket(ToAwsString(bucket_name_src));
-  head_request.SetKey(ToAwsString(object_path_src));
-
-  auto head_outcome = s3client_->HeadObject(head_request);
-  if (!head_outcome.IsSuccess()) {
-    return Status::NotFound(
-        "[s3] CopyCloudObject: Fail to get metadata of src object: %s",
-        head_outcome.GetError().GetMessage().c_str());
-  }
-  const auto& src_etag = head_outcome.GetResult().GetETag();
-
   // create copy request
   Aws::S3::Model::CopyObjectRequest request;
   request.SetCopySource(src_url);
@@ -788,29 +755,15 @@ Status S3StorageProvider::CopyCloudObject(const std::string& bucket_name_src,
 
   // execute request
   Aws::S3::Model::CopyObjectOutcome outcome =
-      s3client_->CopyCloudObject(request, src_etag);
-  bool isSuccess =
-      AwsS3ClientWrapper::isCopyCloudObjectSuccess(outcome, src_etag);
+      s3client_->CopyCloudObject(request);
+  bool isSuccess = outcome.IsSuccess();
   if (!isSuccess) {
-    // S3 CopyObject RPC can report errors in 2 ways:
-    // 1. outcome.IsSuccess() = false
-    // 2. outcome.IsSuccess() = true but the outcome's ETag doesn't match the
-    // source's ETag.
-    if (!outcome.IsSuccess()) {
-      const Aws::Client::AWSError<Aws::S3::S3Errors>& error =
-          outcome.GetError();
-      std::string errmsg(error.GetMessage().c_str());
-      Log(InfoLogLevel::ERROR_LEVEL, env_->info_log_,
-          "[s3] S3WritableFile src path %s error in copying to %s %s",
-          src_url.c_str(), dest_object.c_str(), errmsg.c_str());
-      return Status::IOError(dest_object.c_str(), errmsg.c_str());
-    }
-
+    const Aws::Client::AWSError<Aws::S3::S3Errors>& error = outcome.GetError();
+    std::string errmsg(error.GetMessage().c_str());
     Log(InfoLogLevel::ERROR_LEVEL, env_->info_log_,
-        "[s3] S3WritableFile src path %s error in copying to %s: CopyObject "
-        "etags don't match",
-        src_url.c_str(), dest_object.c_str());
-    return Status::IOError("CopyObject S3 etags don't match");
+        "[s3] S3WritableFile src path %s error in copying to %s %s",
+        src_url.c_str(), dest_object.c_str(), errmsg.c_str());
+    return Status::IOError(dest_object.c_str(), errmsg.c_str());
   }
   Log(InfoLogLevel::INFO_LEVEL, env_->info_log_,
       "[s3] S3WritableFile src path %s copied to %s %s", src_url.c_str(),

cloud/db_cloud_test.cc

@@ -1,11 +1,11 @@
 // Copyright (c) 2017 Rockset
 
-#include <gtest/gtest.h>
-
 #ifndef ROCKSDB_LITE
 
 #ifdef USE_AWS
 
+#include "rocksdb/cloud/db_cloud.h"
+
 #include <algorithm>
 #include <chrono>
 #include <cinttypes>
@@ -18,8 +18,6 @@
 #include "file/filename.h"
 #include "logging/logging.h"
 #include "rocksdb/cloud/cloud_storage_provider.h"
-#include "rocksdb/cloud/db_cloud.h"
-#include "rocksdb/env.h"
 #include "rocksdb/options.h"
 #include "rocksdb/status.h"
 #include "rocksdb/table.h"