for consumption here or from the node daemon.
@rtype: tuple
- @return: (master_netdev, master_ip, master_name) if we have a good
- configuration, otherwise (None, None, None)
+ @return: True, (master_netdev, master_ip, master_name) in case of success
+ @raise RPCFail: in case of errors
"""
try:
master_ip = cfg.GetMasterIP()
master_node = cfg.GetMasterNode()
except errors.ConfigurationError, err:
- logging.exception("Cluster configuration incomplete")
- return (None, None, None)
- return (master_netdev, master_ip, master_node)
+ _Fail("Cluster configuration incomplete", exc=True)
+ return True, (master_netdev, master_ip, master_node)
def StartMaster(start_daemons):
@rtype: None
"""
- master_netdev, master_ip, _ = GetMasterInfo()
- if not master_netdev:
- return False, "Cluster configuration incomplete, cannot read ssconf files"
+ # GetMasterInfo will raise an exception if not able to return data
+ master_netdev, master_ip, _ = GetMasterInfo()[1]
payload = []
if utils.TcpPing(master_ip, constants.DEFAULT_NODED_PORT):
@rtype: None
"""
- master_netdev, master_ip, _ = GetMasterInfo()
- if not master_netdev:
- return False
+ # TODO: log and report back to the caller the error failures; we
+ # need to decide in which case we fail the RPC for this
+
+ # GetMasterInfo will raise an exception if not able to return data
+ master_netdev, master_ip, _ = GetMasterInfo()[1]
result = utils.RunCmd(["ip", "address", "del", "%s/32" % master_ip,
"dev", master_netdev])
for daemon in constants.RAPI_PID, constants.MASTERD_PID:
utils.KillProcess(utils.ReadPidFile(utils.DaemonPidFileName(daemon)))
- return True
+ return True, None
def AddNode(dsa, dsapub, rsa, rsapub, sshkey, sshpub):
try:
priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS)
- except errors.OpExecError:
- logging.exception("Error while processing ssh files")
- return
- f = open(pub_key, 'r')
- try:
- utils.RemoveAuthorizedKey(auth_keys, f.read(8192))
- finally:
- f.close()
+ f = open(pub_key, 'r')
+ try:
+ utils.RemoveAuthorizedKey(auth_keys, f.read(8192))
+ finally:
+ f.close()
- utils.RemoveFile(priv_key)
- utils.RemoveFile(pub_key)
+ utils.RemoveFile(priv_key)
+ utils.RemoveFile(pub_key)
+ except errors.OpExecError:
+ logging.exception("Error while processing ssh files")
- # Return a reassuring string to the caller, and quit
- raise errors.QuitGanetiException(False, 'Shutdown scheduled')
+ # Raise a custom exception (handled in ganeti-noded)
+ raise errors.QuitGanetiException(True, 'Shutdown scheduled')
def GetNodeInfo(vgname, hypervisor_type):
"--separator=|",
"--options=lv_name,lv_size,devices,vg_name"])
if result.failed:
- logging.error("Failed to list logical volumes, lvs output: %s",
- result.output)
- return []
+ _Fail("Failed to list logical volumes, lvs output: %s",
+ result.output)
def parse_dev(dev):
if '(' in dev:
'vg': line[3].strip(),
}
- return [map_line(line.split('|')) for line in result.stdout.splitlines()
- if line.count('|') >= 3]
+ return True, [map_line(line.split('|'))
+ for line in result.stdout.splitlines()
+ if line.count('|') >= 3]
def BridgesExist(bridges_list):
"""
ssconf.SimpleStore().WriteFiles(values)
+ return True, None
def _ErrnoOrStr(err):
base_file_storage_dir = cfg.GetFileStorageDir()
if (not os.path.commonprefix([file_storage_dir, base_file_storage_dir]) ==
base_file_storage_dir):
- logging.error("file storage directory '%s' is not under base file"
- " storage directory '%s'",
- file_storage_dir, base_file_storage_dir)
- return None
+ _Fail("File storage directory '%s' is not under base file"
+ " storage directory '%s'", file_storage_dir, base_file_storage_dir)
return file_storage_dir
"""
file_storage_dir = _TransformFileStorageDir(file_storage_dir)
- result = True,
- if not file_storage_dir:
- result = False,
+ if os.path.exists(file_storage_dir):
+ if not os.path.isdir(file_storage_dir):
+ _Fail("Specified storage dir '%s' is not a directory",
+ file_storage_dir)
else:
- if os.path.exists(file_storage_dir):
- if not os.path.isdir(file_storage_dir):
- logging.error("'%s' is not a directory", file_storage_dir)
- result = False,
- else:
- try:
- os.makedirs(file_storage_dir, 0750)
- except OSError, err:
- logging.error("Cannot create file storage directory '%s': %s",
- file_storage_dir, err)
- result = False,
- return result
+ try:
+ os.makedirs(file_storage_dir, 0750)
+ except OSError, err:
+ _Fail("Cannot create file storage directory '%s': %s",
+ file_storage_dir, err, exc=True)
+ return True, None
def RemoveFileStorageDir(file_storage_dir):
"""
file_storage_dir = _TransformFileStorageDir(file_storage_dir)
- result = True,
- if not file_storage_dir:
- result = False,
- else:
- if os.path.exists(file_storage_dir):
- if not os.path.isdir(file_storage_dir):
- logging.error("'%s' is not a directory", file_storage_dir)
- result = False,
- # deletes dir only if empty, otherwise we want to return False
- try:
- os.rmdir(file_storage_dir)
- except OSError, err:
- logging.exception("Cannot remove file storage directory '%s'",
- file_storage_dir)
- result = False,
- return result
+ if os.path.exists(file_storage_dir):
+ if not os.path.isdir(file_storage_dir):
+ _Fail("Specified Storage directory '%s' is not a directory",
+ file_storage_dir)
+ # deletes dir only if empty, otherwise we want to return False
+ try:
+ os.rmdir(file_storage_dir)
+ except OSError, err:
+ _Fail("Cannot remove file storage directory '%s': %s",
+ file_storage_dir, err)
+
+ return True, None
def RenameFileStorageDir(old_file_storage_dir, new_file_storage_dir):
"""
old_file_storage_dir = _TransformFileStorageDir(old_file_storage_dir)
new_file_storage_dir = _TransformFileStorageDir(new_file_storage_dir)
- result = True,
- if not old_file_storage_dir or not new_file_storage_dir:
- result = False,
- else:
- if not os.path.exists(new_file_storage_dir):
- if os.path.isdir(old_file_storage_dir):
- try:
- os.rename(old_file_storage_dir, new_file_storage_dir)
- except OSError, err:
- logging.exception("Cannot rename '%s' to '%s'",
- old_file_storage_dir, new_file_storage_dir)
- result = False,
- else:
- logging.error("'%s' is not a directory", old_file_storage_dir)
- result = False,
+ if not os.path.exists(new_file_storage_dir):
+ if os.path.isdir(old_file_storage_dir):
+ try:
+ os.rename(old_file_storage_dir, new_file_storage_dir)
+ except OSError, err:
+ _Fail("Cannot rename '%s' to '%s': %s",
+ old_file_storage_dir, new_file_storage_dir, err)
else:
- if os.path.exists(old_file_storage_dir):
- logging.error("Cannot rename '%s' to '%s'. Both locations exist.",
- old_file_storage_dir, new_file_storage_dir)
- result = False,
- return result
+ _Fail("Specified storage dir '%s' is not a directory",
+ old_file_storage_dir)
+ else:
+ if os.path.exists(old_file_storage_dir):
+ _Fail("Cannot rename '%s' to '%s': both locations exist",
+ old_file_storage_dir, new_file_storage_dir)
+ return True, None
def _IsJobQueueFile(file_name):
elif phase == constants.HOOKS_PHASE_POST:
suffix = "post"
else:
- raise errors.ProgrammerError("Unknown hooks phase: '%s'" % phase)
+ _Fail("Unknown hooks phase '%s'", phase)
+
rr = []
subdir = "%s-%s.d" % (hpath, suffix)
dir_contents = utils.ListVisibleFiles(dir_name)
except OSError, err:
# FIXME: must log output in case of failures
- return rr
+ return True, rr
# we use the standard python sort order,
# so 00name is the recommended naming scheme
rrval = constants.HKR_SUCCESS
rr.append(("%s/%s" % (subdir, relname), rrval, output))
- return rr
+ return True, rr
class IAllocatorRunner(object):
@param idata: the allocator input data
@rtype: tuple
- @return: four element tuple of:
- - run status (one of the IARUN_ constants)
- - stdout
- - stderr
- - fail reason (as from L{utils.RunResult})
+ @return: two element tuple of:
+ - status
+ - either error message or stdout of allocator (for success)
"""
alloc_script = utils.FindFile(name, constants.IALLOCATOR_SEARCH_PATH,
os.path.isfile)
if alloc_script is None:
- return (constants.IARUN_NOTFOUND, None, None, None)
+ _Fail("iallocator module '%s' not found in the search path", name)
fd, fin_name = tempfile.mkstemp(prefix="ganeti-iallocator.")
try:
os.close(fd)
result = utils.RunCmd([alloc_script, fin_name])
if result.failed:
- return (constants.IARUN_FAILURE, result.stdout, result.stderr,
- result.fail_reason)
+ _Fail("iallocator module '%s' failed: %s, output '%s'",
+ name, result.fail_reason, result.output)
finally:
os.unlink(fin_name)
- return (constants.IARUN_SUCCESS, result.stdout, result.stderr, None)
+ return True, result.stdout
class DevCacheManager(object):
projects / ganeti-local / blobdiff