Branch 1.2.5

ambari-agent/conf/unix/ambari-agent

@@ -26,7 +26,7 @@ AMBARI_AGENT=ambari-agent
 PIDFILE=/var/run/ambari-agent/$AMBARI_AGENT.pid
 OUTFILE=/var/log/ambari-agent/ambari-agent.out
 LOGFILE=/var/log/ambari-agent/ambari-agent.log
-AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py
+AGENT_SCRIPT=/usr/sbin/ambari-agent.py
 OK=1
 NOTOK=0
 
@@ -65,27 +65,8 @@ export AMBARI_PASSPHRASE=$RESOLVED_AMBARI_PASSPHRASE
 
 #echo $AMBARI_PASSPHRASE
 
-# check for version
-check_python_version ()
-{
-  echo "Verifying Python version compatibility..."
-  majversion=`$PYTHON -V 2>&1 | awk '{print $2}' | cut -d'.' -f1`
-  minversion=`$PYTHON -V 2>&1 | awk '{print $2}' | cut -d'.' -f2`
-  numversion=$(( 10 * $majversion + $minversion))
-  if (( $numversion < 26 )); then
-    echo "ERROR: Found Python version $majversion.$minversion. Ambari Agent requires Python version > 2.6"
-    return $NOTOK
-  fi
-  echo "Using python " $PYTHON
-  return $OK
-}
-
 case "$1" in
   start)
-        check_python_version
-        if [ "$?" -eq "$NOTOK" ]; then
-          exit -1
-        fi
         echo "Checking for previously running Ambari Agent..."
         if [ -f $PIDFILE ]; then
           PID=`cat $PIDFILE`
@@ -101,7 +82,7 @@ case "$1" in
           fi
         fi
         echo "Starting ambari-agent"
-        nohup $PYTHON $AGENT_SCRIPT > $OUTFILE 2>&1 &
+        nohup $AGENT_SCRIPT > $OUTFILE 2>&1 &
         sleep 2
         PID=$!
         echo "Verifying $AMBARI_AGENT process status..."
@@ -138,10 +119,6 @@ case "$1" in
         fi
         ;;
   stop)
-        check_python_version
-        if [ "$?" -eq "$NOTOK" ]; then
-          exit -1
-        fi
         if [ -f $PIDFILE ]; then
           PID=`cat $PIDFILE`
           echo "Found $AMBARI_AGENT PID: $PID"
@@ -151,7 +128,7 @@ case "$1" in
             tput sgr0
           else
             echo "Stopping $AMBARI_AGENT"
-            $PYTHON $AGENT_SCRIPT stop
+            $AGENT_SCRIPT stop
           fi
           echo "Removing PID file at $PIDFILE"
           rm -f $PIDFILE

ambari-agent/pom.xml

@@ -31,6 +31,9 @@
   <description>Ambari Agent</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <python.ver>2.6</python.ver>
+    <python.exec>python2</python.exec>
+    <python.requires>python &gt;= ${python.ver}</python.requires>
     <final.name>${project.artifactId}-${project.version}</final.name>
     <package.release>1</package.release>
     <package.prefix>/usr</package.prefix>
@@ -39,10 +42,9 @@
     <skipTests>false</skipTests>
     <facter.tar>http://downloads.puppetlabs.com/facter/facter-1.6.10.tar.gz</facter.tar>
     <puppet.tar>http://downloads.puppetlabs.com/puppet/puppet-2.7.9.tar.gz</puppet.tar>
-    <install.dir>/usr/lib/python2.6/site-packages/ambari_agent</install.dir>
+    <agent.install.dir>/usr/lib/python${python.ver}/site-packages/ambari_agent</agent.install.dir>
     <ruby.tar>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz</ruby.tar>
     <lib.dir>/usr/lib/ambari-agent/lib</lib.dir>
-    <python.ver>python &gt;= 2.6</python.ver>
   </properties>
   <profiles>
     <profile>
@@ -89,7 +91,7 @@
         <executions>
           <execution>
             <configuration>
-              <executable>python2.6</executable>
+              <executable>python</executable>
               <workingDirectory>src/test/python</workingDirectory>
               <arguments>
                 <argument>unitTests.py</argument>
@@ -107,7 +109,7 @@
           </execution>
           <execution>
             <configuration>
-              <executable>python2.6</executable>
+              <executable>python</executable>
               <workingDirectory>target/ambari-agent-${project.version}</workingDirectory>
               <arguments>
                 <argument>${project.basedir}/src/main/python/setup.py</argument>
@@ -146,7 +148,7 @@
           <requires>
             <require>openssl</require>
             <require>zlib</require>
-            <require>${python.ver}</require>
+            <require>${python.requires}</require>
           </requires>
           <postinstallScriptlet>
             <scriptFile>src/main/package/rpm/postinstall.sh</scriptFile>
@@ -165,7 +167,7 @@
           <autoRequires>false</autoRequires>
           <mappings>
             <mapping>
-              <directory>${install.dir}</directory>
+              <directory>${agent.install.dir}</directory>
               <sources>
                 <source>
                   <location>${project.build.directory}/${project.artifactId}-${project.version}/ambari_agent</location>
@@ -236,6 +238,12 @@
                 <source>
                   <location>conf/unix/ambari-agent</location>
                 </source>
+                <source>
+                  <location>src/main/python/ambari-agent.py</location>
+                </source>
+                <source>
+                  <location>src/main/python/ambari-machine</location>
+                </source>
               </sources>
             </mapping>
             <mapping>

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hcfs.pp

