Makefile: Fix list of directories

[ganeti-local] / lib / backend.py

diff --git a/lib/backend.py b/lib/backend.py
index 4bd4700..47a941f 100644 (file)
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -64,10 +64,11 @@ from ganeti import mcpu
 from ganeti import compat
 from ganeti import pathutils
 from ganeti import vcluster
 from ganeti import compat
 from ganeti import pathutils
 from ganeti import vcluster

+from ganeti import ht

 
 
 _BOOT_ID_PATH = "/proc/sys/kernel/random/boot_id"
 
 
 _BOOT_ID_PATH = "/proc/sys/kernel/random/boot_id"

-_ALLOWED_CLEAN_DIRS = frozenset([
+_ALLOWED_CLEAN_DIRS = compat.UniqueFrozenset([

   pathutils.DATA_DIR,
   pathutils.JOB_QUEUE_ARCHIVE_DIR,
   pathutils.QUEUE_DIR,
   pathutils.DATA_DIR,
   pathutils.JOB_QUEUE_ARCHIVE_DIR,
   pathutils.QUEUE_DIR,

@@ -357,8 +358,8 @@ def _RunMasterSetupScript(master_params, action, use_external_mip_script):
   result = utils.RunCmd([setup_script, action], env=env, reset_env=True)
 
   if result.failed:
   result = utils.RunCmd([setup_script, action], env=env, reset_env=True)
 
   if result.failed:

-    _Fail("Failed to %s the master IP. Script return value: %s" %
-          (action, result.exit_code), log=True)
+    _Fail("Failed to %s the master IP. Script return value: %s, output: '%s'" %
+          (action, result.exit_code, result.output), log=True)

 
 
 @RunLocalHooks(constants.FAKE_OP_MASTER_TURNUP, "master-ip-turnup",
 
 
 @RunLocalHooks(constants.FAKE_OP_MASTER_TURNUP, "master-ip-turnup",

@@ -540,12 +541,12 @@ def LeaveCluster(modify_ssh_setup):
   raise errors.QuitGanetiException(True, "Shutdown scheduled")
 
 
   raise errors.QuitGanetiException(True, "Shutdown scheduled")
 
 

-def _GetVgInfo(name):
+def _GetVgInfo(name, excl_stor):

   """Retrieves information about a LVM volume group.
 
   """
   # TODO: GetVGInfo supports returning information for multiple VGs at once
   """Retrieves information about a LVM volume group.
 
   """
   # TODO: GetVGInfo supports returning information for multiple VGs at once

-  vginfo = bdev.LogicalVolume.GetVGInfo([name])
+  vginfo = bdev.LogicalVolume.GetVGInfo([name], excl_stor)

   if vginfo:
     vg_free = int(round(vginfo[0][0], 0))
     vg_size = int(round(vginfo[0][1], 0))
   if vginfo:
     vg_free = int(round(vginfo[0][0], 0))
     vg_size = int(round(vginfo[0][1], 0))

@@ -588,20 +589,22 @@ def _GetNamedNodeInfo(names, fn):
     return map(fn, names)
 
 
     return map(fn, names)
 
 

-def GetNodeInfo(vg_names, hv_names):
+def GetNodeInfo(vg_names, hv_names, excl_stor):

   """Gives back a hash with different information about the node.
 
   @type vg_names: list of string
   @param vg_names: Names of the volume groups to ask for disk space information
   @type hv_names: list of string
   @param hv_names: Names of the hypervisors to ask for node information
   """Gives back a hash with different information about the node.
 
   @type vg_names: list of string
   @param vg_names: Names of the volume groups to ask for disk space information
   @type hv_names: list of string
   @param hv_names: Names of the hypervisors to ask for node information

+  @type excl_stor: boolean
+  @param excl_stor: Whether exclusive_storage is active

   @rtype: tuple; (string, None/dict, None/dict)
   @return: Tuple containing boot ID, volume group information and hypervisor
     information
 
   """
   bootid = utils.ReadFile(_BOOT_ID_PATH, size=128).rstrip("\n")
   @rtype: tuple; (string, None/dict, None/dict)
   @return: Tuple containing boot ID, volume group information and hypervisor
     information
 
   """
   bootid = utils.ReadFile(_BOOT_ID_PATH, size=128).rstrip("\n")

-  vg_info = _GetNamedNodeInfo(vg_names, _GetVgInfo)
+  vg_info = _GetNamedNodeInfo(vg_names, (lambda vg: _GetVgInfo(vg, excl_stor)))

   hv_info = _GetNamedNodeInfo(hv_names, _GetHvInfo)
 
   return (bootid, vg_info, hv_info)
   hv_info = _GetNamedNodeInfo(hv_names, _GetHvInfo)
 
   return (bootid, vg_info, hv_info)

@@ -761,9 +764,9 @@ def VerifyNode(what, cluster_name):
     result[constants.NV_VGLIST] = utils.ListVolumeGroups()
 
   if constants.NV_PVLIST in what and vm_capable:
     result[constants.NV_VGLIST] = utils.ListVolumeGroups()
 
   if constants.NV_PVLIST in what and vm_capable:

-    result[constants.NV_PVLIST] = \
-      bdev.LogicalVolume.GetPVInfo(what[constants.NV_PVLIST],
-                                   filter_allocatable=False)
+    val = bdev.LogicalVolume.GetPVInfo(what[constants.NV_PVLIST],
+                                       filter_allocatable=False)
+    result[constants.NV_PVLIST] = map(objects.LvmPvInfo.ToDict, val)

 
   if constants.NV_VERSION in what:
     result[constants.NV_VERSION] = (constants.PROTOCOL_VERSION,
 
   if constants.NV_VERSION in what:
     result[constants.NV_VERSION] = (constants.PROTOCOL_VERSION,

@@ -1548,7 +1551,7 @@ def GetMigrationStatus(instance):
     _Fail("Failed to get migration status: %s", err, exc=True)
 
 
     _Fail("Failed to get migration status: %s", err, exc=True)
 
 

-def BlockdevCreate(disk, size, owner, on_primary, info):
+def BlockdevCreate(disk, size, owner, on_primary, info, excl_stor):

   """Creates a block device for an instance.
 
   @type disk: L{objects.Disk}
   """Creates a block device for an instance.
 
   @type disk: L{objects.Disk}

@@ -1563,6 +1566,8 @@ def BlockdevCreate(disk, size, owner, on_primary, info):
   @type info: string
   @param info: string that will be sent to the physical device
       creation, used for example to set (LVM) tags on LVs
   @type info: string
   @param info: string that will be sent to the physical device
       creation, used for example to set (LVM) tags on LVs

+  @type excl_stor: boolean
+  @param excl_stor: Whether exclusive_storage is active

 
   @return: the new unique_id of the device (this can sometime be
       computed only after creation), or None. On secondary nodes,
 
   @return: the new unique_id of the device (this can sometime be
       computed only after creation), or None. On secondary nodes,

@@ -1589,7 +1594,7 @@ def BlockdevCreate(disk, size, owner, on_primary, info):
       clist.append(crdev)
 
   try:
       clist.append(crdev)
 
   try:

-    device = bdev.Create(disk, clist)
+    device = bdev.Create(disk, clist, excl_stor)

   except errors.BlockDeviceError, err:
     _Fail("Can't create block device: %s", err)
 
   except errors.BlockDeviceError, err:
     _Fail("Can't create block device: %s", err)
 

@@ -2476,6 +2481,51 @@ def OSEnvironment(instance, inst_os, debug=0):
   return result
 
 
   return result
 
 

+def DiagnoseExtStorage(top_dirs=None):
+  """Compute the validity for all ExtStorage Providers.
+
+  @type top_dirs: list
+  @param top_dirs: the list of directories in which to
+      search (if not given defaults to
+      L{pathutils.ES_SEARCH_PATH})
+  @rtype: list of L{objects.ExtStorage}
+  @return: a list of tuples (name, path, status, diagnose, parameters)
+      for all (potential) ExtStorage Providers under all
+      search paths, where:
+          - name is the (potential) ExtStorage Provider
+          - path is the full path to the ExtStorage Provider
+          - status True/False is the validity of the ExtStorage Provider
+          - diagnose is the error message for an invalid ExtStorage Provider,
+            otherwise empty
+          - parameters is a list of (name, help) parameters, if any
+
+  """
+  if top_dirs is None:
+    top_dirs = pathutils.ES_SEARCH_PATH
+
+  result = []
+  for dir_name in top_dirs:
+    if os.path.isdir(dir_name):
+      try:
+        f_names = utils.ListVisibleFiles(dir_name)
+      except EnvironmentError, err:
+        logging.exception("Can't list the ExtStorage directory %s: %s",
+                          dir_name, err)
+        break
+      for name in f_names:
+        es_path = utils.PathJoin(dir_name, name)
+        status, es_inst = bdev.ExtStorageFromDisk(name, base_dir=dir_name)
+        if status:
+          diagnose = ""
+          parameters = es_inst.supported_parameters
+        else:
+          diagnose = es_inst
+          parameters = []
+        result.append((name, es_path, status, diagnose, parameters))
+
+  return result
+
+

 def BlockdevGrow(disk, amount, dryrun, backingstore):
   """Grow a stack of block devices.
 
 def BlockdevGrow(disk, amount, dryrun, backingstore):
   """Grow a stack of block devices.
 

@@ -2609,6 +2659,8 @@ def FinalizeExport(instance, snap_disks):
     config.set(constants.INISECT_INS, "nic%d_mac" %
                nic_count, "%s" % nic.mac)
     config.set(constants.INISECT_INS, "nic%d_ip" % nic_count, "%s" % nic.ip)
     config.set(constants.INISECT_INS, "nic%d_mac" %
                nic_count, "%s" % nic.mac)
     config.set(constants.INISECT_INS, "nic%d_ip" % nic_count, "%s" % nic.ip)

+    config.set(constants.INISECT_INS, "nic%d_network" % nic_count,
+               "%s" % nic.network)

     for param in constants.NICS_PARAMETER_TYPES:
       config.set(constants.INISECT_INS, "nic%d_%s" % (nic_count, param),
                  "%s" % nic.nicparams.get(param, None))
     for param in constants.NICS_PARAMETER_TYPES:
       config.set(constants.INISECT_INS, "nic%d_%s" % (nic_count, param),
                  "%s" % nic.nicparams.get(param, None))

@@ -3582,7 +3634,7 @@ def PowercycleNode(hypervisor_type):
   hyper.PowercycleNode()
 
 
   hyper.PowercycleNode()
 
 

-def _VerifyRemoteCommandName(cmd):
+def _VerifyRestrictedCmdName(cmd):

   """Verifies a remote command name.
 
   @type cmd: string
   """Verifies a remote command name.
 
   @type cmd: string

@@ -3604,7 +3656,7 @@ def _VerifyRemoteCommandName(cmd):
   return (True, None)
 
 
   return (True, None)
 
 

-def _CommonRemoteCommandCheck(path, owner):
+def _CommonRestrictedCmdCheck(path, owner):

   """Common checks for remote command file system directories and files.
 
   @type path: string
   """Common checks for remote command file system directories and files.
 
   @type path: string

@@ -3634,7 +3686,7 @@ def _CommonRemoteCommandCheck(path, owner):
   return (True, st)
 
 
   return (True, st)
 
 

-def _VerifyRemoteCommandDirectory(path, _owner=None):
+def _VerifyRestrictedCmdDirectory(path, _owner=None):

   """Verifies remote command directory.
 
   @type path: string
   """Verifies remote command directory.
 
   @type path: string

@@ -3644,7 +3696,7 @@ def _VerifyRemoteCommandDirectory(path, _owner=None):
     element is an error message string, otherwise it's C{None}
 
   """
     element is an error message string, otherwise it's C{None}
 
   """

-  (status, value) = _CommonRemoteCommandCheck(path, _owner)
+  (status, value) = _CommonRestrictedCmdCheck(path, _owner)

 
   if not status:
     return (False, value)
 
   if not status:
     return (False, value)

@@ -3655,7 +3707,7 @@ def _VerifyRemoteCommandDirectory(path, _owner=None):
   return (True, None)
 
 
   return (True, None)
 
 

-def _VerifyRemoteCommand(path, cmd, _owner=None):
+def _VerifyRestrictedCmd(path, cmd, _owner=None):

   """Verifies a whole remote command and returns its executable filename.
 
   @type path: string
   """Verifies a whole remote command and returns its executable filename.
 
   @type path: string

@@ -3670,7 +3722,7 @@ def _VerifyRemoteCommand(path, cmd, _owner=None):
   """
   executable = utils.PathJoin(path, cmd)
 
   """
   executable = utils.PathJoin(path, cmd)
 

-  (status, msg) = _CommonRemoteCommandCheck(executable, _owner)
+  (status, msg) = _CommonRestrictedCmdCheck(executable, _owner)

 
   if not status:
     return (False, msg)
 
   if not status:
     return (False, msg)

@@ -3681,17 +3733,17 @@ def _VerifyRemoteCommand(path, cmd, _owner=None):
   return (True, executable)
 
 
   return (True, executable)
 
 

-def _PrepareRemoteCommand(path, cmd,
-                          _verify_dir=_VerifyRemoteCommandDirectory,
-                          _verify_name=_VerifyRemoteCommandName,
-                          _verify_cmd=_VerifyRemoteCommand):
+def _PrepareRestrictedCmd(path, cmd,
+                          _verify_dir=_VerifyRestrictedCmdDirectory,
+                          _verify_name=_VerifyRestrictedCmdName,
+                          _verify_cmd=_VerifyRestrictedCmd):

   """Performs a number of tests on a remote command.
 
   @type path: string
   @param path: Directory containing remote commands
   @type cmd: string
   @param cmd: Command name
   """Performs a number of tests on a remote command.
 
   @type path: string
   @param path: Directory containing remote commands
   @type cmd: string
   @param cmd: Command name

-  @return: Same as L{_VerifyRemoteCommand}
+  @return: Same as L{_VerifyRestrictedCmd}

 
   """
   # Verify the directory first
 
   """
   # Verify the directory first

@@ -3707,12 +3759,12 @@ def _PrepareRemoteCommand(path, cmd,
   return _verify_cmd(path, cmd)
 
 
   return _verify_cmd(path, cmd)
 
 

-def RunRemoteCommand(cmd,
+def RunRestrictedCmd(cmd,

                      _lock_timeout=_RCMD_LOCK_TIMEOUT,
                      _lock_timeout=_RCMD_LOCK_TIMEOUT,

-                     _lock_file=pathutils.REMOTE_COMMANDS_LOCK_FILE,
-                     _path=pathutils.REMOTE_COMMANDS_DIR,
+                     _lock_file=pathutils.RESTRICTED_COMMANDS_LOCK_FILE,
+                     _path=pathutils.RESTRICTED_COMMANDS_DIR,

                      _sleep_fn=time.sleep,
                      _sleep_fn=time.sleep,

-                     _prepare_fn=_PrepareRemoteCommand,
+                     _prepare_fn=_PrepareRestrictedCmd,

                      _runcmd_fn=utils.RunCmd,
                      _enabled=constants.ENABLE_RESTRICTED_COMMANDS):
   """Executes a remote command after performing strict tests.
                      _runcmd_fn=utils.RunCmd,
                      _enabled=constants.ENABLE_RESTRICTED_COMMANDS):
   """Executes a remote command after performing strict tests.

@@ -3766,6 +3818,25 @@ def RunRemoteCommand(cmd,
       lock = None
 
 
       lock = None
 
 

+def SetWatcherPause(until, _filename=pathutils.WATCHER_PAUSEFILE):
+  """Creates or removes the watcher pause file.
+
+  @type until: None or number
+  @param until: Unix timestamp saying until when the watcher shouldn't run
+
+  """
+  if until is None:
+    logging.info("Received request to no longer pause watcher")
+    utils.RemoveFile(_filename)
+  else:
+    logging.info("Received request to pause watcher until %s", until)
+
+    if not ht.TNumber(until):
+      _Fail("Duration must be numeric")
+
+    utils.WriteFile(_filename, data="%d\n" % (until, ), mode=0644)
+
+

 class HooksRunner(object):
   """Hook runner.
 
 class HooksRunner(object):
   """Hook runner.