diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2020-09-28 14:12:36 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-09-28 09:17:18 -0700 |
commit | a8bc9fb94f5da7eaed9631634e06e058d613543c (patch) | |
tree | fef94a8e3eff1b02482f89732f0c69a9e0bbbf01 /meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | |
parent | 256d24c6d689123ef30128234ef51db8bdec1d80 (diff) | |
download | meta-openembedded-a8bc9fb94f5da7eaed9631634e06e058d613543c.tar.gz |
minifi-cpp: set the default repositories location to /var/lib
Currently, the provenance repository, flowfile repository and content
repository are created in /var/run/ directory which is mounted as tmpfs.
Since the minifi uses RocksDB repositories with direct IO, we will
encounter an error when restart minifi service:
[org::apache::nifi::minifi::provenance::ProvenanceRepository] [error]
MiNiFi Provenance Repository database open /var/run/minifi/provenance_repository failed: IO error:
While open a file for appending: /var/run/minifi/provenance_repository/000004.sst: Invalid argument
Set the default repositories directory to /var/lib to fix this issue.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb')
-rw-r--r-- | meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index d6f92128c..926dd755b 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | |||
@@ -70,13 +70,14 @@ TARGET_CXXFLAGS_append_riscv64 += "-fpic" | |||
70 | do_install() { | 70 | do_install() { |
71 | DESTDIR='${B}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} | 71 | DESTDIR='${B}/minifi-install' cmake_runcmake_build --target ${OECMAKE_TARGET_INSTALL} |
72 | 72 | ||
73 | MINIFI_BIN=${base_prefix}${bindir} | 73 | MINIFI_BIN=${bindir} |
74 | MINIFI_HOME=${base_prefix}${sysconfdir}/minifi | 74 | MINIFI_HOME=${sysconfdir}/minifi |
75 | MINIFI_RUN=${base_prefix}${localstatedir}/run/minifi | 75 | MINIFI_RUN=${localstatedir}/lib/minifi |
76 | MINIFI_LOG=${base_prefix}${localstatedir}/log/minifi | 76 | MINIFI_LOG=${localstatedir}/log/minifi |
77 | 77 | ||
78 | install -d ${D}${MINIFI_BIN} | 78 | install -d ${D}${MINIFI_BIN} |
79 | install -d ${D}${MINIFI_HOME}/conf | 79 | install -d ${D}${MINIFI_HOME}/conf |
80 | install -m 755 -d ${D}${localstatedir}/lib/minifi | ||
80 | cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ | 81 | cp -a ${B}/minifi-install/usr/bin/* ${D}${MINIFI_BIN}/ |
81 | cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ | 82 | cp -a ${B}/minifi-install/usr/conf/* ${D}${MINIFI_HOME}/conf/ |
82 | 83 | ||
@@ -93,11 +94,11 @@ do_install() { | |||
93 | 94 | ||
94 | sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh | 95 | sed -i 's|export MINIFI_HOME=.*|export MINIFI_HOME='${MINIFI_HOME}'|g' ${D}${MINIFI_BIN}/minifi.sh |
95 | sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh | 96 | sed -i 's|bin_dir=${MINIFI_HOME}/bin|bin_dir='${MINIFI_BIN}'|g' ${D}${MINIFI_BIN}/minifi.sh |
96 | sed -i 's|pid_file=${bin_dir}|pid_file='${MINIFI_RUN}'|g' ${D}${MINIFI_BIN}/minifi.sh | 97 | sed -i 's|pid_file=${bin_dir}/.|pid_file='${localstatedir}/run/'|g' ${D}${MINIFI_BIN}/minifi.sh |
97 | 98 | ||
98 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 99 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
99 | install -d ${D}${sysconfdir}/tmpfiles.d/ | 100 | install -d ${D}${sysconfdir}/tmpfiles.d/ |
100 | install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ | 101 | install -m 0644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf |
101 | install -m 0755 -d ${D}${systemd_unitdir}/system | 102 | install -m 0755 -d ${D}${systemd_unitdir}/system |
102 | install -m 0644 ${WORKDIR}/minifi.service ${D}${systemd_unitdir}/system/ | 103 | install -m 0644 ${WORKDIR}/minifi.service ${D}${systemd_unitdir}/system/ |
103 | 104 | ||
@@ -105,14 +106,12 @@ do_install() { | |||
105 | sed -i 's|@SYSCONFDIR@|${sysconfdir}|g' ${D}${systemd_unitdir}/system/minifi.service | 106 | sed -i 's|@SYSCONFDIR@|${sysconfdir}|g' ${D}${systemd_unitdir}/system/minifi.service |
106 | sed -i 's|@BINDIR@|${bindir}|g' ${D}${systemd_unitdir}/system/minifi.service | 107 | sed -i 's|@BINDIR@|${bindir}|g' ${D}${systemd_unitdir}/system/minifi.service |
107 | 108 | ||
108 | sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf | 109 | sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/minifi.conf |
109 | sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/tmpfiles.d/systemd-volatile.conf | ||
110 | 110 | ||
111 | elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then | 111 | elif ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then |
112 | install -d ${D}${sysconfdir}/default/volatiles | 112 | install -d ${D}${sysconfdir}/default/volatiles |
113 | install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi | 113 | install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi |
114 | 114 | ||
115 | sed -i 's|@MINIFI_RUN@|'${MINIFI_RUN}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi | ||
116 | sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi | 115 | sed -i 's|@MINIFI_LOG@|'${MINIFI_LOG}'|g' ${D}${sysconfdir}/default/volatiles/99_minifi |
117 | fi | 116 | fi |
118 | } | 117 | } |
@@ -126,9 +125,3 @@ pkg_postinst_${PN}() { | |||
126 | fi | 125 | fi |
127 | fi | 126 | fi |
128 | } | 127 | } |
129 | |||
130 | FILES_${PN} = " \ | ||
131 | ${bindir} \ | ||
132 | ${sysconfdir} \ | ||
133 | ${systemd_unitdir} \ | ||
134 | " | ||