Get rid of constants.RAPI_ENABLE

[ganeti-local] / lib / utils.py

diff --git a/lib/utils.py b/lib/utils.py
index 17b5d3c..df2d180 100644 (file)
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -27,9 +27,7 @@ the command line scripts.
 """
 
 
 """
 
 

-import sys

 import os
 import os

-import sha

 import time
 import subprocess
 import re
 import time
 import subprocess
 import re

@@ -47,6 +45,12 @@ import signal
 
 from cStringIO import StringIO
 
 
 from cStringIO import StringIO
 

+try:
+  from hashlib import sha1
+except ImportError:
+  import sha
+  sha1 = sha.new
+

 from ganeti import errors
 from ganeti import constants
 
 from ganeti import errors
 from ganeti import constants
 

@@ -54,7 +58,6 @@ from ganeti import constants
 _locksheld = []
 _re_shell_unquoted = re.compile('^[-.,=:/_+@A-Za-z0-9]+$')
 
 _locksheld = []
 _re_shell_unquoted = re.compile('^[-.,=:/_+@A-Za-z0-9]+$')
 

-debug = False

 debug_locks = False
 
 #: when set to True, L{RunCmd} is disabled
 debug_locks = False
 
 #: when set to True, L{RunCmd} is disabled

@@ -131,7 +134,7 @@ def RunCmd(cmd, env=None, output=None, cwd='/'):
       directory for the command; the default will be /
   @rtype: L{RunResult}
   @return: RunResult instance
       directory for the command; the default will be /
   @rtype: L{RunResult}
   @return: RunResult instance

-  @raise erors.ProgrammerError: if we call this when forks are disabled
+  @raise errors.ProgrammerError: if we call this when forks are disabled

 
   """
   if no_fork:
 
   """
   if no_fork:

@@ -151,11 +154,18 @@ def RunCmd(cmd, env=None, output=None, cwd='/'):
   if env is not None:
     cmd_env.update(env)
 
   if env is not None:
     cmd_env.update(env)
 

-  if output is None:
-    out, err, status = _RunCmdPipe(cmd, cmd_env, shell, cwd)
-  else:
-    status = _RunCmdFile(cmd, cmd_env, shell, output, cwd)
-    out = err = ""
+  try:
+    if output is None:
+      out, err, status = _RunCmdPipe(cmd, cmd_env, shell, cwd)
+    else:
+      status = _RunCmdFile(cmd, cmd_env, shell, output, cwd)
+      out = err = ""
+  except OSError, err:
+    if err.errno == errno.ENOENT:
+      raise errors.OpExecError("Can't execute '%s': not found (%s)" %
+                               (strcmd, err))
+    else:
+      raise

 
   if status >= 0:
     exitcode = status
 
   if status >= 0:
     exitcode = status

@@ -166,6 +176,7 @@ def RunCmd(cmd, env=None, output=None, cwd='/'):
 
   return RunResult(exitcode, signal_, out, err, strcmd)
 
 
   return RunResult(exitcode, signal_, out, err, strcmd)
 

+

 def _RunCmdPipe(cmd, env, via_shell, cwd):
   """Run a command and return its output.
 
 def _RunCmdPipe(cmd, env, via_shell, cwd):
   """Run a command and return its output.
 

@@ -203,7 +214,18 @@ def _RunCmdPipe(cmd, env, via_shell, cwd):
     fcntl.fcntl(fd, fcntl.F_SETFL, status | os.O_NONBLOCK)
 
   while fdmap:
     fcntl.fcntl(fd, fcntl.F_SETFL, status | os.O_NONBLOCK)
 
   while fdmap:

-    for fd, event in poller.poll():
+    try:
+      pollresult = poller.poll()
+    except EnvironmentError, eerr:
+      if eerr.errno == errno.EINTR:
+        continue
+      raise
+    except select.error, serr:
+      if serr[0] == errno.EINTR:
+        continue
+      raise
+
+    for fd, event in pollresult:

       if event & select.POLLIN or event & select.POLLPRI:
         data = fdmap[fd][1].read()
         # no data from read signifies EOF (the same as POLLHUP)
       if event & select.POLLIN or event & select.POLLPRI:
         data = fdmap[fd][1].read()
         # no data from read signifies EOF (the same as POLLHUP)

