You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/23 13:58:19 UTC

[1/2] git commit: updated refs/heads/master to 2b34df0

Repository: cloudstack
Updated Branches:
  refs/heads/master e15e1f6ac -> 2b34df0da


CLOUDSTACK-8815 : Issues with cloudstack-management init script

instead of using basename use target file.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/734e42d2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/734e42d2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/734e42d2

Branch: refs/heads/master
Commit: 734e42d2b2de1050da4c81a922ce769e020fc0df
Parents: 3ded3e9
Author: Sudhansu <su...@citrix.com>
Authored: Thu Sep 10 19:59:51 2015 +0530
Committer: Sudhansu <su...@citrix.com>
Committed: Mon Sep 28 17:31:07 2015 +0530

----------------------------------------------------------------------
 packaging/centos63/cloud-ipallocator.rc | 2 +-
 packaging/centos63/cloud-management.rc  | 2 +-
 packaging/centos7/cloud-ipallocator.rc  | 2 +-
 packaging/fedora20/cloud-ipallocator.rc | 2 +-
 packaging/fedora20/cloud-management.rc  | 2 +-
 packaging/fedora21/cloud-ipallocator.rc | 2 +-
 packaging/fedora21/cloud-management.rc  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/734e42d2/packaging/centos63/cloud-ipallocator.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-ipallocator.rc b/packaging/centos63/cloud-ipallocator.rc
index d26287d..d3eadec 100755
--- a/packaging/centos63/cloud-ipallocator.rc
+++ b/packaging/centos63/cloud-ipallocator.rc
@@ -25,7 +25,7 @@
 
 # set environment variables
 
-SHORTNAME=`basename $0`
+SHORTNAME="$(basename $(readlink -f $0))"
 PIDFILE=/var/run/"$SHORTNAME".pid
 LOCKFILE=/var/lock/subsys/"$SHORTNAME"
 LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/734e42d2/packaging/centos63/cloud-management.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-management.rc b/packaging/centos63/cloud-management.rc
index 6d28748..f5ed7a8 100755
--- a/packaging/centos63/cloud-management.rc
+++ b/packaging/centos63/cloud-management.rc
@@ -42,7 +42,7 @@ if [ -r /lib/lsb/init-functions ]; then
 fi
 
 
