From ea4ed9b53e8d18a585550fa4861f86856b26ab3c Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Thu, 2 Nov 2023 14:56:22 -0700 Subject: [PATCH 01/10] add path to s3-benchmark dir --- scripts/utils.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/utils.sh b/scripts/utils.sh index de19f0e..d14b648 100755 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -41,6 +41,7 @@ export ARTIFACTS_DIR="$ANSIBLE_DIR/artifacts" export DSS_ECOSYSTEM_DIR="$DSS_DIR/dss-ecosystem" export DSS_CLIENT_DIR="$DSS_ECOSYSTEM_DIR/dss_client" export DATAMOVER_DIR="$DSS_ECOSYSTEM_DIR/dss_datamover" +export S3_BENCHMARK_DIR="$DSS_ECOSYSTEM_DIR/dss_s3benchmark" export DSS_SDK_DIR="$DSS_DIR/dss-sdk" export BUILD_STAGING_DIR="$HOME/workspace" export MINIO_DIR="$DSS_DIR/dss-minio" From fd743a152056e8c87062eef043ebdf31af235ce3 Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Thu, 2 Nov 2023 14:56:35 -0700 Subject: [PATCH 02/10] install s3-bench deps --- scripts/build_dss-client.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/build_dss-client.sh b/scripts/build_dss-client.sh index b6ed2ec..ccacdf9 100755 --- a/scripts/build_dss-client.sh +++ b/scripts/build_dss-client.sh @@ -39,6 +39,9 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Check for submodules in update init recursive if missing checksubmodules +# Install S3-Benchmark dependencies +sudo yum install "$(cat "$S3_BENCHMARK_DIR"/dependencies.txt)" -y + # Build DSS Client Library "$DSS_CLIENT_DIR/scripts/build.sh" From 6414ffad33fe27fde4c7d816f5fd3707a9f26f29 Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Thu, 2 Nov 2023 14:56:50 -0700 Subject: [PATCH 03/10] don't build in user space - requires root --- scripts/docker/build_dss-client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/build_dss-client.sh b/scripts/docker/build_dss-client.sh index e55a6cc..3f59674 100755 --- a/scripts/docker/build_dss-client.sh +++ b/scripts/docker/build_dss-client.sh @@ -3,4 +3,4 @@ set -e # Build aws-sdk-cpp in Docker DOCKER_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -"$DOCKER_DIR"/build_docker.sh -c dss-client -d DSS -t dssbuild -a 'dss_client-*.tgz' -u +"$DOCKER_DIR"/build_docker.sh -c dss-client -d DSS -t dssbuild -a 'dss_client-*.tgz' From 18129cff69d7967bf8968b369d9e025db00943b3 Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Tue, 7 Nov 2023 10:12:45 -0800 Subject: [PATCH 04/10] update commit IDs for s3-bench --- dss-ansible | 2 +- dss-ecosystem | 2 +- dss-minio | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dss-ansible b/dss-ansible index a278d0b..2f550e8 160000 --- a/dss-ansible +++ b/dss-ansible @@ -1 +1 @@ -Subproject commit a278d0bbe7d02ddd35cbc5cc9e09b9f7e04929fe +Subproject commit 2f550e8c606d2a714dba2003a8c9fc15db91fb4b diff --git a/dss-ecosystem b/dss-ecosystem index 5820aa3..7cb37da 160000 --- a/dss-ecosystem +++ b/dss-ecosystem @@ -1 +1 @@ -Subproject commit 5820aa3369cce6739251789f31e1a41712574110 +Subproject commit 7cb37daf4f30a46f5e030c465e49ca74d506065e diff --git a/dss-minio b/dss-minio index a36fcb7..d5b210d 160000 --- a/dss-minio +++ b/dss-minio @@ -1 +1 @@ -Subproject commit a36fcb7307460809ba61932de12940c3d30ad43c +Subproject commit d5b210daa0dc72eb422c90a7dbea5ea695a17ded From d590e102ba278b8e8e258e54976a553b2f39f677 Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Tue, 7 Nov 2023 16:24:31 -0800 Subject: [PATCH 05/10] add golang to support s3-bench build --- scripts/docker/DSS.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/docker/DSS.Dockerfile b/scripts/docker/DSS.Dockerfile index 0a95f1a..c6c6b9e 100644 --- a/scripts/docker/DSS.Dockerfile +++ b/scripts/docker/DSS.Dockerfile @@ -24,6 +24,7 @@ RUN set -eux \ git \ glibc-devel \ gmp-devel \ + golang \ jemalloc-devel \ Judy-devel \ libaio-devel \ From 24edfbbab94eaf0efcb419d54bcd8a91f568b04d Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Tue, 7 Nov 2023 16:24:42 -0800 Subject: [PATCH 06/10] remove yum steps --- scripts/build_dss-client.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/build_dss-client.sh b/scripts/build_dss-client.sh index ccacdf9..b6ed2ec 100755 --- a/scripts/build_dss-client.sh +++ b/scripts/build_dss-client.sh @@ -39,9 +39,6 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Check for submodules in update init recursive if missing checksubmodules -# Install S3-Benchmark dependencies -sudo yum install "$(cat "$S3_BENCHMARK_DIR"/dependencies.txt)" -y - # Build DSS Client Library "$DSS_CLIENT_DIR/scripts/build.sh" From 8a3aa007b2d6d63c15dad20ed95a9032e2c5c145 Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Tue, 7 Nov 2023 16:25:17 -0800 Subject: [PATCH 07/10] update ansible commit id --- dss-ansible | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dss-ansible b/dss-ansible index 2f550e8..563ab6a 160000 --- a/dss-ansible +++ b/dss-ansible @@ -1 +1 @@ -Subproject commit 2f550e8c606d2a714dba2003a8c9fc15db91fb4b +Subproject commit 563ab6ab8dd473292e6d48a2f76cab52ac83b1ce From 504cca96d25564d5e386f27e7981bec15ece3d15 Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Tue, 7 Nov 2023 16:26:04 -0800 Subject: [PATCH 08/10] Build client with user-mode --- scripts/docker/build_dss-client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker/build_dss-client.sh b/scripts/docker/build_dss-client.sh index 3f59674..e55a6cc 100755 --- a/scripts/docker/build_dss-client.sh +++ b/scripts/docker/build_dss-client.sh @@ -3,4 +3,4 @@ set -e # Build aws-sdk-cpp in Docker DOCKER_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -"$DOCKER_DIR"/build_docker.sh -c dss-client -d DSS -t dssbuild -a 'dss_client-*.tgz' +"$DOCKER_DIR"/build_docker.sh -c dss-client -d DSS -t dssbuild -a 'dss_client-*.tgz' -u From 8ef601b69fb8020788e50f6a8c77a96e2d039cb5 Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Fri, 10 Nov 2023 10:50:53 -0800 Subject: [PATCH 09/10] update commit IDs --- dss-ansible | 2 +- dss-ecosystem | 2 +- dss-minio | 2 +- dss-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dss-ansible b/dss-ansible index 563ab6a..e227447 160000 --- a/dss-ansible +++ b/dss-ansible @@ -1 +1 @@ -Subproject commit 563ab6ab8dd473292e6d48a2f76cab52ac83b1ce +Subproject commit e22744749dea4eda01234a8c64bb9f6699bd87c2 diff --git a/dss-ecosystem b/dss-ecosystem index 7cb37da..b74f1b1 160000 --- a/dss-ecosystem +++ b/dss-ecosystem @@ -1 +1 @@ -Subproject commit 7cb37daf4f30a46f5e030c465e49ca74d506065e +Subproject commit b74f1b167b6500f1837877276563e3206ef095dd diff --git a/dss-minio b/dss-minio index d5b210d..df81c52 160000 --- a/dss-minio +++ b/dss-minio @@ -1 +1 @@ -Subproject commit d5b210daa0dc72eb422c90a7dbea5ea695a17ded +Subproject commit df81c52cc48b3234c4f591f6d646a94046b1b589 diff --git a/dss-sdk b/dss-sdk index 20df06d..b654c03 160000 --- a/dss-sdk +++ b/dss-sdk @@ -1 +1 @@ -Subproject commit 20df06d97567ccdb0fc9e0f5791f420ed8c322e9 +Subproject commit b654c033a41d09292e9503eb3fa359bb159e5bdd From 53c88f3d802d9bae8d755c3eef3ca2e17f669c5b Mon Sep 17 00:00:00 2001 From: Matthew Durand Date: Fri, 10 Nov 2023 14:43:08 -0800 Subject: [PATCH 10/10] revert util var --- scripts/utils.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/utils.sh b/scripts/utils.sh index d14b648..de19f0e 100755 --- a/scripts/utils.sh +++ b/scripts/utils.sh @@ -41,7 +41,6 @@ export ARTIFACTS_DIR="$ANSIBLE_DIR/artifacts" export DSS_ECOSYSTEM_DIR="$DSS_DIR/dss-ecosystem" export DSS_CLIENT_DIR="$DSS_ECOSYSTEM_DIR/dss_client" export DATAMOVER_DIR="$DSS_ECOSYSTEM_DIR/dss_datamover" -export S3_BENCHMARK_DIR="$DSS_ECOSYSTEM_DIR/dss_s3benchmark" export DSS_SDK_DIR="$DSS_DIR/dss-sdk" export BUILD_STAGING_DIR="$HOME/workspace" export MINIO_DIR="$DSS_DIR/dss-minio"