@@ -274,6 +296,32 @@ def RemoveFile(filename):
       raise
 
 
       raise
 
 

+def RenameFile(old, new, mkdir=False, mkdir_mode=0750):
+  """Renames a file.
+
+  @type old: string
+  @param old: Original path
+  @type new: string
+  @param new: New path
+  @type mkdir: bool
+  @param mkdir: Whether to create target directory if it doesn't exist
+  @type mkdir_mode: int
+  @param mkdir_mode: Mode for newly created directories
+
+  """
+  try:
+    return os.rename(old, new)
+  except OSError, err:
+    # In at least one use case of this function, the job queue, directory
+    # creation is very rare. Checking for the directory before renaming is not
+    # as efficient.
+    if mkdir and err.errno == errno.ENOENT:
+      # Create directory and try again
+      os.makedirs(os.path.dirname(new), mkdir_mode)
+      return os.rename(old, new)
+    raise
+
+

 def _FingerprintFile(filename):
   """Compute the fingerprint of a file.
 
 def _FingerprintFile(filename):
   """Compute the fingerprint of a file.
 

@@ -292,7 +340,7 @@ def _FingerprintFile(filename):
 
   f = open(filename)
 
 
   f = open(filename)
 

-  fp = sha.sha()
+  fp = sha1()

   while True:
     data = f.read(4096)
     if not data:
   while True:
     data = f.read(4096)
     if not data:

@@ -349,6 +397,69 @@ def CheckDict(target, template, logname=None):
     logging.warning('%s missing keys %s', logname, ', '.join(missing))
 
 
     logging.warning('%s missing keys %s', logname, ', '.join(missing))
 
 

+def ForceDictType(target, key_types, allowed_values=None):
+  """Force the values of a dict to have certain types.
+
+  @type target: dict
+  @param target: the dict to update
+  @type key_types: dict
+  @param key_types: dict mapping target dict keys to types
+                    in constants.ENFORCEABLE_TYPES
+  @type allowed_values: list
+  @keyword allowed_values: list of specially allowed values
+
+  """
+  if allowed_values is None:
+    allowed_values = []
+
+  for key in target:
+    if key not in key_types:
+      msg = "Unknown key '%s'" % key
+      raise errors.TypeEnforcementError(msg)
+
+    if target[key] in allowed_values:
+      continue
+
+    type = key_types[key]
+    if type not in constants.ENFORCEABLE_TYPES:
+      msg = "'%s' has non-enforceable type %s" % (key, type)
+      raise errors.ProgrammerError(msg)
+
+    if type == constants.VTYPE_STRING:
+      if not isinstance(target[key], basestring):
+        if isinstance(target[key], bool) and not target[key]:
+          target[key] = ''
+        else:
+          msg = "'%s' (value %s) is not a valid string" % (key, target[key])
+          raise errors.TypeEnforcementError(msg)
+    elif type == constants.VTYPE_BOOL:
+      if isinstance(target[key], basestring) and target[key]:
+        if target[key].lower() == constants.VALUE_FALSE:
+          target[key] = False
+        elif target[key].lower() == constants.VALUE_TRUE:
+          target[key] = True
+        else:
+          msg = "'%s' (value %s) is not a valid boolean" % (key, target[key])
+          raise errors.TypeEnforcementError(msg)
+      elif target[key]:
+        target[key] = True
+      else:
+        target[key] = False
+    elif type == constants.VTYPE_SIZE:
+      try:
+        target[key] = ParseUnit(target[key])
+      except errors.UnitParseError, err:
+        msg = "'%s' (value %s) is not a valid size. error: %s" % \
+              (key, target[key], err)
+        raise errors.TypeEnforcementError(msg)
+    elif type == constants.VTYPE_INT:
+      try:
+        target[key] = int(target[key])
+      except (ValueError, TypeError):
+        msg = "'%s' (value %s) is not a valid integer" % (key, target[key])
+        raise errors.TypeEnforcementError(msg)
+
+

 def IsProcessAlive(pid):
   """Check if a given pid exists on the system.
 
 def IsProcessAlive(pid):
   """Check if a given pid exists on the system.
 

