From 726f5ad343c78e952a1646dcf8c661f391b49845 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Wed, 3 Sep 2025 11:29:48 -0700 Subject: [PATCH 1/3] DLPX-95320 restarting docker service doesn't need to restart mgmt service PR URL: https://www.github.com/delphix/appliance-build/pull/848 --- upgrade/upgrade-scripts/execute | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/upgrade/upgrade-scripts/execute b/upgrade/upgrade-scripts/execute index f69b6056..de82eab4 100755 --- a/upgrade/upgrade-scripts/execute +++ b/upgrade/upgrade-scripts/execute @@ -237,20 +237,6 @@ start_stderr_redirect_to_system_log fix_and_migrate_services -# -# Due to DLPX-77949, docker needs to be masked for the duration -# of the upgrade so that it does not get restarted automatically on -# upgrade, which would also force a restart of the delphix-mgmt -# service (since the latter has a dependency on docker.service), and -# thus interrupt the upgrade. -# -# Once the upgrade is done we restart delphix.target, which will -# attempt to restart both delphix-mgmt and docker, so docker -# needs to be unmasked before that point. As such, docker is -# unmasked at the end of this script. -# -systemctl mask docker.service - # # When an upgrade gets interrupted while it’s in the middle of upgrading # packages, the package manager can get into a state where “dpkg --configure -a” @@ -594,12 +580,6 @@ if [[ "$(systemctl is-enabled ntpsec-rotate-stats.timer)" == enabled ]]; then systemctl mask --now ntpsec-rotate-stats.timer fi -# -# Unmask docker, which was masked at the beginning of the upgrade due -# to DLPX-77949. -# -systemctl unmask docker.service - stop_stdout_redirect_to_system_log stop_stderr_redirect_to_system_log From bd215eb3ac47d2264b2057d9fe3fcfba0e806bcf Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Wed, 3 Sep 2025 11:51:38 -0700 Subject: [PATCH 2/3] Revert "DLPX-95320 restarting docker service doesn't need to restart mgmt service" This reverts commit 726f5ad343c78e952a1646dcf8c661f391b49845. --- upgrade/upgrade-scripts/execute | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/upgrade/upgrade-scripts/execute b/upgrade/upgrade-scripts/execute index de82eab4..f69b6056 100755 --- a/upgrade/upgrade-scripts/execute +++ b/upgrade/upgrade-scripts/execute @@ -237,6 +237,20 @@ start_stderr_redirect_to_system_log fix_and_migrate_services +# +# Due to DLPX-77949, docker needs to be masked for the duration +# of the upgrade so that it does not get restarted automatically on +# upgrade, which would also force a restart of the delphix-mgmt +# service (since the latter has a dependency on docker.service), and +# thus interrupt the upgrade. +# +# Once the upgrade is done we restart delphix.target, which will +# attempt to restart both delphix-mgmt and docker, so docker +# needs to be unmasked before that point. As such, docker is +# unmasked at the end of this script. +# +systemctl mask docker.service + # # When an upgrade gets interrupted while it’s in the middle of upgrading # packages, the package manager can get into a state where “dpkg --configure -a” @@ -580,6 +594,12 @@ if [[ "$(systemctl is-enabled ntpsec-rotate-stats.timer)" == enabled ]]; then systemctl mask --now ntpsec-rotate-stats.timer fi +# +# Unmask docker, which was masked at the beginning of the upgrade due +# to DLPX-77949. +# +systemctl unmask docker.service + stop_stdout_redirect_to_system_log stop_stderr_redirect_to_system_log From 2534d4cc6a5d4fd0c944e5c8f31b7a2373875771 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Wed, 3 Sep 2025 11:57:06 -0700 Subject: [PATCH 3/3] DLPX-95320 restarting docker service doesn't need to restart mgmt service --- upgrade/upgrade-scripts/execute | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/upgrade/upgrade-scripts/execute b/upgrade/upgrade-scripts/execute index f69b6056..43dfc9d5 100755 --- a/upgrade/upgrade-scripts/execute +++ b/upgrade/upgrade-scripts/execute @@ -249,7 +249,12 @@ fix_and_migrate_services # needs to be unmasked before that point. As such, docker is # unmasked at the end of this script. # -systemctl mask docker.service +# We've removed the need to mask the docker service in 2025.6.0.0. +# +if [[ -n "$CURRENT_VERSION" ]] && + compare_versions "$CURRENT_VERSION" "lt" "2025.6.0.0-0"; then + systemctl mask docker.service +fi # # When an upgrade gets interrupted while it’s in the middle of upgrading @@ -598,7 +603,12 @@ fi # Unmask docker, which was masked at the beginning of the upgrade due # to DLPX-77949. # -systemctl unmask docker.service +# We've removed the need to mask the docker service in 2025.6.0.0. +# +if [[ -n "$CURRENT_VERSION" ]] && + compare_versions "$CURRENT_VERSION" "lt" "2025.6.0.0-0"; then + systemctl unmask docker.service +fi stop_stdout_redirect_to_system_log stop_stderr_redirect_to_system_log