Author: yhemanth
Date: Wed Sep 17 23:49:48 2008
New Revision: 696575
URL: http://svn.apache.org/viewvc?rev=696575&view=rev
Log:
HADOOP-3959. Pass options specified in resource_manager.options to job
submission. Contributed by Craig Macdonald and Vinod Kumar Vavilapalli.
Modified:
hadoop/core/trunk/src/contrib/hod/CHANGES.txt
hadoop/core/trunk/src/contrib/hod/hodlib/Common/desc.py
hadoop/core/trunk/src/contrib/hod/hodlib/NodePools/torque.py
Modified: hadoop/core/trunk/src/contrib/hod/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/CHANGES.txt?rev=696575&r1=696574&r2=696575&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/trunk/src/contrib/hod/CHANGES.txt Wed Sep 17 23:49:48 2008
@@ -15,6 +15,10 @@
BUG FIXES
+ HADOOP-3959. Pass options specified in resource_manager.options to
+ job submission.
+ (Craig Macdonald and Vinod Kumar Vavilapalli via yhemanth)
+
Release 0.18.1 - 2008-09-17
INCOMPATIBLE CHANGES
Modified: hadoop/core/trunk/src/contrib/hod/hodlib/Common/desc.py
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/hodlib/Common/desc.py?rev=696575&r1=696574&r2=696575&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/hodlib/Common/desc.py (original)
+++ hadoop/core/trunk/src/contrib/hod/hodlib/Common/desc.py Wed Sep 17 23:49:48
2008
@@ -77,6 +77,8 @@
self._checkRequired()
+ if 'options' in dict: self.dict['attrs'] = dict['options']
+
def _checkRequired(self):
if not 'id' in self.dict:
Modified: hadoop/core/trunk/src/contrib/hod/hodlib/NodePools/torque.py
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/hodlib/NodePools/torque.py?rev=696575&r1=696574&r2=696575&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/hodlib/NodePools/torque.py (original)
+++ hadoop/core/trunk/src/contrib/hod/hodlib/NodePools/torque.py Wed Sep 17
23:49:48 2008
@@ -97,11 +97,12 @@
rawAttributes['W:x'] = resourceManagementExtensions
hostname = local_fqdn()
-
- rawAttributes['l:nodes'] = nodeSet._getNumNodes()
+
+ # key values are expected to have string values.
+ rawAttributes['l:nodes'] = "%s" % nodeSet._getNumNodes()
if walltime:
- rawAttributes['l:walltime'] = walltime
+ rawAttributes['l:walltime'] = "%s" % walltime
#create a dict of dictionaries for
# various arguments of torque