@@ -378,7 +489,7 @@ def ReadPidFile(pidfile):
   @type  pidfile: string
   @param pidfile: path to the file containing the pid
   @rtype: int
   @type  pidfile: string
   @param pidfile: path to the file containing the pid
   @rtype: int

-  @return: The process id, if the file exista and contains a valid PID,
+  @return: The process id, if the file exists and contains a valid PID,

            otherwise 0
 
   """
            otherwise 0
 
   """

@@ -520,36 +631,6 @@ def BridgeExists(bridge):
   return os.path.isdir("/sys/class/net/%s/bridge" % bridge)
 
 
   return os.path.isdir("/sys/class/net/%s/bridge" % bridge)
 
 

-def CheckBEParams(beparams):
-  """Checks whether the user-supplied be-params are valid,
-  and converts them from string format where appropriate.
-
-  @type beparams: dict
-  @param beparams: new params dict
-
-  """
-  if beparams:
-    for item in beparams:
-      if item not in constants.BES_PARAMETERS:
-        raise errors.OpPrereqError("Unknown backend parameter %s" % item)
-      if item in (constants.BE_MEMORY, constants.BE_VCPUS):
-        val = beparams[item]
-        if val != constants.VALUE_DEFAULT:
-          try:
-            val = int(val)
-          except ValueError, err:
-            raise errors.OpPrereqError("Invalid %s size: %s" % (item, str(err)))
-          beparams[item] = val
-      if item in (constants.BE_AUTO_BALANCE):
-        val = beparams[item]
-        if val == constants.VALUE_TRUE:
-          beparams[item] = True
-        elif val == constants.VALUE_FALSE:
-          beparams[item] = False
-        else:
-          raise errors.OpPrereqError("Invalid %s value: %s" % (item, val))
-
-

 def NiceSort(name_list):
   """Sort a list of strings based on digit and non-digit groupings.
 
 def NiceSort(name_list):
   """Sort a list of strings based on digit and non-digit groupings.
 

@@ -604,7 +685,7 @@ def TryConvert(fn, val):
   """
   try:
     nv = fn(val)
   """
   try:
     nv = fn(val)

-  except (ValueError, TypeError), err:
+  except (ValueError, TypeError):

     nv = val
   return nv
 
     nv = val
   return nv
 

@@ -618,7 +699,7 @@ def IsValidIP(ip):
   @type ip: str
   @param ip: the address to be checked
   @rtype: a regular expression match object
   @type ip: str
   @param ip: the address to be checked
   @rtype: a regular expression match object

-  @return: a regular epression match object, or None if the
+  @return: a regular expression match object, or None if the

       address is not valid
 
   """
       address is not valid
 
   """

@@ -651,7 +732,7 @@ def BuildShellCmd(template, *args):
 
   This function will check all arguments in the args list so that they
   are valid shell parameters (i.e. they don't contain shell
 
   This function will check all arguments in the args list so that they
   are valid shell parameters (i.e. they don't contain shell

-  metacharaters). If everything is ok, it will return the result of
+  metacharacters). If everything is ok, it will return the result of

   template % args.
 
   @type template: str
   template % args.
 
   @type template: str

@@ -712,7 +793,7 @@ def ParseUnit(input_string):
   is always an int in MiB.
 
   """
   is always an int in MiB.
 
   """

-  m = re.match('^([.\d]+)\s*([a-zA-Z]+)?$', input_string)
+  m = re.match('^([.\d]+)\s*([a-zA-Z]+)?$', str(input_string))

   if not m:
     raise errors.UnitParseError("Invalid format")
 
   if not m:
     raise errors.UnitParseError("Invalid format")
 

@@ -824,6 +905,7 @@ def SetEtcHostsEntry(file_name, ip, hostname, aliases):
   @param aliases: the list of aliases to add for the hostname
 
   """
   @param aliases: the list of aliases to add for the hostname
 
   """

+  # FIXME: use WriteFile + fn rather than duplicating its efforts

   # Ensure aliases are unique
   aliases = UniqueSequence([hostname] + aliases)[1:]
 
   # Ensure aliases are unique
   aliases = UniqueSequence([hostname] + aliases)[1:]
 

