Merge pull request #828 from delphix/revert-822-dlpx/pr/mszak-perforce/9b5244db-c464-4305-bce8-306d3cb9513c

Revert "DLPX-93758 upgrade incorrectly masking already masked service"

Author: mszak-perforce

upgrade/upgrade-scripts/common.sh

@@ -21,11 +21,10 @@ LOG_DIRECTORY="/var/tmp/delphix-upgrade"
 HOTFIX_PATH="/etc/hotfix"
 
 #
-# The virtualization service uses a different umask than the default. Thus to
-# account for the fact that these scripts may be running with a non-default
-# umask, we explicitly change it back to the default value here. This helps
-# ensure any files and directories generated by these scripts, will be created
-# with the correct permissions, regardless of the umask of the calling process.
+# The virtualization service uses a different umask than the default. Thus to account for the
+# fact that these scripts may be running with a non-default umask, we explicitly change it back
+# to the default value here. This helps ensure any files and directories generated by these scripts,
+# will be created with the correct permissions, regardless of the umask of the calling process.
 #
 umask 0022
 
@@ -391,11 +390,16 @@ function mask_service() {
 	fi
 }
 
-function is_svc_not_found_or_disabled() {
+function is_svc_new_or_masked_or_disabled() {
 	local svc="$1"
 
+	systemctl cat "$svc" &>/dev/null
+	if [ $? -eq 1 ]; then
+		return 0
+	fi
+
 	state=$(systemctl is-enabled "$svc")
-	if [[ "$state" == not-found || "$state" == disabled ]]; then
+	if [[ "$state" == masked || "$state" == disabled ]]; then
 		return 0
 	fi
 
@@ -444,12 +448,11 @@ function fix_and_migrate_services() {
 	fi
 
 	#
-	# Due to https://github.com/influxdata/telegraf/issues/14052, telegraf
-	# must be masked after packages are upgraded. The telegraf package
-	# removes /etc/systemd/system/telegraf.service thus reversing the
-	# `systemctl mask` operation performed before the packages are upgraded.
-	# Once this issue is fixed and a version with the fix makes it into the
-	# product, this can be removed.
+	# Due to https://github.com/influxdata/telegraf/issues/14052, telegraf must be masked after
+	# packages are upgraded. The telegraf package removes /etc/systemd/system/telegraf.service thus
+	# reversing the `systemctl mask` operation performed before the packages are upgraded.
+	# Once this issue is fixed and a version with the fix makes it into the product, this can be
+	# removed.
 	#
 	if [[ "$(systemctl is-enabled telegraf)" == enabled ]]; then
 		mask_service telegraf "$container"
@@ -480,17 +483,8 @@ function fix_and_migrate_services() {
 	# or disabled, and that the logic that unmasks them will also
 	# enable them.
 	#
-	# note that once a service is masked, even if it was a "new" service
-	# (i.e. not-found) once masked, it will report as masked. Additionally,
-	# any service, regardless of it being enabled or disabled, will always
-	# report "masked" once it is masked.
-	#
-	# Also note, that up until 2025-4, this code would attempt to mask already
-	# masked services, and if there was a transient problem with service
-	# registration it would fail to re-mask and abort an upgrade. (DLPX-93758)
-	#
 	while read -r svc; do
-		is_svc_not_found_or_disabled "$svc" &&
+		is_svc_new_or_masked_or_disabled "$svc" &&
 			mask_service "$svc" "$container"
 	done <<-EOF
 		delphix-fluentd.service