From b24907cab67d953dc99667d343cf1a10ba1104f4 Mon Sep 17 00:00:00 2001 From: Wenhai Zhu Date: Mon, 10 Jul 2023 14:52:19 -0700 Subject: [PATCH] upgrade AWS CPP SDK from 1.8.177 to a newer version Summary: We got a SEV S322350 where the s3 upload showed successful while the file was not uploaded at all. It was due to a bug in 1.8.177 and it was fixed in 1.9.333. Chose 1.9.379 because it's the last version before 1.10.0 and 1.10.0 has major changes on the s3client.h which isn't compatible with our code anymore. Differential Revision: D47244697 fbshipit-source-id: 7f3bf8c1a51902e6c09566f28c8ba77593edb543 --- build-docker.sh | 4 ++-- docker/Dockerfile.ubuntu | 2 +- docker/aws-s3-core/Dockerfile.ubuntu | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index d4b93ab4..db483c43 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -10,8 +10,8 @@ UBUNTU_RELEASE="20.04" EMP_TOOL_RELEASE="0.2.3" EMP_RELEASE="0.2.2" EMP_IMAGE_TAG="0.2.3-haswell" -AWS_RELEASE="1.8.177" -AWS_IMAGE_TAG="1.8.177-haswell" +AWS_RELEASE="1.9.379" +AWS_IMAGE_TAG="1.9.379-haswell" GCP_RELEASE="v1.32.1" FMT_RELEASE="7.1.3" FOLLY_RELEASE="2021.06.28.00" diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu index af19dd10..860bee80 100644 --- a/docker/Dockerfile.ubuntu +++ b/docker/Dockerfile.ubuntu @@ -5,7 +5,7 @@ ARG os_release="latest" ARG emp_image="fbpcf/ubuntu-emp:0.2.3" -ARG aws_image="fbpcf/ubuntu-aws-s3-core:1.8.177" +ARG aws_image="fbpcf/ubuntu-aws-s3-core:1.9.379" ARG folly_image="fbpcf/ubuntu-folly:2021.03.29.00" ARG gcp_image="fbpcf/ubuntu-gcp-cloud-cpp:1.32.1" diff --git a/docker/aws-s3-core/Dockerfile.ubuntu b/docker/aws-s3-core/Dockerfile.ubuntu index 5cffcc90..0fe0d9ce 100644 --- a/docker/aws-s3-core/Dockerfile.ubuntu +++ b/docker/aws-s3-core/Dockerfile.ubuntu @@ -4,7 +4,7 @@ # LICENSE file in the root directory of this source tree. ARG os_release="latest" FROM ubuntu:${os_release} AS builder -ARG aws_release="1.8.177" +ARG aws_release="1.9.379" # Required Packages for AWS ARG DEBIAN_FRONTEND=noninteractive RUN apt-get -y update && apt-get install --no-install-recommends -y \ @@ -21,7 +21,7 @@ WORKDIR /root/build COPY docker/utils/get_make_options.sh . # aws s3/core build and install -RUN git clone https://github.com/aws/aws-sdk-cpp.git +RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp.git WORKDIR /root/build/aws-sdk-cpp RUN git checkout tags/${aws_release} -b ${aws_release} # -DCUSTOM_MEMORY_MANAGEMENT=0 is added to avoid Aws::String and std::string issue