diff --git a/ocf/loxthelion/managed-container.d/common.sh b/ocf/loxthelion/managed-container.d/common.sh index 4557346..7f0adfd 100755 --- a/ocf/loxthelion/managed-container.d/common.sh +++ b/ocf/loxthelion/managed-container.d/common.sh @@ -54,12 +54,12 @@ mc_promotion_score_from_monitor() } # managed-containerd is authoritative for recurring monitor/status results. -# The legacy application monitor remains temporarily available as a shadow -# comparison only. Promotion scoring is still supplied by the existing -# application scoring hook during this migration stage. +# The packaged application monitor is used only when managed-containerd +# explicitly delegates monitoring to the container backend. Promotion scoring +# remains supplied by the existing application scoring hook. 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_rc=$? @@ -91,13 +91,6 @@ mc_promotion_monitor() ocf_log warn \ "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}" fi @@ -200,12 +193,9 @@ EOF ocf_log info "managed-containerd authoritative monitor: resource=${OCF_RESOURCE_INSTANCE:-unknown} proxy=${proxy_result}" - # Legacy PostgreSQL monitoring remains observational only. - mc_application_monitor - legacy_rc=$? - - mc_proxy_legacy_shadow_monitor "${monitor_rc}" "${legacy_rc}" || true - + # The daemon-native monitor is authoritative. The packaged application + # monitor is invoked only when managed-containerd explicitly delegates to + # the container backend. mc_promotion_score_from_monitor "${monitor_rc}" || true return "${monitor_rc}" }