@@ -833,7 +915,6 @@ def SetEtcHostsEntry(file_name, ip, hostname, aliases):
     try:
       f = open(file_name, 'r')
       try:
     try:
       f = open(file_name, 'r')
       try:

-        written = False

         for line in f:
           fields = line.split()
           if fields and not fields[0].startswith('#') and ip == fields[0]:
         for line in f:
           fields = line.split()
           if fields and not fields[0].startswith('#') and ip == fields[0]:

@@ -847,6 +928,7 @@ def SetEtcHostsEntry(file_name, ip, hostname, aliases):
 
         out.flush()
         os.fsync(out)
 
         out.flush()
         os.fsync(out)

+        os.chmod(tmpname, 0644)

         os.rename(tmpname, file_name)
       finally:
         f.close()
         os.rename(tmpname, file_name)
       finally:
         f.close()

@@ -880,6 +962,7 @@ def RemoveEtcHostsEntry(file_name, hostname):
   @param hostname: the hostname to be removed
 
   """
   @param hostname: the hostname to be removed
 
   """

+  # FIXME: use WriteFile + fn rather than duplicating its efforts

   fd, tmpname = tempfile.mkstemp(dir=os.path.dirname(file_name))
   try:
     out = os.fdopen(fd, 'w')
   fd, tmpname = tempfile.mkstemp(dir=os.path.dirname(file_name))
   try:
     out = os.fdopen(fd, 'w')

@@ -901,6 +984,7 @@ def RemoveEtcHostsEntry(file_name, hostname):
 
         out.flush()
         os.fsync(out)
 
         out.flush()
         os.fsync(out)

+        os.chmod(tmpname, 0644)

         os.rename(tmpname, file_name)
       finally:
         f.close()
         os.rename(tmpname, file_name)
       finally:
         f.close()

@@ -977,7 +1061,7 @@ def ShellQuoteArgs(args):
   @type args: list
   @param args: list of arguments to be quoted
   @rtype: str
   @type args: list
   @param args: list of arguments to be quoted
   @rtype: str

-  @return: the quoted arguments concatenaned with spaces
+  @return: the quoted arguments concatenated with spaces

 
   """
   return ' '.join([ShellQuote(i) for i in args])
 
   """
   return ' '.join([ShellQuote(i) for i in args])

@@ -994,7 +1078,7 @@ def TcpPing(target, port, timeout=10, live_port_needed=False, source=None):
   @type port: int
   @param port: the port to connect to
   @type timeout: int
   @type port: int
   @param port: the port to connect to
   @type timeout: int

-  @param timeout: the timeout on the connection attemp
+  @param timeout: the timeout on the connection attempt

   @type live_port_needed: boolean
   @param live_port_needed: whether a closed port will cause the
       function to return failure, as if there was a timeout
   @type live_port_needed: boolean
   @param live_port_needed: whether a closed port will cause the
       function to return failure, as if there was a timeout

@@ -1006,12 +1090,12 @@ def TcpPing(target, port, timeout=10, live_port_needed=False, source=None):
   """
   sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
   """
   sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 

-  sucess = False
+  success = False

 
   if source is not None:
     try:
       sock.bind((source, 0))
 
   if source is not None:
     try:
       sock.bind((source, 0))

-    except socket.error, (errcode, errstring):
+    except socket.error, (errcode, _):

       if errcode == errno.EADDRNOTAVAIL:
         success = False
 
       if errcode == errno.EADDRNOTAVAIL:
         success = False
 

@@ -1036,7 +1120,7 @@ def OwnIpAddress(address):
   address.
 
   @type address: string
   address.
 
   @type address: string

-  @param address: the addres to check
+  @param address: the address to check

   @rtype: bool
   @return: True if we own the address
 
   @rtype: bool
   @return: True if we own the address
 

@@ -1105,7 +1189,25 @@ def GenerateSecret():
   @return: a sha1 hexdigest of a block of 64 random bytes
 
   """
   @return: a sha1 hexdigest of a block of 64 random bytes
 
   """

