gnt-debug: rename allocator to iallocator

[ganeti-local] / lib / bootstrap.py

diff --git a/lib/bootstrap.py b/lib/bootstrap.py
index d18e68b..c72754e 100644 (file)
--- a/lib/bootstrap.py
+++ b/lib/bootstrap.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2006, 2007, 2008, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2010, 2011 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@ from ganeti import bdev
 from ganeti import netutils
 from ganeti import backend
 from ganeti import luxi
+from ganeti import jstore
 
 
 # ec_id for InitConfig's temporary reservation manager
@@ -244,10 +245,43 @@ def _InitFileStorage(file_storage_dir):
   return file_storage_dir
 
 
+def _InitSharedFileStorage(shared_file_storage_dir):
+  """Initialize if needed the shared file storage.
+
+  @param shared_file_storage_dir: the user-supplied value
+  @return: either empty string (if file storage was disabled at build
+      time) or the normalized path to the storage directory
+
+  """
+  if not constants.ENABLE_SHARED_FILE_STORAGE:
+    return ""
+
+  shared_file_storage_dir = os.path.normpath(shared_file_storage_dir)
+
+  if not os.path.isabs(shared_file_storage_dir):
+    raise errors.OpPrereqError("The shared file storage directory you"
+                               " passed is not an absolute path.",
+                               errors.ECODE_INVAL)
+
+  if not os.path.exists(shared_file_storage_dir):
+    try:
+      os.makedirs(shared_file_storage_dir, 0750)
+    except OSError, err:
+      raise errors.OpPrereqError("Cannot create file storage directory"
+                                 " '%s': %s" % (shared_file_storage_dir, err),
+                                 errors.ECODE_ENVIRON)
+
+  if not os.path.isdir(shared_file_storage_dir):
+    raise errors.OpPrereqError("The file storage directory '%s' is not"
+                               " a directory." % shared_file_storage_dir,
+                               errors.ECODE_ENVIRON)
+  return shared_file_storage_dir
+
+
 def InitCluster(cluster_name, mac_prefix, # pylint: disable-msg=R0913
-                master_netdev, file_storage_dir, candidate_pool_size,
-                secondary_ip=None, vg_name=None, beparams=None,
-                nicparams=None, ndparams=None, hvparams=None,
+                master_netdev, file_storage_dir, shared_file_storage_dir,
+                candidate_pool_size, secondary_ip=None, vg_name=None,
+                beparams=None, nicparams=None, ndparams=None, hvparams=None,
                 enabled_hypervisors=None, modify_etc_hosts=True,
                 modify_ssh_setup=True, maintain_node_health=False,
                 drbd_helper=None, uid_pool=None, default_iallocator=None,
@@ -346,6 +380,7 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable-msg=R0913
                                  errors.ECODE_INVAL)
 
   file_storage_dir = _InitFileStorage(file_storage_dir)
+  shared_file_storage_dir = _InitSharedFileStorage(shared_file_storage_dir)
 
   if not re.match("^[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}$", mac_prefix):
     raise errors.OpPrereqError("Invalid mac prefix given '%s'" % mac_prefix,
@@ -393,6 +428,12 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable-msg=R0913
       raise errors.OpPrereqError("Invalid default iallocator script '%s'"
                                  " specified" % default_iallocator,
                                  errors.ECODE_INVAL)
+  elif constants.HTOOLS:
+    # htools was enabled at build-time, we default to it
+    if utils.FindFile(constants.IALLOC_HAIL,
+                      constants.IALLOCATOR_SEARCH_PATH,
+                      os.path.isfile):
+      default_iallocator = constants.IALLOC_HAIL
 
   now = time.time()
 
@@ -409,6 +450,7 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable-msg=R0913
     master_netdev=master_netdev,
     cluster_name=clustername.name,
     file_storage_dir=file_storage_dir,
+    shared_file_storage_dir=shared_file_storage_dir,
     enabled_hypervisors=enabled_hypervisors,
     beparams={constants.PP_DEFAULT: beparams},
     nicparams={constants.PP_DEFAULT: nicparams},
@@ -660,6 +702,10 @@ def MasterFailover(no_voting=False):
                     " continuing but activating the master on the current"
                     " node will probably fail", total_timeout)
 
+  if jstore.CheckDrainFlag():
+    logging.info("Undraining job queue")
+    jstore.SetDrainFlag(False)
+
   logging.info("Starting the master daemons on the new master")
 
   result = rpc.RpcRunner.call_node_start_master(new_master, True, no_voting)