@@ -0,0 +1,36 @@
+#
+#
+# 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.
+#
+#
+class hdp-hadoop::hcfs_client(
+  $service_state = $hdp::params::cluster_client_state,
+  $opts = {}
+) inherits hdp-hadoop::params
+{
+  $hdp::params::service_exists['hdp-hadoop::hcfs_client'] = true
+  Hdp-hadoop::Common<||>{service_states +> $service_state}
+  Hdp-hadoop::Package<||>{include_64_bit => true}
+  Hdp-hadoop::Configfile<||>{sizes +> 64}
+
+  if ($service_state == 'no_op') {
+  } elsif ($service_state in ['running','stopped','installed_and_configured','uninstalled']) {
+  	#adds package, users and directories, and common hadoop configs
+  	include hdp-hadoop::initialize
+  }
+}

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/hcfs_service_check.pp

@@ -0,0 +1,26 @@
+#
+#
+# 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.
+#
+#
+class hdp-hadoop::hcfs_service_check(
+  $service_state = $hdp::params::cluster_client_state
+) inherits hdp-hadoop::params
+{
+  $hdp::params::service_exists['hdp-hadoop::hcfs'] = true
+}

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp

@@ -229,7 +229,7 @@
     hdp::user{ $hdfs_user:
       groups => [$hdp::params::user_group]
     }
-    if ($hdfs_user != $mapred_user) {
+    if ( !defined(hdp::user[$mapred_user]) ) {
       hdp::user { $mapred_user:
         groups => [$hdp::params::user_group]
       }

ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/params.pp

@@ -54,7 +54,7 @@
   $dtnode_heapsize = hdp_default("dtnode_heapsize","1024m")
   $ttnode_heapsize = hdp_default("ttnode_heapsize","1024m")
 
-  $hadoop_heapsize = hdp_default("hadoop_heapsize","1024m")
+  $hadoop_heapsize = hdp_default("hadoop_heapsize","1024")
 
   $hdfs_log_dir_prefix = hdp_default("hdfs_log_dir_prefix","/var/log/hadoop")
 

ambari-agent/src/main/puppet/modules/hdp-yarn/files/validateYarnComponentStatus.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp

@@ -267,7 +267,7 @@
   $dfs_data_dir = hdp_default("hdfs-site/dfs.data.dir","/tmp/hadoop-hdfs/dfs/data")
 
   ### artifact dir
-  $artifact_dir = hdp_default("artifact_dir","/tmp/HDP-artifacts/")
+  $artifact_dir = hdp_default("artifact_dir","/tmp/HDP-artifacts")
 
   ### artifacts download url ##
   $apache_artifacts_download_url = hdp_default("apache_artifacts_download_url","")

ambari-agent/src/main/python/ambari-agent.py

@@ -0,0 +1,8 @@
+#!/usr/bin/env python2
+from ambari_agent import main as agent_main
+
+def main():
+    return agent_main.main()
+
+if __name__ == "__main__":
+    main()

ambari-agent/src/main/python/ambari-machine

@@ -0,0 +1,11 @@
+#!/usr/bin/env python2
+import sys
+from ambari_agent import machine as agent_machine
+
+def main():
+    # Not sure why machine.py passes sys.argv explicitly
+    # since it's globally available but we'll keep that convention
+    return agent_machine.main(sys.argv)
+
+if __name__ == "__main__":
+    main()

ambari-agent/src/main/python/ambari_agent/ActionQueue.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/ActualConfigHandler.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/AmbariConfig.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one
@@ -55,7 +55,7 @@
 [heartbeat]
 state_interval = 6
 dirs=/etc/hadoop,/etc/hadoop/conf,/var/run/hadoop,/var/log/hadoop
-rpms=hadoop,openssl,wget,net-snmp,ntpd,ruby,ganglia,nagios
+rpms=glusterfs,openssl,wget,net-snmp,ntpd,ruby,ganglia,nagios,glusterfs
 """
 s = StringIO.StringIO(content)
 config.readfp(s)
@@ -77,6 +77,9 @@
 ]
 
 rolesToClass = {
+  'HCFS': 'hdp-hadoop::hcfs',
+  'HCFS_CLIENT': 'hdp-hadoop::hcfs_client',
+  'HCFS_SERVICE_CHECK': 'hdp-hadoop::hcfs_service_check',
   'NAMENODE': 'hdp-hadoop::namenode',
   'DATANODE': 'hdp-hadoop::datanode',
   'SECONDARY_NAMENODE': 'hdp-hadoop::snamenode',
@@ -136,6 +139,7 @@
 }
 
 servicesToPidNames = {
+  'HCFS' : 'glusterd.pid',    
   'NAMENODE': 'hadoop-{USER}-namenode.pid$',
   'SECONDARY_NAMENODE': 'hadoop-{USER}-secondarynamenode.pid$',
   'DATANODE': 'hadoop-{USER}-datanode.pid$',
@@ -164,6 +168,8 @@
 linuxUserPattern = '[A-Za-z0-9_-]*[$]?'
 
 pidPathesVars = [
+  {'var' : 'hcfs_pid_dir_prefix',
+   'defaultValue' : '/var/run'},      
   {'var' : 'hadoop_pid_dir_prefix',
    'defaultValue' : '/var/run/hadoop'},
   {'var' : 'hadoop_pid_dir_prefix',

ambari-agent/src/main/python/ambari_agent/Controller.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/Hardware.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/Heartbeat.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/HostInfo.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/LiveStatus.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/ProcessHelper.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/PythonExecutor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/Register.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/RepoInstaller.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/StackVersionsFileHandler.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/StatusCheck.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/UpgradeExecutor.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 
 '''
 Licensed to the Apache Software Foundation (ASF) under one

ambari-agent/src/main/python/ambari_agent/__init__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.6
+#!/usr/bin/env python
 """
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file