-NAME="$(basename $0)"
+NAME="$(basename $(readlink -f $0))"
 export SERVICE_NAME="$NAME"
 stop() {
 	SHUTDOWN_WAIT="30"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/734e42d2/packaging/centos7/cloud-ipallocator.rc
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud-ipallocator.rc b/packaging/centos7/cloud-ipallocator.rc
index d26287d..d3eadec 100755
--- a/packaging/centos7/cloud-ipallocator.rc
+++ b/packaging/centos7/cloud-ipallocator.rc
@@ -25,7 +25,7 @@
 
 # set environment variables
 
-SHORTNAME=`basename $0`
+SHORTNAME="$(basename $(readlink -f $0))"
 PIDFILE=/var/run/"$SHORTNAME".pid
 LOCKFILE=/var/lock/subsys/"$SHORTNAME"
 LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/734e42d2/packaging/fedora20/cloud-ipallocator.rc
----------------------------------------------------------------------
diff --git a/packaging/fedora20/cloud-ipallocator.rc b/packaging/fedora20/cloud-ipallocator.rc
index d26287d..d3eadec 100755
--- a/packaging/fedora20/cloud-ipallocator.rc
+++ b/packaging/fedora20/cloud-ipallocator.rc
@@ -25,7 +25,7 @@
 
 # set environment variables
 
-SHORTNAME=`basename $0`
+SHORTNAME="$(basename $(readlink -f $0))"
 PIDFILE=/var/run/"$SHORTNAME".pid
 LOCKFILE=/var/lock/subsys/"$SHORTNAME"
 LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/734e42d2/packaging/fedora20/cloud-management.rc
----------------------------------------------------------------------
diff --git a/packaging/fedora20/cloud-management.rc b/packaging/fedora20/cloud-management.rc
index 6d28748..f5ed7a8 100755
--- a/packaging/fedora20/cloud-management.rc
+++ b/packaging/fedora20/cloud-management.rc
@@ -42,7 +42,7 @@ if [ -r /lib/lsb/init-functions ]; then
 fi
 
 
-NAME="$(basename $0)"
+NAME="$(basename $(readlink -f $0))"
 export SERVICE_NAME="$NAME"
 stop() {
 	SHUTDOWN_WAIT="30"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/734e42d2/packaging/fedora21/cloud-ipallocator.rc
----------------------------------------------------------------------
diff --git a/packaging/fedora21/cloud-ipallocator.rc b/packaging/fedora21/cloud-ipallocator.rc
index d26287d..d3eadec 100755
--- a/packaging/fedora21/cloud-ipallocator.rc
+++ b/packaging/fedora21/cloud-ipallocator.rc
@@ -25,7 +25,7 @@
 
 # set environment variables
 
-SHORTNAME=`basename $0`
+SHORTNAME="$(basename $(readlink -f $0))"
 PIDFILE=/var/run/"$SHORTNAME".pid
 LOCKFILE=/var/lock/subsys/"$SHORTNAME"
 LOGFILE=/var/log/cloudstack/ipallocator/ipallocator.log

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/734e42d2/packaging/fedora21/cloud-management.rc
----------------------------------------------------------------------
diff --git a/packaging/fedora21/cloud-management.rc b/packaging/fedora21/cloud-management.rc
index 6d28748..f5ed7a8 100755
--- a/packaging/fedora21/cloud-management.rc
+++ b/packaging/fedora21/cloud-management.rc
@@ -42,7 +42,7 @@ if [ -r /lib/lsb/init-functions ]; then
 fi
 
 
-NAME="$(basename $0)"
+NAME="$(basename $(readlink -f $0))"
 export SERVICE_NAME="$NAME"
 stop() {
 	SHUTDOWN_WAIT="30"

[2/2] git commit: updated refs/heads/master to 2b34df0

Posted by re...@apache.org.
Merge pull request #799 from sudhansu7/CLOUDSTACK-8815

CLOUDSTACK-8815 : Issues with cloudstack-management init script

When a management server is halted or rebooted, the cloudstack-management init script does not successfully kill the associated java process. There will always be an error about "Cannot find PID file". The script should be reworked so that there are no errors and java is killed correctly.

This appears to be due to the script using the basename of the script:

NAME="$(basename $0)"

To look for the pid file:

if [ -f /var/run/$
{NAME}

.pid ]; then

This does work correctly if the script is run directly (basename will be "cloudstack-management", so "cloudstack-management.pid" file is found). However when a server is halted or rebooted, the script is not run directly but via the symlinks in /etc/rc.d/rc0.d/ and /etc/rc.d/rc0.d/, respectively. The symlinks are named "K20cloudstack-management" so the script looks for a pid file named "K20cloudstack-management.pid" which does not exist.

screenshots:

Before fix:
![screen shot 2015-09-10 at 12 33 08 am](https://cloud.githubusercontent.com/assets/1062642/9791113/207412f0-57f7-11e5-8d21-b7ef383747bd.png)

After fix:
![screen shot 2015-09-10 at 5 46 50 pm](https://cloud.githubusercontent.com/assets/1062642/9791136/31c9ca90-57f7-11e5-98c5-9ad18f25788b.png)

* pr/799:
  CLOUDSTACK-8815 : Issues with cloudstack-management init script

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b34df0d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b34df0d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b34df0d

Branch: refs/heads/master
Commit: 2b34df0da49959c5ba6eb694f0469e9e883f2d4d
Parents: e15e1f6 734e42d
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Oct 23 13:57:11 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Oct 23 13:57:11 2015 +0200

----------------------------------------------------------------------
 packaging/centos63/cloud-ipallocator.rc | 2 +-
 packaging/centos63/cloud-management.rc  | 2 +-
 packaging/centos7/cloud-ipallocator.rc  | 2 +-
 packaging/fedora20/cloud-ipallocator.rc | 2 +-
 packaging/fedora20/cloud-management.rc  | 2 +-
 packaging/fedora21/cloud-ipallocator.rc | 2 +-
 packaging/fedora21/cloud-management.rc  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------