You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ey...@apache.org on 2011/11/10 18:42:48 UTC
svn commit: r1200447 - in /incubator/ambari/trunk: CHANGES.txt
agent/src/main/python/ambari_agent/Hardware.py
agent/src/packages/deb/hms-agent.control/control
agent/src/packages/rpm/spec/hms-agent.spec
Author: eyang
Date: Thu Nov 10 17:42:48 2011
New Revision: 1200447
URL: http://svn.apache.org/viewvc?rev=1200447&view=rev
Log:
AMBARI-128. Improved ethtool handling. (Ahmed Fathalla via Eric Yang)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/agent/src/main/python/ambari_agent/Hardware.py
incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control
incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1200447&r1=1200446&r2=1200447&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Nov 10 17:42:48 2011
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.1.0 - unreleased
+ AMBARI-128. Improved ethtool handling. (Ahmed Fathalla via Eric Yang)
+
AMBARI-127. Fixed mailing list address. (Ahmed Fathalla via Eric Yang)
AMBARI-126. Minor fixes to the FSM invocations (ddas)
Modified: incubator/ambari/trunk/agent/src/main/python/ambari_agent/Hardware.py
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/python/ambari_agent/Hardware.py?rev=1200447&r1=1200446&r2=1200447&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/python/ambari_agent/Hardware.py (original)
+++ incubator/ambari/trunk/agent/src/main/python/ambari_agent/Hardware.py Thu Nov 10 17:42:48 2011
@@ -62,7 +62,11 @@ class Hardware:
sh = shellRunner()
script = [ 'ethtool', 'eth0', '|', 'grep', 'Speed:', '|', 'sed', "'s/\s*Speed:\s*//'", '|', 'sed', "'s/Mb\/s//'" ]
result = sh.run(script)
- self.netSpeed = int(result['output'].rstrip())
+ if "ethtool: not found\n" in result['error']:
+ # ethtool not installed, assume a speed of 0Mb/s
+ self.netSpeed = 0
+ else:
+ self.netSpeed = int(result['output'].rstrip())
def ifconfig(self):
sh = shellRunner()
Modified: incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control?rev=1200447&r1=1200446&r2=1200447&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control (original)
+++ incubator/ambari/trunk/agent/src/packages/deb/hms-agent.control/control Thu Nov 10 17:42:48 2011
@@ -17,7 +17,7 @@ Version: @version@
Section: misc
Priority: optional
Architecture: all
-Depends: openjdk-6-jre-headless
+Depends: python, ethtool
Maintainer: Apache Software Foundation <hm...@incubator.apache.org>
Description: Hadoop Management System Agent manage software installation and configuration for Hadoop software stack.
Distribution: development
Modified: incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec?rev=1200447&r1=1200446&r2=1200447&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec (original)
+++ incubator/ambari/trunk/agent/src/packages/rpm/spec/hms-agent.spec Thu Nov 10 17:42:48 2011
@@ -56,7 +56,7 @@ Prefix: %{_conf_dir}
Prefix: %{_log_dir}
Prefix: %{_pid_dir}
Buildroot: %{_build_dir}
-Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, transmission-cli, zkpython, zookeeper-lib, BitTorrent-bencode, mimerender, simplejson, mimeparse, web.py, python-setuptools, libevent >= 2.0.10, avahi-tools, python-iniparse
+Requires: sh-utils, textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, /sbin/service, transmission-cli, zkpython, zookeeper-lib, BitTorrent-bencode, mimerender, simplejson, mimeparse, web.py, python-setuptools, libevent >= 2.0.10, avahi-tools, python-iniparse, /sbin/ethtool
AutoReqProv: no
Provides: hms-agent