You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/03/26 09:11:53 UTC
ambari git commit: AMBARI-10204 Strange template with puppet-style
markup exists in service scripts (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk f3359f526 -> 4f5f3d1dd
AMBARI-10204 Strange template with puppet-style markup exists in service scripts (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f5f3d1d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f5f3d1d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f5f3d1d
Branch: refs/heads/trunk
Commit: 4f5f3d1dd4082d76f3aff0290c072ad88be0fb14
Parents: f3359f5
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Mar 26 10:11:37 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Mar 26 10:11:37 2015 +0200
----------------------------------------------------------------------
.../scripts/shared_initialization.py | 6 +-
.../before-START/templates/health_check-v2.j2 | 81 --------------------
.../before-START/templates/health_check.j2 | 32 +-------
.../hooks/before-START/test_before_start.py | 6 +-
4 files changed, 8 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f5f3d1d/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index b6d2ba2..bd5c228 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -66,10 +66,10 @@ def setup_hadoop():
content=Template('commons-logging.properties.j2')
)
- health_check_template = "health_check-v2" #for stack 1 use 'health_check'
- File(os.path.join(params.hadoop_conf_dir, "health_check"),
+ health_check_template_name = "health_check"
+ File(os.path.join(params.hadoop_conf_dir, health_check_template_name),
owner=tc_owner,
- content=Template(health_check_template + ".j2")
+ content=Template(health_check_template_name + ".j2")
)
log4j_filename = os.path.join(params.hadoop_conf_dir, "log4j.properties")
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f5f3d1d/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check-v2.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check-v2.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check-v2.j2
deleted file mode 100644
index 0a03d17..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check-v2.j2
+++ /dev/null
@@ -1,81 +0,0 @@
-{#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#}
-
-#!/bin/bash
-#
-#/*
-# * Licensed to the Apache Software Foundation (ASF) under one
-# * or more contributor license agreements. See the NOTICE file
-# * distributed with this work for additional information
-# * regarding copyright ownership. The ASF licenses this file
-# * to you under the Apache License, Version 2.0 (the
-# * "License"); you may not use this file except in compliance
-# * with the License. You may obtain a copy of the License at
-# *
-# * http://www.apache.org/licenses/LICENSE-2.0
-# *
-# * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# */
-
-err=0;
-
-function check_disks {
-
- for m in `awk '$3~/ext3/ {printf" %s ",$2}' /etc/fstab` ; do
- fsdev=""
- fsdev=`awk -v m=$m '$2==m {print $1}' /proc/mounts`;
- if [ -z "$fsdev" -a "$m" != "/mnt" ] ; then
- msg_="$msg_ $m(u)"
- else
- msg_="$msg_`awk -v m=$m '$2==m { if ( $4 ~ /^ro,/ ) {printf"%s(ro)",$2 } ; }' /proc/mounts`"
- fi
- done
-
- if [ -z "$msg_" ] ; then
- echo "disks ok" ; exit 0
- else
- echo "$msg_" ; exit 2
- fi
-
-}
-
-# Run all checks
-for check in disks ; do
- msg=`check_${check}` ;
- if [ $? -eq 0 ] ; then
- ok_msg="$ok_msg$msg,"
- else
- err_msg="$err_msg$msg,"
- fi
-done
-
-if [ ! -z "$err_msg" ] ; then
- echo -n "ERROR $err_msg "
-fi
-if [ ! -z "$ok_msg" ] ; then
- echo -n "OK: $ok_msg"
-fi
-
-echo
-
-# Success!
-exit 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f5f3d1d/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check.j2
index 1e47a3c..0a03d17 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/health_check.j2
@@ -43,7 +43,7 @@ function check_disks {
for m in `awk '$3~/ext3/ {printf" %s ",$2}' /etc/fstab` ; do
fsdev=""
fsdev=`awk -v m=$m '$2==m {print $1}' /proc/mounts`;
- if [ -z "$fsdev" ] ; then
+ if [ -z "$fsdev" -a "$m" != "/mnt" ] ; then
msg_="$msg_ $m(u)"
else
msg_="$msg_`awk -v m=$m '$2==m { if ( $4 ~ /^ro,/ ) {printf"%s(ro)",$2 } ; }' /proc/mounts`"
@@ -58,36 +58,8 @@ function check_disks {
}
-function check_taskcontroller {
- if [ "<%=scope.function_hdp_template_var("::hdp::params::security_enabled")%>" == "true" ]; then
- perm=`stat -c %a:%U:%G <%=scope.function_hdp_template_var("task_bin_exe")%> 2>/dev/null`
- if [ $? -eq 0 ] && [ "$perm" == "6050:root:hadoop" ] ; then
- echo "taskcontroller ok"
- else
- echo 'check taskcontroller' ; exit 1
- fi
- fi
-}
-
-function check_jetty {
- hname=`hostname`
- jmx=`curl -s -S -m 5 "http://$hname:<%=scope.function_hdp_template_var("::hdp::tasktracker_port")%>/jmx?qry=Hadoop:service=TaskTracker,name=ShuffleServerMetrics" 2>/dev/null` ;
- if [ $? -eq 0 ] ; then
- e=`echo $jmx | awk '/shuffle_exceptions_caught/ {printf"%d",$2}'` ;
- e=${e:-0} # no jmx servlet ?
- if [ $e -gt 10 ] ; then
- echo "check jetty: shuffle_exceptions=$e" ; exit 1
- else
- echo "jetty ok"
- fi
- else
- echo "check jetty: ping failed" ; exit 1
- fi
-}
-
-
# Run all checks
-for check in disks taskcontroller jetty; do
+for check in disks ; do
msg=`check_${check}` ;
if [ $? -eq 0 ] ; then
ok_msg="$ok_msg$msg,"
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f5f3d1d/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
index f606130..cd0e85a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-START/test_before_start.py
@@ -59,7 +59,7 @@ class TestHookBeforeStart(RMFTestCase):
owner = 'hdfs',
)
self.assertResourceCalled('File', '/etc/hadoop/conf/health_check',
- content = Template('health_check-v2.j2'),
+ content = Template('health_check.j2'),
owner = 'hdfs',
)
self.assertResourceCalled('File',
@@ -120,7 +120,7 @@ class TestHookBeforeStart(RMFTestCase):
owner = 'root',
)
self.assertResourceCalled('File', '/etc/hadoop/conf/health_check',
- content = Template('health_check-v2.j2'),
+ content = Template('health_check.j2'),
owner = 'root',
)
self.assertResourceCalled('File',
@@ -198,7 +198,7 @@ class TestHookBeforeStart(RMFTestCase):
owner = 'hdfs',
)
self.assertResourceCalled('File', '/etc/hadoop/conf/health_check',
- content = Template('health_check-v2.j2'),
+ content = Template('health_check.j2'),
owner = 'hdfs',
)
self.assertResourceCalled('File',