Author SHA1 Message Date
Lyncoln 3d1714d995 Remove legacy monitor shadow execution 2026-09-18 15:13:13 -04:00
+7 -17
View File
@@ -54,12 +54,12 @@ mc_promotion_score_from_monitor()
} }
# managed-containerd is authoritative for recurring monitor/status results. # managed-containerd is authoritative for recurring monitor/status results.
# The legacy application monitor remains temporarily available as a shadow # The packaged application monitor is used only when managed-containerd
# comparison only. Promotion scoring is still supplied by the existing # explicitly delegates monitoring to the container backend. Promotion scoring
# application scoring hook during this migration stage. # remains supplied by the existing application scoring hook.
mc_promotion_monitor() mc_promotion_monitor()
{ {
local monitor_rc legacy_rc proxy_result proxy_rc cached_rc local monitor_rc proxy_result proxy_rc cached_rc
proxy_result="$(mc_proxy_monitor)" proxy_result="$(mc_proxy_monitor)"
proxy_rc=$? proxy_rc=$?
@@ -91,13 +91,6 @@ mc_promotion_monitor()
ocf_log warn \ ocf_log warn \
"managed-containerd unavailable; using recent cached authoritative rc=${monitor_rc} for bounded control-plane grace" "managed-containerd unavailable; using recent cached authoritative rc=${monitor_rc} for bounded control-plane grace"
mc_application_monitor
legacy_rc=$?
mc_proxy_legacy_shadow_monitor \
"${monitor_rc}" \
"${legacy_rc}" || true
return "${monitor_rc}" return "${monitor_rc}"
fi fi
@@ -200,12 +193,9 @@ EOF
ocf_log info "managed-containerd authoritative monitor: resource=${OCF_RESOURCE_INSTANCE:-unknown} proxy=${proxy_result}" ocf_log info "managed-containerd authoritative monitor: resource=${OCF_RESOURCE_INSTANCE:-unknown} proxy=${proxy_result}"
# Legacy PostgreSQL monitoring remains observational only. # The daemon-native monitor is authoritative. The packaged application
mc_application_monitor # monitor is invoked only when managed-containerd explicitly delegates to
legacy_rc=$? # the container backend.
mc_proxy_legacy_shadow_monitor "${monitor_rc}" "${legacy_rc}" || true
mc_promotion_score_from_monitor "${monitor_rc}" || true mc_promotion_score_from_monitor "${monitor_rc}" || true
return "${monitor_rc}" return "${monitor_rc}"
} }