Add option to ignore offline node on instance start/stop

[ganeti-local] / scripts / gnt-backup

diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index 986b449..9fd3aa7 100755 (executable)
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
-# Copyright (C) 2006, 2007 Google Inc.
+# Copyright (C) 2006, 2007, 2010 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
@@ -18,10 +18,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
+"""Backup related commands"""
 
-# pylint: disable-msg=W0401,W0614
+# pylint: disable-msg=W0401,W0613,W0614,C0103
 # W0401: Wildcard import ganeti.cli
+# W0613: Unused argument, since all functions follow the same API
 # W0614: Unused import %s from wildcard import (since we need cli)
+# C0103: Invalid name gnt-backup
 
 import sys
 
@@ -29,7 +32,6 @@ from ganeti.cli import *
 from ganeti import opcodes
 from ganeti import constants
 from ganeti import errors
-from ganeti import utils
 
 
 _VALUE_TRUE = "true"
@@ -70,32 +72,22 @@ def ExportInstance(opts, args):
   @return: the desired exit code
 
   """
+  ignore_remove_failures = opts.ignore_remove_failures
+
+  if not opts.node:
+    raise errors.OpPrereqError("Target node must be specified",
+                               errors.ECODE_INVAL)
+
   op = opcodes.OpExportInstance(instance_name=args[0],
                                 target_node=opts.node,
                                 shutdown=opts.shutdown,
-                                shutdown_timeout=opts.shutdown_timeout)
-
-  fin_resu, dlist = SubmitOpCode(op)
-  if not isinstance(dlist, list):
-    ToStderr("Cannot parse execution results")
-    return 1
-  tot_dsk = len(dlist)
-  # TODO: handle diskless instances
-  if dlist.count(False) == 0:
-    # all OK
-    rcode = 0
-  elif dlist.count(True) == 0:
-    ToStderr("Error: No disks were backed up successfully."
-             " The export doesn't have any valid data,"
-             " it is recommended to retry the operation.")
-    rcode = 1
-  else:
-    ToStderr("Partial export failure: %d disks backed up, %d disks failed.",
-             dlist.count(True), dlist.count(False))
-    rcode = 2
-  if not fin_resu:
-    rcode = 1
-  return rcode
+                                shutdown_timeout=opts.shutdown_timeout,
+                                remove_instance=opts.remove_instance,
+                                ignore_remove_failures=ignore_remove_failures)
+
+  SubmitOpCode(op, opts=opts)
+  return 0
+
 
 def ImportInstance(opts, args):
   """Add an instance to the cluster.
@@ -117,34 +109,38 @@ def RemoveExport(opts, args):
   @return: the desired exit code
 
   """
-  instance = args[0]
   op = opcodes.OpRemoveExport(instance_name=args[0])
 
-  SubmitOpCode(op)
+  SubmitOpCode(op, opts=opts)
   return 0
 
 
 # this is defined separately due to readability only
 import_opts = [
-  NODE_PLACEMENT_OPT,
   BACKEND_OPT,
-  DISK_TEMPLATE_OPT,
   DISK_OPT,
-  OS_SIZE_OPT,
+  DISK_TEMPLATE_OPT,
+  FILESTORE_DIR_OPT,
+  FILESTORE_DRIVER_OPT,
+  HYPERVISOR_OPT,
+  IALLOCATOR_OPT,
+  IDENTIFY_DEFAULTS_OPT,
   NET_OPT,
+  NODE_PLACEMENT_OPT,
+  NOIPCHECK_OPT,
+  NONAMECHECK_OPT,
   NONICS_OPT,
   NWSYNC_OPT,
+  OSPARAMS_OPT,
+  OS_SIZE_OPT,
   SRC_DIR_OPT,
   SRC_NODE_OPT,
-  NOIPCHECK_OPT,
-  NONAMECHECK_OPT,
-  IALLOCATOR_OPT,
-  FILESTORE_DIR_OPT,
-  FILESTORE_DRIVER_OPT,
-  HYPERVISOR_OPT,
   SUBMIT_OPT,
+  DRY_RUN_OPT,
+  PRIORITY_OPT,
   ]
 
+
 commands = {
   'list': (
     PrintExportList, ARGS_NONE,
@@ -152,7 +148,9 @@ commands = {
     "", "Lists instance exports available in the ganeti cluster"),
   'export': (
     ExportInstance, ARGS_ONE_INSTANCE,
-    [FORCE_OPT, SINGLE_NODE_OPT, NOSHUTDOWN_OPT, SHUTDOWN_TIMEOUT_OPT],
+    [FORCE_OPT, SINGLE_NODE_OPT, NOSHUTDOWN_OPT, SHUTDOWN_TIMEOUT_OPT,
+     REMOVE_INSTANCE_OPT, IGNORE_REMOVE_FAILURES_OPT, DRY_RUN_OPT,
+     PRIORITY_OPT],
     "-n <target_node> [opts...] <name>",
     "Exports an instance to an image"),
   'import': (
@@ -160,7 +158,7 @@ commands = {
     "[...] -t disk-type -n node[:secondary-node] <name>",
     "Imports an instance from an exported image"),
   'remove': (
-    RemoveExport, [ArgUnknown(min=1, max=1)], [],
+    RemoveExport, [ArgUnknown(min=1, max=1)], [DRY_RUN_OPT, PRIORITY_OPT],
     "<name>", "Remove exports of named instance from the filesystem."),
   }