Browse code

[Bug 2002021: Package Behaviors: Update] New: [Photon][1.0][zookeeper]: zookeeper service cannot start

Change-Id: Ia4e28acfdf8788213124bce32787c3b3f2aba6b6
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4324
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Harish Udaiya Kumar authored on 2017/11/16 10:07:16
Showing 2 changed files
... ...
@@ -9,6 +9,8 @@ ExecStart=/usr/bin/zkServer.sh start /etc/zookeeper/zoo.cfg
9 9
 ExecStop=/usr/bin/zkServer.sh stop
10 10
 User=zookeeper
11 11
 Group=hadoop
12
+RuntimeDirectory=zookeeper
13
+RuntimeDirectoryMode=0755
12 14
 Restart=always
13 15
 RestartSec=30
14 16
 
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Highly reliable distributed coordination
2 2
 Name:           zookeeper
3 3
 Version:        3.4.10
4
-Release:        1%{?dist}
4
+Release:        2%{?dist}
5 5
 URL:            http://zookeeper.apache.org/
6 6
 License:        Apache License, Version 2.0
7 7
 Group:          Applications/System
... ...
@@ -29,12 +29,12 @@ mkdir -p %{buildroot}%{_prefix}
29 29
 mkdir -p %{buildroot}%{_bindir}
30 30
 mkdir -p %{buildroot}%{_libdir}/java/zookeeper
31 31
 mkdir -p %{buildroot}%{_libdir}/zookeeper
32
-mkdir -p %{buildroot}%{_var}/log/zookeeper
33 32
 mkdir -p %{buildroot}%{_sysconfdir}/zookeeper
34
-mkdir -p %{buildroot}%{_var}/run/zookeeper
35 33
 mkdir -p %{buildroot}/sbin
36 34
 mkdir -p %{buildroot}%{_prefix}/share/zookeeper/templates/conf
37 35
 mkdir -p %{buildroot}%{_var}/zookeeper
36
+install -vdm 755 %{buildroot}/var/log/zookeeper
37
+install -vdm 755 %{buildroot}/var/run/zookeeper
38 38
 
39 39
 cp zookeeper-%{version}.jar %{buildroot}%{_libdir}/java/zookeeper
40 40
 cp src/packages/update-zookeeper-env.sh %{buildroot}/sbin/update-zookeeper-env.sh
... ...
@@ -59,29 +59,10 @@ getent group hadoop >/dev/null || /usr/sbin/groupadd -r hadoop
59 59
 getent passwd zookeeper >/dev/null || /usr/sbin/useradd --comment "ZooKeeper" --shell /bin/bash -M -r --groups hadoop --home %{_prefix}/share/zookeeper zookeeper
60 60
 
61 61
 %post
62
-if [ $1 -eq 1 ] ; then
63
-    # Initial installation
64
-    # Enabled by default per "runs once then goes away" exception
65
-    bash %{_prefix}/sbin/update-zookeeper-env.sh \
66
-       --prefix=%{_prefix} \
67
-       --conf-dir=%{_sysconfdir}/zookeeper \
68
-       --log-dir=%{_var}/log/zookeeper \
69
-       --pid-dir=%{_var}/run/zookeeper \
70
-       --var-dir=%{_var}/zookeeper
71
-fi
72 62
 %{_sbindir}/ldconfig
73 63
 %systemd_post zookeeper.service
74 64
  
75 65
 %preun
76
-if [ $1 -eq 0 ] ; then
77
-bash %{_prefix}/sbin/update-zookeeper-env.sh \
78
-       --prefix=%{_prefix} \
79
-       --conf-dir=%{_sysconfdir}/zookeeper \
80
-       --log-dir=%{_var}/log/zookeeper \
81
-       --pid-dir=%{_var}/run/zookeeper \
82
-       --var-dir=%{_var}/zookeeper \
83
-       --uninstall
84
-fi
85 66
 %systemd_preun zookeeper.service
86 67
 
87 68
 %postun
... ...
@@ -102,6 +83,8 @@ fi
102 102
 %{_prefix}
103 103
 
104 104
 %changelog
105
+*   Mon Nov 6 2017 Harish Udaiya Kumar<hudaiyakumar@vmware.com> 3.4.10-2
106
+-   Fix zookeeper service startup issue. 
105 107
 *   Mon Nov 6 2017 Harish Udaiya Kumar<hudaiyakumar@vmware.com> 3.4.10-1
106 108
 -   Upgraded to version 3.4.10
107 109
 *   Mon Nov 28 2016 Vinay Kulkarni <kulkarniv@vmware.com> 3.4.9-1