You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by yh...@apache.org on 2009/02/24 11:42:14 UTC
svn commit: r747332 - in /hadoop/core/trunk/src: contrib/hod/
contrib/hod/bin/ contrib/hod/conf/ contrib/hod/hodlib/HodRing/
contrib/hod/testing/ docs/src/documentation/content/xdocs/
Author: yhemanth
Date: Tue Feb 24 10:42:13 2009
New Revision: 747332
URL: http://svn.apache.org/viewvc?rev=747332&view=rev
Log:
HADOOP-2898. Provide an option to specify a port range for Hadoop services provisioned by HOD. Contributed by Peeyush Bishnoi.
Modified:
hadoop/core/trunk/src/contrib/hod/CHANGES.txt
hadoop/core/trunk/src/contrib/hod/bin/hod
hadoop/core/trunk/src/contrib/hod/bin/hodring
hadoop/core/trunk/src/contrib/hod/bin/ringmaster
hadoop/core/trunk/src/contrib/hod/conf/hodrc
hadoop/core/trunk/src/contrib/hod/hodlib/HodRing/hodRing.py
hadoop/core/trunk/src/contrib/hod/testing/testHodRing.py
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/hod_config_guide.xml
Modified: hadoop/core/trunk/src/contrib/hod/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/CHANGES.txt?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/trunk/src/contrib/hod/CHANGES.txt Tue Feb 24 10:42:13 2009
@@ -12,6 +12,10 @@
IMPROVEMENTS
+ HADOOP-2898. Provide an option to specify a port range for
+ Hadoop services provisioned by HOD.
+ (Peeyush Bishnoi via yhemanth)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/core/trunk/src/contrib/hod/bin/hod
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/bin/hod?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/bin/hod (original)
+++ hadoop/core/trunk/src/contrib/hod/bin/hod Tue Feb 24 10:42:13 2009
@@ -350,6 +350,9 @@
('http-port-range', 'range', 'HTTP port range n-m.',
False, None, True, True),
+ ('hadoop-port-range', 'range', 'Hadoop port range n-m.',
+ False, None, True, True),
+
('service-id', 'string', 'Service ID.',
False, None, False, True),
Modified: hadoop/core/trunk/src/contrib/hod/bin/hodring
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/bin/hodring?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/bin/hodring (original)
+++ hadoop/core/trunk/src/contrib/hod/bin/hodring Tue Feb 24 10:42:13 2009
@@ -107,6 +107,9 @@
('http-port-range', 'range', 'HTTP port range n-m.',
False, None, True, True),
+
+ ('hadoop-port-range', 'range', 'Hadoop port range n-m.',
+ False, None, True, True),
('command', 'string', 'Command for hodring to run.',
False, None, False, True),
Modified: hadoop/core/trunk/src/contrib/hod/bin/ringmaster
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/bin/ringmaster?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/bin/ringmaster (original)
+++ hadoop/core/trunk/src/contrib/hod/bin/ringmaster Tue Feb 24 10:42:13 2009
@@ -244,6 +244,9 @@
('http-port-range', 'range', 'HTTP port range n-m.',
False, None, True, True),
+
+ ('hadoop-port-range', 'range', 'Hadoop port range n-m.',
+ False, None, True, True),
('command', 'string', 'Command for hodring to run.',
False, None, False, True),
Modified: hadoop/core/trunk/src/contrib/hod/conf/hodrc
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/conf/hodrc?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/conf/hodrc (original)
+++ hadoop/core/trunk/src/contrib/hod/conf/hodrc Tue Feb 24 10:42:13 2009
@@ -24,6 +24,7 @@
java-home = ${JAVA_HOME}
http-port-range = 8000-9000
xrs-port-range = 32768-65536
+hadoop-port-range = 50000-60000
debug = 3
[resource_manager]
Modified: hadoop/core/trunk/src/contrib/hod/hodlib/HodRing/hodRing.py
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/hodlib/HodRing/hodRing.py?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/hodlib/HodRing/hodRing.py (original)
+++ hadoop/core/trunk/src/contrib/hod/hodlib/HodRing/hodRing.py Tue Feb 24 10:42:13 2009
@@ -210,7 +210,7 @@
class HadoopCommand:
"""Runs a single hadoop command"""
- def __init__(self, id, desc, tempdir, tardir, log, javahome,
+ def __init__(self, id, desc, tempdir, tardir, hadoopportrange, log, javahome,
mrSysDir, restart=False):
self.desc = desc
self.log = log
@@ -230,6 +230,7 @@
self.child = None
self.restart = restart
self.filledInKeyVals = []
+ self.__hadoopPortRange = hadoopportrange
self._createWorkDirs()
self._createHadoopSiteXml()
self._createHadoopLogDir()
@@ -253,8 +254,9 @@
def createXML(self, doc, attr, topElement, final):
for k,v in attr.iteritems():
self.log.debug('_createHadoopSiteXml: ' + str(k) + " " + str(v))
+ lowport, highport = self.__hadoopPortRange
if ( v == "fillinport" ):
- v = "%d" % (ServiceUtil.getUniqRandomPort(low=50000, log=self.log))
+ v = "%d" % (ServiceUtil.getUniqRandomPort(low=lowport, high=highport, log=self.log))
keyvalpair = ''
if isinstance(v, (tuple, list)):
@@ -270,7 +272,7 @@
self.filledInKeyVals.append(keyvalpair)
if ( v == "fillinhostport"):
- port = "%d" % (ServiceUtil.getUniqRandomPort(low=50000, log=self.log))
+ port = "%d" % (ServiceUtil.getUniqRandomPort(low=lowport, high=highport, log=self.log))
self.log.debug('Setting hostname to: %s' % local_fqdn())
v = local_fqdn() + ':' + port
@@ -613,7 +615,7 @@
mrSysDir = getMapredSystemDirectory(self._cfg['mapred-system-dir-root'],
self._cfg['userid'], self._cfg['service-id'])
self.log.debug('mrsysdir is %s' % mrSysDir)
- cmd = HadoopCommand(id, desc, self.__tempDir, self.__pkgDir, self.log,
+ cmd = HadoopCommand(id, desc, self.__tempDir, self.__pkgDir, self._cfg['hadoop-port-range'], self.log,
self._cfg['java-home'], mrSysDir, restart)
self.__hadoopLogDirs.append(cmd.logdir)
Modified: hadoop/core/trunk/src/contrib/hod/testing/testHodRing.py
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/testing/testHodRing.py?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/testing/testHodRing.py (original)
+++ hadoop/core/trunk/src/contrib/hod/testing/testHodRing.py Tue Feb 24 10:42:13 2009
@@ -68,7 +68,7 @@
# that pkgdir is specified at the time of object creation.
# END OF TODO
self.hadoopCommand = HadoopCommand(self.id, self.desc, self.tempDir,
- self.pkgDir, self.log, self.javaHome,
+ self.pkgDir, (50000, 60000), self.log, self.javaHome,
self.mrSysDir, restart=True)
self.hadoopSite = os.path.join( self.hadoopCommand.confdir,
'hadoop-site.xml')
Modified: hadoop/core/trunk/src/docs/src/documentation/content/xdocs/hod_config_guide.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/docs/src/documentation/content/xdocs/hod_config_guide.xml?rev=747332&r1=747331&r2=747332&view=diff
==============================================================================
--- hadoop/core/trunk/src/docs/src/documentation/content/xdocs/hod_config_guide.xml (original)
+++ hadoop/core/trunk/src/docs/src/documentation/content/xdocs/hod_config_guide.xml Tue Feb 24 10:42:13 2009
@@ -331,6 +331,10 @@
be used by HOD to upload logs if a HDFS URL is specified in log-destination-uri
option. Note that this is useful if the users are using a tarball whose version
may differ from the external, static HDFS version.</li>
+
+ <li>hadoop-port-range: Range of ports, among which an available port shall
+ be picked for use to run a Hadoop Service, like JobTracker or TaskTracker. </li>
+
</ul>
</section>