HADOOP-3959. Pass options specified in resource_manager.options to job submission. Contributed by Craig Macdonald and Vinod Kumar Vavilapalli.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@696575 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hod/CHANGES.txt

@@ -15,6 +15,10 @@ Trunk (unreleased changes)
 
   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

src/contrib/hod/hodlib/Common/desc.py

@@ -77,6 +77,8 @@ class NodePoolDesc:
 
     self._checkRequired()
 
+    if 'options' in dict: self.dict['attrs'] = dict['options']
+
   def _checkRequired(self):
 
     if not 'id' in self.dict:

src/contrib/hod/hodlib/NodePools/torque.py

@@ -97,11 +97,12 @@ class TorquePool(NodePool):
         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