Merge branch 'fix/ZSTAC-82619' into '5.5.12'

gitlab · gitlab · commit 80b93d6459c4 · 2026-03-17T07:06:39.000Z
&lt;fix&gt;[conf]: retry rm -rf virtualenv to avoid race with zstack_service_exporter

See merge request zstackio/zstack!9365
diff --git a/conf/tools/install.sh b/conf/tools/install.sh
@@ -39,7 +39,9 @@ ensure_python3_venv() {
     if [ -d "$venv_path" ] && [ -x "$venv_path/bin/python3.11" ]; then
         return 0
     fi
-    rm -rf "$venv_path" && python3.11 -m venv "$venv_path" || exit 1
+    # retry once: rm -rf may fail if zstack_service_exporter is regenerating .pyc concurrently
+    rm -rf "$venv_path" || rm -rf "$venv_path" || exit 1
+    python3.11 -m venv "$venv_path" || exit 1
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,9 @@ ensure_python3_venv() {`
`39`	`39`	`if [ -d "$venv_path" ] && [ -x "$venv_path/bin/python3.11" ]; then`
`40`	`40`	`return 0`
`41`	`41`	`fi`
`42`		`- rm -rf "$venv_path" && python3.11 -m venv "$venv_path" \|\| exit 1`
	`42`	`+ # retry once: rm -rf may fail if zstack_service_exporter is regenerating .pyc concurrently`
	`43`	`+ rm -rf "$venv_path" \|\| rm -rf "$venv_path" \|\| exit 1`
	`44`	`+ python3.11 -m venv "$venv_path" \|\| exit 1`
`43`	`45`	`}`
`44`	`46`
`45`	`47`