packages/storm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix runtime error and uninstall warning

Browse Source 
(cherry picked from commit 9be6d8606cfa18a65e3af8c1ec7cd8dab68ebab3)
This commit is contained in:
sunguoshuai 2021-08-23 11:18:55 +08:00 committed by openeuler-sync-bot
parent abc7dab7cf
commit 216d5c33ba
5 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storm-logviewer.service
View File

@ -3,9 +3,7 @@ Description=Apache Storm logviewer service
After=syslog.target network.target After=syslog.target network.target
[Service] [Service]
User=storm EnvironmentFile=/etc/sysconfig/storm
Group=storm
EnvironmentFile=/etc/sysconfog/storm
ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml logviewer ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml logviewer
Restart=on-failure Restart=on-failure
StandardOutput=syslog StandardOutput=syslog

4
storm-nimbus.service
View File

@ -3,9 +3,7 @@ Description=Apache Storm nimbus service
After=syslog.target network.target After=syslog.target network.target
[Service] [Service]
User=storm EnvironmentFile=/etc/sysconfig/storm
Group=storm
EnvironmentFile=/etc/sysconfog/storm
ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml nimbus ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml nimbus
Restart=on-failure Restart=on-failure
StandardOutput=syslog StandardOutput=syslog

4
storm-supervisor.service
View File

@ -3,9 +3,7 @@ Description=Apache Storm supervisor service
After=syslog.target network.target After=syslog.target network.target
[Service] [Service]
User=storm EnvironmentFile=/etc/sysconfig/storm
Group=storm
EnvironmentFile=/etc/sysconfog/storm
ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml supervisor ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml supervisor
Restart=on-failure Restart=on-failure
StandardOutput=syslog StandardOutput=syslog

4
storm-ui.service
View File

@ -3,9 +3,7 @@ Description=Apache Storm ui service
After=syslog.target network.target After=syslog.target network.target
[Service] [Service]
User=storm EnvironmentFile=/etc/sysconfig/storm
Group=storm
EnvironmentFile=/etc/sysconfog/storm
ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml ui ExecStart=/opt/storm/bin/storm --config /etc/storm/storm.yaml ui
Restart=on-failure Restart=on-failure
StandardOutput=syslog StandardOutput=syslog

21
storm.spec
View File

@ -5,7 +5,7 @@
%define _data_dir %{_sharedstatedir}/storm %define _data_dir %{_sharedstatedir}/storm
Name: storm Name: storm
Version: 1.2.3 Version: 1.2.3
Release: 3 Release: 4
Summary: Apache Storm realtime computation system Summary: Apache Storm realtime computation system
License: Apache-2.0 License: Apache-2.0
Url: http://storm.apache.org Url: http://storm.apache.org
@ -60,21 +60,15 @@ install -p -D -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/storm
install -p -D -m 644 conf/storm.yaml $RPM_BUILD_ROOT%{_conf_dir}/ install -p -D -m 644 conf/storm.yaml $RPM_BUILD_ROOT%{_conf_dir}/
install -p -D -m 644 conf/storm_env.ini $RPM_BUILD_ROOT%{_conf_dir}/ install -p -D -m 644 conf/storm_env.ini $RPM_BUILD_ROOT%{_conf_dir}/
%pre
/usr/bin/getent group storm > /dev/null || /usr/sbin/groupadd -r storm
if ! /usr/bin/getent passwd storm > /dev/null ; then
/usr/sbin/useradd -r -g storm -m -d %{_prefix}/storm -s /bin/bash -c "Storm" storm
fi
%post %post
%systemd_post storm-nimbus.service %systemd_post storm-nimbus.service
%systemd_post storm-supervisor.service %systemd_post storm-supervisor.service
%systemd_post storm-logviewer.service %systemd_post storm-logviewer.service
%systemd_post storm-ui.service %systemd_post storm-ui.service
%postun %preun
for module in nimbus supervisor logviewer ui; do for module in nimbus supervisor logviewer ui; do
systemctl status storm.$module > /dev/null systemctl status storm-$module > /dev/null
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
%systemd_preun storm-$module.service %systemd_preun storm-$module.service
fi fi
@ -89,11 +83,14 @@ done
%config(noreplace) %{_sysconfdir}/logrotate.d/storm %config(noreplace) %{_sysconfdir}/logrotate.d/storm
%config(noreplace) %{_sysconfdir}/sysconfig/storm %config(noreplace) %{_sysconfdir}/sysconfig/storm
%config(noreplace) %{_conf_dir}/* %config(noreplace) %{_conf_dir}/*
%attr(-,storm,storm) %{_prefix}/storm %{_prefix}/storm
%attr(0755,storm,storm) %dir %{_log_dir} %dir %{_log_dir}
%attr(0700,storm,storm) %dir %{_data_dir} %dir %{_data_dir}
%changelog %changelog
* Fri 20 Aug 2021 sunguoshuai <sunguoshuai@huawei.com> 1.2.3 - 4
- Fix runtime error and uninstall warning
* Mon Jun 14 2021 lingsheng <lingsheng@huawei.com> 1.2.3 - 3 * Mon Jun 14 2021 lingsheng <lingsheng@huawei.com> 1.2.3 - 3
- Fix status failure after stopping service - Fix status failure after stopping service