Author: nigel
Date: Thu Sep 11 12:38:07 2008
New Revision: 694435
URL: http://svn.apache.org/viewvc?rev=694435&view=rev
Log:
HADOOP-4161. Fixed bug in HOD cleanup that had the potential to hang clients.
Contributed by Vinod Kumar Vavilapalli.
Modified:
hadoop/core/trunk/src/contrib/hod/CHANGES.txt
hadoop/core/trunk/src/contrib/hod/bin/hod
Modified: hadoop/core/trunk/src/contrib/hod/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/CHANGES.txt?rev=694435&r1=694434&r2=694435&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/trunk/src/contrib/hod/CHANGES.txt Thu Sep 11 12:38:07 2008
@@ -15,6 +15,9 @@
BUG FIXES
+ HADOOP-4161. Fixed bug in HOD cleanup that had the potential to
+ hang clients. (Vinod Kumar Vavilapalli via nigel)
+
Release 0.18.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/core/trunk/src/contrib/hod/bin/hod
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hod/bin/hod?rev=694435&r1=694434&r2=694435&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hod/bin/hod (original)
+++ hadoop/core/trunk/src/contrib/hod/bin/hod Thu Sep 11 12:38:07 2008
@@ -553,7 +553,13 @@
print HOD_INTERRUPTED_MESG
sys.exit(HOD_INTERRUPTED_CODE)
- if hodConfig['hod'].has_key('script'):
- sys.exit(hod.script())
- else:
- sys.exit(hod.operation())
+ opCode = 0
+ try:
+ if hodConfig['hod'].has_key('script'):
+ opCode = hod.script()
+ else:
+ opCode = hod.operation()
+ except Exception, e:
+ print "Uncaught Exception : %s" % e
+ finally:
+ sys.exit(opCode)
