Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: Parallelize downloadContainerdWasmShims function / fix download error bug #4126

Merged
merged 34 commits into from
Apr 11, 2024
Merged

perf: Parallelize downloadContainerdWasmShims function / fix download error bug #4126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0f2776b
parallelize downloadContainerdWasmShims
Feb 28, 2024
5638e55
remove redundant variable assignment
Feb 29, 2024
3d9ca71
fix: wasm shims download failure fix
Mar 11, 2024
d7e8371
perf: parallelize downloadContainerdWasmShims function
Mar 11, 2024
573ec8f
fix: remove obsolete wasm shims
Mar 13, 2024
9c44e1b
fix indentation
Mar 13, 2024
fbffe8c
fix: revert shim versions
Mar 13, 2024
4197ae4
fix shim version and indentation
Mar 13, 2024
32bce1b
fix: downloadContainerdWasmShims bug fix
Mar 18, 2024
cd0b202
fix: wasmshims versions
Mar 18, 2024
c5060b4
fix: wasmshims versions
Mar 18, 2024
f6d923a
fix: fix wasmshims version
Mar 18, 2024
cefcd82
chore: add wasmshims versins
Mar 18, 2024
5a79809
fix: indentation
Mar 19, 2024
7e3766f
fix: indentation
Mar 19, 2024
e486527
fix: indentation
Mar 19, 2024
73c9d31
fix: indentation
Mar 19, 2024
bee4abb
fix indentation
Mar 19, 2024
db8f226
fix: indentation
Mar 19, 2024
d4c5d99
fix: indentation
Mar 19, 2024
9f5e8bf
fix: indentation
Mar 19, 2024
737fded
fix indentation
Mar 19, 2024
3c3dd9d
fix: indentation
Mar 19, 2024
6065b81
fix: revert to remote master version of pkg/agent/baker_test.go
Mar 19, 2024
1cdc755
chore: indentation
Mar 21, 2024
69cfd59
chore: generate
Mar 21, 2024
fb9b12c
fix: indentation
Mar 21, 2024
1a3d241
chore: generate
Mar 21, 2024
c737d7f
fix: code style for string comparison
Mar 25, 2024
575859f
chore: generate
Mar 25, 2024
bedd5c9
fix: string comparison operator styling
Apr 2, 2024
866d185
chore: make generate
Apr 2, 2024
c1d581b
perf: remove parallelization
Apr 10, 2024
1fe6c04
fix: revert changes
Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions parts/linux/cloud-init/artifacts/cse_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() {
}

downloadContainerdWasmShims() {
declare -a wasmShimPids=()
for shim_version in $CONTAINERD_WASM_VERSIONS; do
binary_version="$(echo "${shim_version}" | tr . -)"
local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64"
local containerd_wasm_filepath="/usr/local/bin"
local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64"
if [[ $(isARM64) == 1 ]]; then
containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64"
fi

if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT)
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT)
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT)
chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1"
chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1"
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
wasmShimPids+=($!)
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
wasmShimPids+=($!)
if [ "$shim_version" == "v0.8.0" ]; then
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
wasmShimPids+=($!)
fi
fi
done
wait ${wasmShimPids[@]}
for shim_version in $CONTAINERD_WASM_VERSIONS; do
binary_version="$(echo "${shim_version}" | tr . -)"
chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1"
chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1"
if [ "$shim_version" == "v0.8.0" ]; then
chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1"
fi
done
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ write_files:
encoding: gzip
owner: root
content: !!binary |
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

- path: /opt/azure/containers/provision_redact_cloud_config.py
permissions: "0744"
Expand Down
24 changes: 18 additions & 6 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,32 @@ downloadSecureTLSBootstrapKubeletExecPlugin() {
}

downloadContainerdWasmShims() {
declare -a wasmShimPids=()
for shim_version in $CONTAINERD_WASM_VERSIONS; do
binary_version="$(echo "${shim_version}" | tr . -)"
local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64"
local containerd_wasm_filepath="/usr/local/bin"
local containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/amd64"
if [[ $(isARM64) == 1 ]]; then
containerd_wasm_url="https://acs-mirror.azureedge.net/containerd-wasm-shims/${shim_version}/linux/arm64"
fi

if [ ! -f "$containerd_wasm_filepath/containerd-shim-spin-${shim_version}" ] || [ ! -f "$containerd_wasm_filepath/containerd-shim-slight-${shim_version}" ]; then
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT)
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT)
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT)
chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1"
chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1"
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-spin-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
wasmShimPids+=($!)
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-slight-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
wasmShimPids+=($!)
if [ "$shim_version" == "v0.8.0" ]; then
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-wws-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
wasmShimPids+=($!)
fi
fi
done
wait ${wasmShimPids[@]}
for shim_version in $CONTAINERD_WASM_VERSIONS; do
binary_version="$(echo "${shim_version}" | tr . -)"
chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v1"
chmod 755 "$containerd_wasm_filepath/containerd-shim-slight-${binary_version}-v1"
if [ "$shim_version" == "v0.8.0" ]; then
chmod 755 "$containerd_wasm_filepath/containerd-shim-wws-${binary_version}-v1"
fi
done
Expand Down
Loading
Loading