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 ni...@apache.org on 2008/09/11 21:41:18 UTC

svn commit: r694439 - in /hadoop/core/branches/branch-0.18/src/contrib/hod: CHANGES.txt bin/hod

Author: nigel
Date: Thu Sep 11 12:41:17 2008
New Revision: 694439

URL: http://svn.apache.org/viewvc?rev=694439&view=rev
Log:
Merged -r 694434:694435 from trunk to branch-0.18 to fix HADOOP-4161

Modified:
    hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt
    hadoop/core/branches/branch-0.18/src/contrib/hod/bin/hod

Modified: hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt?rev=694439&r1=694438&r2=694439&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt Thu Sep 11 12:41:17 2008
@@ -7,6 +7,11 @@
     HADOOP-4060. Modified HOD to rotate log files on the client side.
     (Vinod Kumar Vavilapalli via yhemanth)
 
+  BUG FIXES
+
+    HADOOP-4161. Fixed bug in HOD cleanup that had the potential to
+    hang clients. (Vinod Kumar Vavilapalli via nigel)
+
 Release 0.18.0 - 2008-08-19
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.18/src/contrib/hod/bin/hod
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/bin/hod?rev=694439&r1=694438&r2=694439&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/contrib/hod/bin/hod (original)
+++ hadoop/core/branches/branch-0.18/src/contrib/hod/bin/hod Thu Sep 11 12:41:17 2008
@@ -545,7 +545,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)