-  return sha.new(os.urandom(64)).hexdigest()
+  return sha1(os.urandom(64)).hexdigest()
+
+
+def EnsureDirs(dirs):
+  """Make required directories, if they don't exist.
+
+  @param dirs: list of tuples (dir_name, dir_mode)
+  @type dirs: list of (string, integer)
+
+  """
+  for dir_name, dir_mode in dirs:
+    try:
+      os.mkdir(dir_name, dir_mode)
+    except EnvironmentError, err:
+      if err.errno != errno.EEXIST:
+        raise errors.GenericError("Cannot create needed directory"
+                                  " '%s': %s" % (dir_name, err))
+    if not os.path.isdir(dir_name):
+      raise errors.GenericError("%s is not a directory" % dir_name)

 
 
 def ReadFile(file_name, size=None):
 
 
 def ReadFile(file_name, size=None):

@@ -1114,7 +1216,7 @@ def ReadFile(file_name, size=None):
   @type size: None or int
   @param size: Read at most size bytes
   @rtype: str
   @type size: None or int
   @param size: Read at most size bytes
   @rtype: str

-  @return: the (possibly partial) conent of the file
+  @return: the (possibly partial) content of the file

 
   """
   f = open(file_name, "r")
 
   """
   f = open(file_name, "r")

