You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2013/12/18 17:44:54 UTC
[1/2] git commit: AMBARI-3729. Ganglia monitor started with second or
third attempt on secure cluster (Dmytro Shkvyra via dlysnichenko)
Updated Branches:
refs/heads/branch-1.4.3 fe4412db1 -> 70755b4e7
refs/heads/trunk 11c45419d -> 7fcaee967
AMBARI-3729. Ganglia monitor started with second or third attempt on secure cluster (Dmytro Shkvyra via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7fcaee96
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7fcaee96
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7fcaee96
Branch: refs/heads/trunk
Commit: 7fcaee967c5bc498c53098c37ae6b3668477cf9c
Parents: 11c4541
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Dec 18 17:39:10 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Dec 18 18:42:56 2013 +0200
----------------------------------------------------------------------
.../main/puppet/modules/hdp-ganglia/files/gmondLib.sh | 11 +++++++++++
.../main/puppet/modules/hdp-ganglia/files/startGmond.sh | 2 +-
.../main/puppet/modules/hdp-ganglia/files/stopGmond.sh | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7fcaee96/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
index 87da4dd..6190a78 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
@@ -85,6 +85,17 @@ function getGmondPidFileName()
fi
}
+function removeGmondPidFileName()
+{
+ clusterName=${1};
+ gmondPidFileName=`getGmondPidFileName ${clusterName}`;
+ if [ -e "${gmondPidFileName}" ];
+ then
+ rm -rf ${gmondPidFileName};
+ fi
+}
+
+
function getGmondLoggedPid()
{
gmondPidFile=`getGmondPidFileName ${1}`;
http://git-wip-us.apache.org/repos/asf/ambari/blob/7fcaee96/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
index 239b62e..55420b7 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
@@ -34,7 +34,7 @@ function startGmondForCluster()
if [ -z "${gmondRunningPid}" ]
then
gmondCoreConfFileName=`getGmondCoreConfFileName ${gmondClusterName}`;
-
+ removeGmondPidFileName ${gmondClusterName};
if [ -e "${gmondCoreConfFileName}" ]
then
gmondPidFileName=`getGmondPidFileName ${gmondClusterName}`;
http://git-wip-us.apache.org/repos/asf/ambari/blob/7fcaee96/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
index 1af3eb9..94cfc28 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
@@ -34,6 +34,7 @@ function stopGmondForCluster()
if [ -n "${gmondRunningPid}" ]
then
kill -KILL ${gmondRunningPid};
+ removeGmondPidFileName ${gmondClusterName};
echo "Stopped ${GMOND_BIN} for cluster ${gmondClusterName} (with PID ${gmondRunningPid})";
fi
}
[2/2] git commit: AMBARI-3729. Ganglia monitor started with second or
third attempt on secure cluster (Dmytro Shkvyra via dlysnichenko)
Posted by dm...@apache.org.
AMBARI-3729. Ganglia monitor started with second or third attempt on secure cluster (Dmytro Shkvyra via dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70755b4e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70755b4e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70755b4e
Branch: refs/heads/branch-1.4.3
Commit: 70755b4e7bbcb3bd6ec7bdffa798e8e80d182e0b
Parents: fe4412d
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Wed Dec 18 18:42:12 2013 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Wed Dec 18 18:43:09 2013 +0200
----------------------------------------------------------------------
.../main/puppet/modules/hdp-ganglia/files/gmondLib.sh | 11 +++++++++++
.../main/puppet/modules/hdp-ganglia/files/startGmond.sh | 2 +-
.../main/puppet/modules/hdp-ganglia/files/stopGmond.sh | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/70755b4e/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
index 87da4dd..6190a78 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/gmondLib.sh
@@ -85,6 +85,17 @@ function getGmondPidFileName()
fi
}
+function removeGmondPidFileName()
+{
+ clusterName=${1};
+ gmondPidFileName=`getGmondPidFileName ${clusterName}`;
+ if [ -e "${gmondPidFileName}" ];
+ then
+ rm -rf ${gmondPidFileName};
+ fi
+}
+
+
function getGmondLoggedPid()
{
gmondPidFile=`getGmondPidFileName ${1}`;
http://git-wip-us.apache.org/repos/asf/ambari/blob/70755b4e/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
index 239b62e..55420b7 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/startGmond.sh
@@ -34,7 +34,7 @@ function startGmondForCluster()
if [ -z "${gmondRunningPid}" ]
then
gmondCoreConfFileName=`getGmondCoreConfFileName ${gmondClusterName}`;
-
+ removeGmondPidFileName ${gmondClusterName};
if [ -e "${gmondCoreConfFileName}" ]
then
gmondPidFileName=`getGmondPidFileName ${gmondClusterName}`;
http://git-wip-us.apache.org/repos/asf/ambari/blob/70755b4e/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
index 1af3eb9..94cfc28 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/files/stopGmond.sh
@@ -34,6 +34,7 @@ function stopGmondForCluster()
if [ -n "${gmondRunningPid}" ]
then
kill -KILL ${gmondRunningPid};
+ removeGmondPidFileName ${gmondClusterName};
echo "Stopped ${GMOND_BIN} for cluster ${gmondClusterName} (with PID ${gmondRunningPid})";
fi
}