From 255431f01868d6827cc75ce8636fcdf5c1b536dd Mon Sep 17 00:00:00 2001 From: Sylvain <35365065+sanderegg@users.noreply.github.com> Date: Wed, 15 May 2024 18:04:28 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8FRclone:=20downgrade=20to?= =?UTF-8?q?=201.63.1=20(#5830)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simcore-sdk/src/simcore_sdk/node_ports_common/r_clone.py | 5 ----- scripts/install_rclone.bash | 2 +- .../src/simcore_service_agent/modules/volumes_cleanup/_s3.py | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone.py b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone.py index 116cf0b0baa..6fee4bda267 100644 --- a/packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone.py +++ b/packages/simcore-sdk/src/simcore_sdk/node_ports_common/r_clone.py @@ -172,9 +172,6 @@ async def _get_folder_size( return rclone_folder_size_result.bytes -_DISABLE_RCLONE_MULTI_THREADED: Final[int] = 1 - - async def _sync_sources( r_clone_settings: RCloneSettings, progress_bar: ProgressBarData, @@ -222,8 +219,6 @@ async def _sync_sources( # filter options *_get_exclude_filters(exclude_patterns), "--links", - "--multi-thread-streams", - f"{_DISABLE_RCLONE_MULTI_THREADED}", ) async with progress_bar.sub_progress( diff --git a/scripts/install_rclone.bash b/scripts/install_rclone.bash index f0f6593377f..4b67522b731 100755 --- a/scripts/install_rclone.bash +++ b/scripts/install_rclone.bash @@ -9,7 +9,7 @@ set -o nounset # abort on unbound variable set -o pipefail # don't hide errors within pipes IFS=$'\n\t' -R_CLONE_VERSION="1.66.0" +R_CLONE_VERSION="1.63.1" curl --silent --location --remote-name "https://downloads.rclone.org/v${R_CLONE_VERSION}/rclone-v${R_CLONE_VERSION}-linux-amd64.deb" dpkg --install "rclone-v${R_CLONE_VERSION}-linux-amd64.deb" rm "rclone-v${R_CLONE_VERSION}-linux-amd64.deb" diff --git a/services/agent/src/simcore_service_agent/modules/volumes_cleanup/_s3.py b/services/agent/src/simcore_service_agent/modules/volumes_cleanup/_s3.py index 7f0ec28fba1..8fc5f29e2d3 100644 --- a/services/agent/src/simcore_service_agent/modules/volumes_cleanup/_s3.py +++ b/services/agent/src/simcore_service_agent/modules/volumes_cleanup/_s3.py @@ -114,9 +114,6 @@ def _log_expected_operation( logger.log(log_level, formatted_message) -_DISABLE_RCLONE_MULTI_THREADED: Final[int] = 1 - - async def store_to_s3( # pylint:disable=too-many-locals,too-many-arguments volume_name: str, dyv_volume: dict, @@ -192,8 +189,6 @@ async def store_to_s3( # pylint:disable=too-many-locals,too-many-arguments f"{source_dir}", f"dst:{s3_path}", "--verbose", - "--multi-thread-streams", - f"{_DISABLE_RCLONE_MULTI_THREADED}", ] str_r_clone_sync = _get_r_clone_str_command(r_clone_sync, exclude_files)