@@ -1141,7 +1243,7 @@ def WriteFile(file_name, fn=None, data=None,
   mtime/atime of the file.
 
   If the function doesn't raise an exception, it has succeeded and the
   mtime/atime of the file.
 
   If the function doesn't raise an exception, it has succeeded and the

-  target file has the new contents. If the file has raised an
+  target file has the new contents. If the function has raised an

   exception, an existing target file should be unmodified and the
   temporary file should be removed.
 
   exception, an existing target file should be unmodified and the
   temporary file should be removed.
 

@@ -1150,7 +1252,7 @@ def WriteFile(file_name, fn=None, data=None,
   @type fn: callable
   @param fn: content writing function, called with
       file descriptor as parameter
   @type fn: callable
   @param fn: content writing function, called with
       file descriptor as parameter

-  @type data: sr
+  @type data: str

   @param data: contents of the file
   @type mode: int
   @param mode: file mode
   @param data: contents of the file
   @type mode: int
   @param mode: file mode

@@ -1173,7 +1275,7 @@ def WriteFile(file_name, fn=None, data=None,
   @return: None if the 'close' parameter evaluates to True,
       otherwise the file descriptor
 
   @return: None if the 'close' parameter evaluates to True,
       otherwise the file descriptor
 

-  @raise errors.ProgrammerError: if an of the arguments are not valid
+  @raise errors.ProgrammerError: if any of the arguments are not valid

 
   """
   if not os.path.isabs(file_name):
 
   """
   if not os.path.isabs(file_name):

@@ -1192,6 +1294,7 @@ def WriteFile(file_name, fn=None, data=None,
 
   dir_name, base_name = os.path.split(file_name)
   fd, new_name = tempfile.mkstemp('.new', base_name, dir_name)
 
   dir_name, base_name = os.path.split(file_name)
   fd, new_name = tempfile.mkstemp('.new', base_name, dir_name)

+  do_remove = True

   # here we need to make sure we remove the temp file, if any error
   # leaves it in place
   try:
   # here we need to make sure we remove the temp file, if any error
   # leaves it in place
   try:

@@ -1212,13 +1315,15 @@ def WriteFile(file_name, fn=None, data=None,
       os.utime(new_name, (atime, mtime))
     if not dry_run:
       os.rename(new_name, file_name)
       os.utime(new_name, (atime, mtime))
     if not dry_run:
       os.rename(new_name, file_name)

+      do_remove = False

   finally:
     if close:
       os.close(fd)
       result = None
     else:
       result = fd
   finally:
     if close:
       os.close(fd)
       result = None
     else:
       result = fd

-    RemoveFile(new_name)
+    if do_remove:
+      RemoveFile(new_name)

 
   return result
 
 
   return result
 

@@ -1253,14 +1358,14 @@ def FirstFree(seq, base=0):
 
 def all(seq, pred=bool):
   "Returns True if pred(x) is True for every element in the iterable"
 
 def all(seq, pred=bool):
   "Returns True if pred(x) is True for every element in the iterable"

-  for elem in itertools.ifilterfalse(pred, seq):
+  for _ in itertools.ifilterfalse(pred, seq):

     return False
   return True
 
 
 def any(seq, pred=bool):
   "Returns True if pred(x) is True for at least one element in the iterable"
     return False
   return True
 
 
 def any(seq, pred=bool):
   "Returns True if pred(x) is True for at least one element in the iterable"

-  for elem in itertools.ifilter(pred, seq):
+  for _ in itertools.ifilter(pred, seq):

     return True
   return False
 
     return True
   return False
 

@@ -1271,7 +1376,7 @@ def UniqueSequence(seq):
   Element order is preserved.
 
   @type seq: sequence
   Element order is preserved.
 
   @type seq: sequence

-  @param seq: the sequence with the source elementes
+  @param seq: the sequence with the source elements

   @rtype: list
   @return: list of unique elements from seq
 
   @rtype: list
   @return: list of unique elements from seq
 

@@ -1283,7 +1388,7 @@ def UniqueSequence(seq):
 def IsValidMac(mac):
   """Predicate to check if a MAC address is valid.
 
 def IsValidMac(mac):
   """Predicate to check if a MAC address is valid.
 

-  Checks wether the supplied MAC address is formally correct, only
+  Checks whether the supplied MAC address is formally correct, only

   accepts colon separated format.
 
   @type mac: str
   accepts colon separated format.
 
   @type mac: str

@@ -1311,23 +1416,37 @@ def TestDelay(duration):
   return True
 
 
   return True
 
 

-def Daemonize(logfile, noclose_fds=None):
-  """Daemonize the current process.
+def _CloseFDNoErr(fd, retries=5):
+  """Close a file descriptor ignoring errors.

 
 

-  This detaches the current process from the controlling terminal and
-  runs it in the background as a daemon.
+  @type fd: int
+  @param fd: the file descriptor
+  @type retries: int
+  @param retries: how many retries to make, in case we get any
+      other error than EBADF
+
+  """
+  try:
+    os.close(fd)
+  except OSError, err:
+    if err.errno != errno.EBADF:
+      if retries > 0:
+        _CloseFDNoErr(fd, retries - 1)
+    # else either it's closed already or we're out of retries, so we
+    # ignore this and go on
+
+
+def CloseFDs(noclose_fds=None):
+  """Close file descriptors.
+
+  This closes all file descriptors above 2 (i.e. except
+  stdin/out/err).

 
 

-  @type logfile: str
-  @param logfile: the logfile to which we should redirect stdout/stderr

   @type noclose_fds: list or None
   @param noclose_fds: if given, it denotes a list of file descriptor
       that should not be closed
   @type noclose_fds: list or None
   @param noclose_fds: if given, it denotes a list of file descriptor
       that should not be closed

-  @rtype: int
-  @returns: the value zero

 
   """
 
   """

-  UMASK = 077
-  WORKDIR = "/"

   # Default maximum for the number of available file descriptors.
   if 'SC_OPEN_MAX' in os.sysconf_names:
     try:
   # Default maximum for the number of available file descriptors.
   if 'SC_OPEN_MAX' in os.sysconf_names:
     try:

@@ -1338,6 +1457,31 @@ def Daemonize(logfile, noclose_fds=None):
       MAXFD = 1024
   else:
     MAXFD = 1024
       MAXFD = 1024
   else:
     MAXFD = 1024

+  maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
+  if (maxfd == resource.RLIM_INFINITY):
+    maxfd = MAXFD
+
+  # Iterate through and close all file descriptors (except the standard ones)
+  for fd in range(3, maxfd):
+    if noclose_fds and fd in noclose_fds:
+      continue
+    _CloseFDNoErr(fd)
+
+
+def Daemonize(logfile):
+  """Daemonize the current process.
+
+  This detaches the current process from the controlling terminal and
+  runs it in the background as a daemon.
+
+  @type logfile: str
+  @param logfile: the logfile to which we should redirect stdout/stderr
+  @rtype: int
+  @return: the value zero
+
+  """
+  UMASK = 077
+  WORKDIR = "/"

 
   # this might fail
   pid = os.fork()
 
   # this might fail
   pid = os.fork()

@@ -1353,22 +1497,15 @@ def Daemonize(logfile, noclose_fds=None):
       os._exit(0) # Exit parent (the first child) of the second child.
   else:
     os._exit(0) # Exit parent of the first child.
       os._exit(0) # Exit parent (the first child) of the second child.
   else:
     os._exit(0) # Exit parent of the first child.

-  maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1]
-  if (maxfd == resource.RLIM_INFINITY):
-    maxfd = MAXFD

 
 

-  # Iterate through and close all file descriptors.
-  for fd in range(0, maxfd):
-    if noclose_fds and fd in noclose_fds:
-      continue
-    try:
-      os.close(fd)
-    except OSError: # ERROR, fd wasn't open to begin with (ignored)
-      pass
-  os.open(logfile, os.O_RDWR|os.O_CREAT|os.O_APPEND, 0600)
-  # Duplicate standard input to standard output and standard error.
-  os.dup2(0, 1)     # standard output (1)
-  os.dup2(0, 2)     # standard error (2)
+  for fd in range(3):
+    _CloseFDNoErr(fd)
+  i = os.open("/dev/null", os.O_RDONLY) # stdin
+  assert i == 0, "Can't close/reopen stdin"
+  i = os.open(logfile, os.O_WRONLY|os.O_CREAT|os.O_APPEND, 0600) # stdout
+  assert i == 1, "Can't close/reopen stdout"
+  # Duplicate standard output to standard error.
+  os.dup2(1, 2)

   return 0
 
 
   return 0
 
 

@@ -1413,7 +1550,6 @@ def RemovePidFile(name):
   @param name: the daemon name used to derive the pidfile name
 
   """
   @param name: the daemon name used to derive the pidfile name
 
   """

-  pid = os.getpid()

   pidfilename = DaemonPidFileName(name)
   # TODO: we could check here that the file contains our pid
   try:
   pidfilename = DaemonPidFileName(name)
   # TODO: we could check here that the file contains our pid
   try:

@@ -1458,10 +1594,24 @@ def KillProcess(pid, signal_=signal.SIGTERM, timeout=30,
   _helper(pid, signal_, waitpid)
   if timeout <= 0:
     return
   _helper(pid, signal_, waitpid)
   if timeout <= 0:
     return

+
+  # Wait up to $timeout seconds

   end = time.time() + timeout
   end = time.time() + timeout

+  wait = 0.01

   while time.time() < end and IsProcessAlive(pid):
   while time.time() < end and IsProcessAlive(pid):

-    time.sleep(0.1)
+    try:
+      (result_pid, _) = os.waitpid(pid, os.WNOHANG)
+      if result_pid > 0:
+        break
+    except OSError:
+      pass
+    time.sleep(wait)
+    # Make wait time longer for next try
+    if wait < 0.1:
+      wait *= 1.5
+

   if IsProcessAlive(pid):
   if IsProcessAlive(pid):

+    # Kill process if it's still alive

     _helper(pid, signal.SIGKILL, waitpid)
 
 
     _helper(pid, signal.SIGKILL, waitpid)
 
 

@@ -1569,7 +1719,8 @@ def GetNodeDaemonPort():
   return port
 
 
   return port
 
 

-def SetupLogging(logfile, debug=False, stderr_logging=False, program=""):
+def SetupLogging(logfile, debug=False, stderr_logging=False, program="",
+                 multithreaded=False):

   """Configures the logging module.
 
   @type logfile: str
   """Configures the logging module.
 
   @type logfile: str

@@ -1581,16 +1732,18 @@ def SetupLogging(logfile, debug=False, stderr_logging=False, program=""):
   @param stderr_logging: whether we should also log to the standard error
   @type program: str
   @param program: the name under which we should log messages
   @param stderr_logging: whether we should also log to the standard error
   @type program: str
   @param program: the name under which we should log messages

+  @type multithreaded: boolean
+  @param multithreaded: if True, will add the thread name to the log file

   @raise EnvironmentError: if we can't open the log file and
       stderr logging is disabled
 
   """
   @raise EnvironmentError: if we can't open the log file and
       stderr logging is disabled
 
   """

-  fmt = "%(asctime)s: " + program + " "
+  fmt = "%(asctime)s: " + program + " pid=%(process)d"
+  if multithreaded:
+    fmt += "/%(threadName)s"

   if debug:
   if debug:

-    fmt += ("pid=%(process)d/%(threadName)s %(levelname)s"
-           " %(module)s:%(lineno)s %(message)s")
-  else:
-    fmt += "pid=%(process)d %(levelname)s %(message)s"
+    fmt += " %(module)s:%(lineno)s"
+  fmt += " %(levelname)s %(message)s"

   formatter = logging.Formatter(fmt)
 
   root_logger = logging.getLogger("")
   formatter = logging.Formatter(fmt)
 
   root_logger = logging.getLogger("")

@@ -1598,6 +1751,7 @@ def SetupLogging(logfile, debug=False, stderr_logging=False, program=""):
 
   # Remove all previously setup handlers
   for handler in root_logger.handlers:
 
   # Remove all previously setup handlers
   for handler in root_logger.handlers:

+    handler.close()

     root_logger.removeHandler(handler)
 
   if stderr_logging:
     root_logger.removeHandler(handler)
 
   if stderr_logging:

@@ -1621,7 +1775,7 @@ def SetupLogging(logfile, debug=False, stderr_logging=False, program=""):
     else:
       logfile_handler.setLevel(logging.INFO)
     root_logger.addHandler(logfile_handler)
     else:
       logfile_handler.setLevel(logging.INFO)
     root_logger.addHandler(logfile_handler)

-  except EnvironmentError, err:
+  except EnvironmentError:

     if stderr_logging:
       logging.exception("Failed to enable logging to file '%s'", logfile)
     else:
     if stderr_logging:
       logging.exception("Failed to enable logging to file '%s'", logfile)
     else:

@@ -1629,6 +1783,79 @@ def SetupLogging(logfile, debug=False, stderr_logging=False, program=""):
       raise
 
 
       raise
 
 

+def TailFile(fname, lines=20):
+  """Return the last lines from a file.
+
+  @note: this function will only read and parse the last 4KB of
+      the file; if the lines are very long, it could be that less
+      than the requested number of lines are returned
+
+  @param fname: the file name
+  @type lines: int
+  @param lines: the (maximum) number of lines to return
+
+  """
+  fd = open(fname, "r")
+  try:
+    fd.seek(0, 2)
+    pos = fd.tell()
+    pos = max(0, pos-4096)
+    fd.seek(pos, 0)
+    raw_data = fd.read()
+  finally:
+    fd.close()
+
+  rows = raw_data.splitlines()
+  return rows[-lines:]
+
+
+def SafeEncode(text):
+  """Return a 'safe' version of a source string.
+
+  This function mangles the input string and returns a version that
+  should be safe to display/encode as ASCII. To this end, we first
+  convert it to ASCII using the 'backslashreplace' encoding which
+  should get rid of any non-ASCII chars, and then we process it
+  through a loop copied from the string repr sources in the python; we
+  don't use string_escape anymore since that escape single quotes and
+  backslashes too, and that is too much; and that escaping is not
+  stable, i.e. string_escape(string_escape(x)) != string_escape(x).
+
+  @type text: str or unicode
+  @param text: input data
+  @rtype: str
+  @return: a safe version of text
+
+  """
+  if isinstance(text, unicode):
+    # only if unicode; if str already, we handle it below
+    text = text.encode('ascii', 'backslashreplace')
+  resu = ""
+  for char in text:
+    c = ord(char)
+    if char  == '\t':
+      resu += r'\t'
+    elif char == '\n':
+      resu += r'\n'
+    elif char == '\r':
+      resu += r'\'r'
+    elif c < 32 or c >= 127: # non-printable
+      resu += "\\x%02x" % (c & 0xff)
+    else:
+      resu += char
+  return resu
+
+
+def CommaJoin(names):
+  """Nicely join a set of identifiers.
+
+  @param names: set, list or tuple
+  @return: a string with the formatted results
+
+  """
+  return ", ".join(["'%s'" % val for val in names])
+
+

 def LockedMethod(fn):
   """Synchronized object access decorator.
 
 def LockedMethod(fn):
   """Synchronized object access decorator.