summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsongyanchao <[email protected]>2024-08-12 06:23:04 +0000
committersongyanchao <[email protected]>2024-08-12 06:23:04 +0000
commitd12bdd13075e28d521c0a5eeda5f9e333518c776 (patch)
tree72d2b5e2bacd255bb6c860cdd9b4d5ebba6680e4
parent96e1b64b3a4b53bf4c0882dbfecddd4796e826f6 (diff)
🐞 fix: Fix issue where Marsio fails to start when deployed independently using RPM.
Fix issue where Marsio fails to start when deployed independently using RPM.
-rw-r--r--service/src/core.c1
-rw-r--r--support/dpdk-21.11.4/dpdk-21.11.4-dpdk-hugepages-path.patch2
-rw-r--r--support/dpdk/dpdk-23.11.1-dpdk-hugepages-path.patch2
-rw-r--r--tools/systemd/mrzcpd.service.in2
4 files changed, 4 insertions, 3 deletions
diff --git a/service/src/core.c b/service/src/core.c
index 111a3b4..04d8917 100644
--- a/service/src/core.c
+++ b/service/src/core.c
@@ -1382,6 +1382,7 @@ int marsio_service_main(int argc, char * argv[])
while (true)
{
sleep(1);
+ sd_notify(0, "WATCHDOG=1");
}
quit:
diff --git a/support/dpdk-21.11.4/dpdk-21.11.4-dpdk-hugepages-path.patch b/support/dpdk-21.11.4/dpdk-21.11.4-dpdk-hugepages-path.patch
index aec7534..426bf1a 100644
--- a/support/dpdk-21.11.4/dpdk-21.11.4-dpdk-hugepages-path.patch
+++ b/support/dpdk-21.11.4/dpdk-21.11.4-dpdk-hugepages-path.patch
@@ -5,7 +5,7 @@
# systemd mount point for huge pages
-HUGE_MOUNT = "/dev/hugepages"
-+HUGE_MOUNT = "/var/run/mrzcpd/huge_pages"
++HUGE_MOUNT = "/var/run/mrzcpd/hugepages"
def fmt_memsize(kb):
diff --git a/support/dpdk/dpdk-23.11.1-dpdk-hugepages-path.patch b/support/dpdk/dpdk-23.11.1-dpdk-hugepages-path.patch
index 540d97b..f1c3b31 100644
--- a/support/dpdk/dpdk-23.11.1-dpdk-hugepages-path.patch
+++ b/support/dpdk/dpdk-23.11.1-dpdk-hugepages-path.patch
@@ -5,7 +5,7 @@
# systemd mount point for huge pages
-HUGE_MOUNT = "/dev/hugepages"
-+HUGE_MOUNT = "/var/run/mrzcpd/huge_pages"
++HUGE_MOUNT = "/var/run/mrzcpd/hugepages"
def fmt_memsize(kb):
diff --git a/tools/systemd/mrzcpd.service.in b/tools/systemd/mrzcpd.service.in
index f0b36d5..34f553f 100644
--- a/tools/systemd/mrzcpd.service.in
+++ b/tools/systemd/mrzcpd.service.in
@@ -8,7 +8,7 @@ Environment=SYSTEMD_LOG_LEVEL=debug
Environment=MLX5_GLUE_PATH=@MR_ALTERNATIVE_LIBDIR@
EnvironmentFile=/etc/sysconfig/mrzcpd
ExecStartPre=python3 @MR_ALTERNATIVE_BINDIR@/devbind.py bind
-ExecStart=@MR_ALTERNATIVE_BINDIR@/mrzcpd -c @CMAKE_INSTALL_PREFIX@/etc/mrglobal.conf
+ExecStart=@MR_ALTERNATIVE_BINDIR@/mrzcpd -c @CMAKE_INSTALL_PREFIX@/etc/mrglobal.conf -s @CMAKE_INSTALL_PREFIX@/etc/mrglobal.dynamic.conf
ExecStopPost=/bin/bash -c 'rm -f /run/mrzcpd/hugepages/rtemap_*'
ExecStopPost=/usr/bin/rm -f /run/.rte_config
ExecStopPost=/usr/bin/rm -f /run/.rte_hugepage_info