You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/03/29 09:39:28 UTC
bigtop git commit: BIGTOP-2367. QFS packages do not handle
/var/run/qfs properly
Repository: bigtop
Updated Branches:
refs/heads/master bcf8b390f -> 87e3c42b0
BIGTOP-2367. QFS packages do not handle /var/run/qfs properly
Signed-off-by: Olaf Flebbe <of...@fleb.be>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/87e3c42b
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/87e3c42b
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/87e3c42b
Branch: refs/heads/master
Commit: 87e3c42b0ae935a463fbe3740c5dbbe54bf1987b
Parents: bcf8b39
Author: Faraaz Sareshwala <fs...@quantcast.com>
Authored: Mon Mar 28 17:46:20 2016 -0700
Committer: Olaf Flebbe <of...@fleb.be>
Committed: Tue Mar 29 09:37:16 2016 +0200
----------------------------------------------------------------------
bigtop-packages/src/common/qfs/install_qfs.sh | 1 -
bigtop-packages/src/common/qfs/qfs-chunkserver.svc | 7 ++++++-
bigtop-packages/src/common/qfs/qfs-metaserver.svc | 7 ++++++-
bigtop-packages/src/common/qfs/qfs-webui.svc | 7 ++++++-
bigtop-packages/src/deb/qfs/qfs-chunkserver.postinst | 1 -
bigtop-packages/src/deb/qfs/qfs-metaserver.postinst | 1 -
bigtop-packages/src/deb/qfs/qfs-webui.postinst | 1 -
7 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/87e3c42b/bigtop-packages/src/common/qfs/install_qfs.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/qfs/install_qfs.sh b/bigtop-packages/src/common/qfs/install_qfs.sh
index 6e7eb7d..b6cca00 100644
--- a/bigtop-packages/src/common/qfs/install_qfs.sh
+++ b/bigtop-packages/src/common/qfs/install_qfs.sh
@@ -237,5 +237,4 @@ cd ..
mkdir -p $VAR_DIR/metaserver/checkpoint
mkdir -p $VAR_DIR/log/qfs
-mkdir -p $VAR_DIR/run/qfs
mkdir -p $VAR_DIR/lib/qfs
http://git-wip-us.apache.org/repos/asf/bigtop/blob/87e3c42b/bigtop-packages/src/common/qfs/qfs-chunkserver.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/qfs/qfs-chunkserver.svc b/bigtop-packages/src/common/qfs/qfs-chunkserver.svc
index 304d9cf..881c246 100644
--- a/bigtop-packages/src/common/qfs/qfs-chunkserver.svc
+++ b/bigtop-packages/src/common/qfs/qfs-chunkserver.svc
@@ -40,7 +40,12 @@ start() {
echo "Starting $DESC: "
- mkdir -p $(dirname $PIDFILE)
+ # Debian doesn't like us to package anything inside /var/run. We create the
+ # directory here and set permissions as necessary for both debian and rpm
+ mkdir -p /var/run/qfs
+ chown qfs:qfs -R /var/run/qfs
+ chmod 755 /var/run/qfs
+
su -s /bin/bash $SVC_USER -c "cd $WORKING_DIR && nohup $EXEC_PATH $CONF_DIR/$CONF_FILE > $LOGFILE 2>&1 < /dev/null & "'echo $! '"> $PIDFILE"
sleep 3
http://git-wip-us.apache.org/repos/asf/bigtop/blob/87e3c42b/bigtop-packages/src/common/qfs/qfs-metaserver.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/qfs/qfs-metaserver.svc b/bigtop-packages/src/common/qfs/qfs-metaserver.svc
index 69b8170..706f153 100644
--- a/bigtop-packages/src/common/qfs/qfs-metaserver.svc
+++ b/bigtop-packages/src/common/qfs/qfs-metaserver.svc
@@ -40,7 +40,12 @@ start() {
echo "Starting $DESC: "
- mkdir -p $(dirname $PIDFILE)
+ # Debian doesn't like us to package anything inside /var/run. We create the
+ # directory here and set permissions as necessary for both debian and rpm
+ mkdir -p /var/run/qfs
+ chown qfs:qfs -R /var/run/qfs
+ chmod 755 /var/run/qfs
+
su -s /bin/bash $SVC_USER -c "cd $WORKING_DIR && nohup $EXEC_PATH $CONF_DIR/$CONF_FILE > $LOGFILE 2>&1 < /dev/null & "'echo $! '"> $PIDFILE"
sleep 3
http://git-wip-us.apache.org/repos/asf/bigtop/blob/87e3c42b/bigtop-packages/src/common/qfs/qfs-webui.svc
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/qfs/qfs-webui.svc b/bigtop-packages/src/common/qfs/qfs-webui.svc
index 04add6d..8cc0482 100644
--- a/bigtop-packages/src/common/qfs/qfs-webui.svc
+++ b/bigtop-packages/src/common/qfs/qfs-webui.svc
@@ -40,7 +40,12 @@ start() {
echo "Starting $DESC: "
- mkdir -p $(dirname $PIDFILE)
+ # Debian doesn't like us to package anything inside /var/run. We create the
+ # directory here and set permissions as necessary for both debian and rpm
+ mkdir -p /var/run/qfs
+ chown qfs:qfs -R /var/run/qfs
+ chmod 755 /var/run/qfs
+
su -s /bin/bash $SVC_USER -c "cd $WORKING_DIR && nohup $EXEC_PATH $CONF_DIR/$CONF_FILE > $LOGFILE 2>&1 < /dev/null & "'echo $! '"> $PIDFILE"
sleep 3
http://git-wip-us.apache.org/repos/asf/bigtop/blob/87e3c42b/bigtop-packages/src/deb/qfs/qfs-chunkserver.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/qfs/qfs-chunkserver.postinst b/bigtop-packages/src/deb/qfs/qfs-chunkserver.postinst
index 40b5ea5..ee7c493 100644
--- a/bigtop-packages/src/deb/qfs/qfs-chunkserver.postinst
+++ b/bigtop-packages/src/deb/qfs/qfs-chunkserver.postinst
@@ -21,7 +21,6 @@ case "$1" in
configure)
update-rc.d qfs-chunkserver defaults >/dev/null || exit 1
chown qfs:qfs -R /var/log/qfs
- chown qfs:qfs -R /var/run/qfs
chown qfs:qfs -R /var/lib/qfs
;;
abort-upgrade|abort-remove|abort-deconfigure)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/87e3c42b/bigtop-packages/src/deb/qfs/qfs-metaserver.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/qfs/qfs-metaserver.postinst b/bigtop-packages/src/deb/qfs/qfs-metaserver.postinst
index f10e01d..597db81 100644
--- a/bigtop-packages/src/deb/qfs/qfs-metaserver.postinst
+++ b/bigtop-packages/src/deb/qfs/qfs-metaserver.postinst
@@ -21,7 +21,6 @@ case "$1" in
configure)
update-rc.d qfs-metaserver defaults >/dev/null || exit 1
chown qfs:qfs -R /var/log/qfs
- chown qfs:qfs -R /var/run/qfs
chown qfs:qfs -R /var/lib/qfs
;;
abort-upgrade|abort-remove|abort-deconfigure)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/87e3c42b/bigtop-packages/src/deb/qfs/qfs-webui.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/qfs/qfs-webui.postinst b/bigtop-packages/src/deb/qfs/qfs-webui.postinst
index 0b0cb5c..69e1c90 100644
--- a/bigtop-packages/src/deb/qfs/qfs-webui.postinst
+++ b/bigtop-packages/src/deb/qfs/qfs-webui.postinst
@@ -21,7 +21,6 @@ case "$1" in
configure)
update-rc.d qfs-webui defaults >/dev/null || exit 1
chown qfs:qfs -R /var/log/qfs
- chown qfs:qfs -R /var/run/qfs
chown qfs:qfs -R /var/lib/qfs
;;
abort-upgrade|abort-remove|abort-deconfigure)