Merge of -r 693704:693705 from trunk to branch-0.18 to fix HADOOP-4060

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@694428 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hod/CHANGES.txt

@@ -1,6 +1,13 @@
 HOD Change Log
 
-Release 0.18.0 - Unreleased
+Release 0.18.1 - Unreleased
+
+  INCOMPATIBLE CHANGES
+
+    HADOOP-4060. Modified HOD to rotate log files on the client side.
+    (Vinod Kumar Vavilapalli via yhemanth)
+
+Release 0.18.0 - 2008-08-19
 
   INCOMPATIBLE CHANGES
 

src/contrib/hod/bin/hod

@@ -156,7 +156,10 @@ defList = { 'hod' : (
               True, None, False, True, 'l'),
 
              ('script-wait-time', 'pos_int', 'Specifies the time to wait before running the script. Used with the hod.script option.',
-              True, 10, False, True, 'W')),
+              True, 10, False, True, 'W'),
+
+             ('log-rollover-count', 'pos_int', 'Specifies the number of rolled-over log files of HOD client. A zero value disables rollover.',
+              True, 5, False, True, 'L')),
 
             'resource_manager' : (
              ('id', 'string', 'Batch scheduler ID: torque|condor.',

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

@@ -310,12 +310,18 @@ class hodLog:
                 logFile = os.path.join(logDirectory, "%s-%s.log" % (
                     self.__appName, loggerName))
 
+                logFilePresent = False
+                if(os.path.exists(logFile)):
+                  logFilePresent = True
+
                 if sys.version.startswith('2.4'):
                     fileHandler = hodRotatingFileHandler(logFile,
                         maxBytes=maxBytes, backupCount=backupCount)
                 else:
                     fileHandler = logging.handlers.RotatingFileHandler(logFile,
                         maxBytes=maxBytes, backupCount=backupCount)
+                if logFilePresent and backupCount:
+                  fileHandler.doRollover()
 
                 fileHandler.setLevel(loggingLevel)
                 fileHandler.setFormatter(fileFormater)

src/contrib/hod/hodlib/Hod/hod.py

@@ -169,8 +169,9 @@ class hodRunner:
     return self.__log
 
   def __setup_cluster_logger(self, directory):
-    self.__baseLogger.add_file(logDirectory=directory, level=4, 
-                               addToLoggerNames=(self.__user ,))
+    self.__baseLogger.add_file(logDirectory=directory, level=4,
+                          backupCount=self.__cfg['hod']['log-rollover-count'],
+                          addToLoggerNames=(self.__user ,))
 
   def __setup_cluster_state(self, directory):
     self.__clusterState = hodState(directory)