Merge branch 'stable-2.10' into stable-2.11

* stable-2.10
  On upgrades, check for upgrades to resume first
  Pause watcher during upgrade
  Allow instance disks to be added with --no-wait-for-sync
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>

lib/client/gnt_cluster.py

@@ -1863,6 +1863,10 @@ def _UpgradeBeforeConfigurationChange(versionstring):
     ToStderr("Failed to completely empty the queue.")
     return (False, rollback)
 
+  ToStdout("Pausing the watcher for one hour.")
+  rollback.append(lambda: GetClient().SetWatcherPause(None))
+  GetClient().SetWatcherPause(time.time() + 60 * 60)
+
   ToStdout("Stopping daemons on master node.")
   if not _RunCommandAndReport([pathutils.DAEMON_UTIL, "stop-all"]):
     return (False, rollback)
@@ -2031,6 +2035,10 @@ def _UpgradeAfterConfigurationChange(oldversion):
   if not _RunCommandAndReport([pathutils.POST_UPGRADE, oldversion]):
     returnvalue = 1
 
+  ToStdout("Unpasuing the watcher.")
+  if not _RunCommandAndReport(["gnt-cluster", "watcher", "continue"]):
+    returnvalue = 1
+
   ToStdout("Verifying cluster.")
   if not _RunCommandAndReport(["gnt-cluster", "verify"]):
     returnvalue = 1
@@ -2054,6 +2062,22 @@ def UpgradeGanetiCommand(opts, args):
              " has to be given")
     return 1
 
+  # If we're not told to resume, verify there is no upgrade
+  # in progress.
+  if not opts.resume:
+    oldversion, versionstring = _ReadIntentToUpgrade()
+    if versionstring is not None:
+      # An upgrade is going on; verify whether the target matches
+      if versionstring == opts.to:
+        ToStderr("An upgrade is already in progress. Target version matches,"
+                 " resuming.")
+        opts.resume = True
+        opts.to = None
+      else:
+        ToStderr("An upgrade from %s to %s is in progress; use --resume to"
+                 " finish it first" % (oldversion, versionstring))
+        return 1
+
   oldversion = constants.RELEASE_VERSION
 
   if opts.resume:

lib/cmdlib/instance.py

@@ -2830,11 +2830,11 @@ class LUInstanceSetParams(LogicalUnit):
                                       constants.DT_EXT),
                                      errors.ECODE_INVAL)
 
-    if not self.op.wait_for_sync and self.instance.disks_active:
+    if not self.op.wait_for_sync and not self.instance.disks_active:
       for mod in self.diskmod:
         if mod[0] == constants.DDM_ADD:
           raise errors.OpPrereqError("Can't add a disk to an instance with"
-                                     " activated disks and"
+                                     " deactivated disks and"
                                      " --no-wait-for-sync given.",
                                      errors.ECODE_INVAL)
 

test/py/cmdlib/instance_unittest.py

@@ -2190,9 +2190,8 @@ class TestLUInstanceSetParams(CmdlibTestCase):
                                    constants.IDISK_SIZE: 1024
                                  }]],
                          wait_for_sync=False)
-    self.ExecOpCodeExpectOpPrereqError(
-      op, "Can't add a disk to an instance with activated disks"
-          " and --no-wait-for-sync given.")
+    self.ExecOpCode(op)
+    self.assertFalse(self.rpc.call_blockdev_shutdown.called)
 
   def testAddDiskDownInstance(self):
     op = self.CopyOpCode(self.op,
@@ -2204,6 +2203,17 @@ class TestLUInstanceSetParams(CmdlibTestCase):
 
     self.assertTrue(self.rpc.call_blockdev_shutdown.called)
 
+  def testAddDiskDownInstanceNoWaitForSync(self):
+    op = self.CopyOpCode(self.op,
+                         disks=[[constants.DDM_ADD, -1,
+                                 {
+                                   constants.IDISK_SIZE: 1024
+                                 }]],
+                         wait_for_sync=False)
+    self.ExecOpCodeExpectOpPrereqError(
+      op, "Can't add a disk to an instance with deactivated disks"
+          " and --no-wait-for-sync given.")
+
   def testAddDiskRunningInstance(self):
     op = self.CopyOpCode(self.running_op,
                          disks=[[constants.DDM_ADD, -1,