2010/4/16 Iustin Pop <[email protected]>:
> On Wed, Apr 07, 2010 at 06:44:30PM +0200, Michael Hanselmann wrote:
>> --- a/lib/backend.py
>> +++ b/lib/backend.py
>> +def _OpenRealBD(disk):
> […]
>
> This is a generic cleanup that is good to apply to devel-2.1. Would you
> mind doing this (_OpenRealDB) in a separate patch?
Done, commit f2e07bb4422196739afc07a9520856d7925686df.
All other comments have been addressed in this interdiff:
diff --git a/lib/backend.py b/lib/backend.py
index 435c90c..29a2c5b 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -2813,6 +2813,9 @@ def GetImportExportStatus(names):
@type names: sequence
@param names: List of names
+ @rtype: List of dicts
+ @return: Returns a list of the state of each named import/export or None if a
+ status couldn't be read
"""
result = []
@@ -2840,6 +2843,9 @@ def GetImportExportStatus(names):
def CleanupImportExport(name):
"""Cleanup after an import or export.
+ If the import/export daemon is still running it's killed. Afterwards the
+ whole status directory is removed.
+
"""
logging.info("Finalizing import/export %s", name)
diff --git a/lib/constants.py b/lib/constants.py
index de54317..6a35a42 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -202,8 +202,11 @@ IEM_IMPORT = "import"
IEM_EXPORT = "export"
# Import/export I/O
+# Direct file I/O, equivalent to a shell's I/O redirection using '<' or '>'
IEIO_FILE = "file"
+# Raw block device I/O using "dd"
IEIO_RAW_DISK = "raw"
+# OS definition import/export script
IEIO_SCRIPT = "script"
VALUE_DEFAULT = "default"
diff --git a/lib/rpc.py b/lib/rpc.py
index a290ae5..b99b49e 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1268,6 +1268,9 @@ class RpcRunner(object):
@param node: Node name
@type names: List of strings
@param names: Import/export names
+ @rtype: List of L{objects.ImportExportStatus} instances
+ @return: Returns a list of the state of each named import/export or None if
+ a status couldn't be retrieved
"""
result = self._SingleNodeCall(node, "get_import_export_status", [names])
Regards,
Michael
--
Subscription settings:
http://groups.google.com/group/ganeti-devel/subscribe?hl=en
