pmon: send pulse to hostwd under polling mode

Issue-ID: INF-46
Signed-off-by: Litao Gao <litao.gao@windriver.com>
Change-Id: I7765510f7c3869edc432030cf819f678582bd15d

diff --git a/meta-stx/recipes-core/stx-metal/files/pmon_send_pulse.patch b/meta-stx/recipes-core/stx-metal/files/pmon_send_pulse.patch
new file mode 100644 (file)
index 0000000..4eb8825
--- /dev/null
+++ b/meta-stx/recipes-core/stx-metal/files/pmon_send_pulse.patch
@@ -0,0 +1,30 @@
+diff -ruN a/mtce/src/pmon/pmonHdlr.cpp b/mtce/src/pmon/pmonHdlr.cpp
+--- a/mtce/src/pmon/pmonHdlr.cpp       2020-05-15 14:41:42.271215598 +0000
++++ b/mtce/src/pmon/pmonHdlr.cpp       2020-05-18 07:11:16.126154700 +0000
+@@ -1881,10 +1881,7 @@
+              * we can turn this into a customer alarm/log.
+              * Degrade is acheived by not sending the pulses to the watcher.
+              */
+-            if ( ctrl_ptr->event_mode == true )
+-            {
+-                pmon_send_pulse ( );
+-            }
++            pmon_send_pulse ( );
+         }
+ 
+         /* Avoid pmond thrashing trying to recover processes during
+@@ -1930,11 +1927,9 @@
+             {
+                 hostwd_port_init();
+             }
+-            if ( ctrl_ptr->event_mode == true )
+-            {
+-                pmon_send_hostwd ( );
+-                pmonTimer_hostwd.ring = false;
+-            }
++
++          pmon_send_hostwd ( );
++          pmonTimer_hostwd.ring = false;
+         }
+ 
+         /* Run Get Events by audit timer */

diff --git a/meta-stx/recipes-core/stx-metal/stx-metal.bb b/meta-stx/recipes-core/stx-metal/stx-metal.bb
index 7122565..c7c4042 100644 (file)
--- a/meta-stx/recipes-core/stx-metal/stx-metal.bb
+++ b/meta-stx/recipes-core/stx-metal/stx-metal.bb
@@ -45,6 +45,7 @@ SRC_URI = "git://opendev.org/starlingx/metal.git;protocol=${PROTOCOL};rev=${SRCR
                file://0001-Use-LDFLAGS-when-linking-and-pass-flags-down-to-subm.patch \
                file://0001-stx-metal-remove-argparse-requirement-from-inventory.patch \
                file://stx-warrior-adjust-paths.patch \
+               file://pmon_send_pulse.patch \
                "
 
 inherit setuptools systemd