From 7f2f15adc8e865abcb66020ceb7524475c8ad19c Mon Sep 17 00:00:00 2001
From: lucyge2022 <111789461+lucyge2022@users.noreply.github.com>
Date: Mon, 6 Mar 2023 14:15:25 -0800
Subject: [PATCH] Enable v2 s3 proxy by default

### What changes are proposed in this pull request?

Enable v2 s3 proxy by default.

### Why are the changes needed?

### Does this PR introduce any user facing changes?

s3 api will go thru v2 proxy service now.

pr-link: Alluxio/alluxio#16937
change-id: cid-fd406105d77cadcebc7acb29c1d250215985e1ab
---
 core/common/src/main/java/alluxio/conf/PropertyKey.java     | 6 +++---
 .../proxy/src/main/java/alluxio/proxy/s3/S3ObjectTask.java  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/common/src/main/java/alluxio/conf/PropertyKey.java b/core/common/src/main/java/alluxio/conf/PropertyKey.java
index a3fad9597a70..dfba5626fe20 100755
--- a/core/common/src/main/java/alluxio/conf/PropertyKey.java
+++ b/core/common/src/main/java/alluxio/conf/PropertyKey.java
@@ -5210,8 +5210,8 @@ public String toString() {
           .build();
   public static final PropertyKey PROXY_S3_MULTIPART_UPLOAD_CLEANER_ENABLED =
       booleanBuilder(Name.PROXY_S3_MULTIPART_UPLOAD_CLEANER_ENABLED)
-          .setDefaultValue(true)
-          .setDescription("Whether or not to enable automatic cleanup of long-running "
+          .setDefaultValue(false)
+          .setDescription("Enable automatic cleanup of long-running "
               + "multipart uploads.")
           .setConsistencyCheckLevel(ConsistencyCheckLevel.ENFORCE)
           .setScope(Scope.SERVER)
@@ -5308,7 +5308,7 @@ public String toString() {
           .build();
   public static final PropertyKey PROXY_S3_V2_VERSION_ENABLED =
           booleanBuilder(Name.PROXY_S3_V2_VERSION_ENABLED)
-                  .setDefaultValue(false)
+                  .setDefaultValue(true)
                   .setDescription("(Experimental) V2, an optimized version of "
                           + "Alluxio s3 proxy service.")
                   .setConsistencyCheckLevel(ConsistencyCheckLevel.ENFORCE)
diff --git a/core/server/proxy/src/main/java/alluxio/proxy/s3/S3ObjectTask.java b/core/server/proxy/src/main/java/alluxio/proxy/s3/S3ObjectTask.java
index 0c3a08e599c1..165f6fe75fb3 100644
--- a/core/server/proxy/src/main/java/alluxio/proxy/s3/S3ObjectTask.java
+++ b/core/server/proxy/src/main/java/alluxio/proxy/s3/S3ObjectTask.java
@@ -816,6 +816,7 @@ public Response continueTask() {
                       .setGroupBits(Bits.ALL)
                       .setOtherBits(Bits.NONE).build())
                   .setWriteType(S3RestUtils.getS3WriteType())
+                  .setOverwrite(true)
                   .build();
           return createObject(objectPath, userFs, filePOptions, auditContext);
         }