Merge branch 'fix-take-snapshot@@3' into 'master'

[BugFix: ZSTACK-34338]

See merge request zstackio/zstack-utility!339

Author: gitlab

kvmagent/kvmagent/plugins/vm_plugin.py

@@ -4482,6 +4482,7 @@ class VmPlugin(kvmagent.KvmAgent):
     KVM_DETACH_VOLUME = "/vm/detachdatavolume"
     KVM_MIGRATE_VM_PATH = "/vm/migrate"
     KVM_BLOCK_LIVE_MIGRATION_PATH = "/vm/blklivemigration"
+    KVM_VM_CHECK_VOLUME_PATH = "/vm/volume/check"
     KVM_TAKE_VOLUME_SNAPSHOT_PATH = "/vm/volume/takesnapshot"
     KVM_TAKE_VOLUME_BACKUP_PATH = "/vm/volume/takebackup"
     KVM_BLOCK_STREAM_VOLUME_PATH = "/vm/volume/blockstream"
@@ -5100,7 +5101,6 @@ def stop_vm(self, req):
         rsp = StopVmResponse()
         try:
             self._record_operation(cmd.uuid, self.VM_OP_STOP)
-
             self._stop_vm(cmd)
             logger.debug("successfully stopped vm[uuid:%s]" % cmd.uuid)
         except kvmagent.KvmError as e:
@@ -5237,6 +5237,17 @@ def migrate_vm(self, req):
 
         return jsonobject.dumps(rsp)
 
+    @kvmagent.replyerror
+    def check_volume(self, req):
+        cmd = jsonobject.loads(req[http.REQUEST_BODY])
+        rsp = kvmagent.AgentResponse()
+
+        vm = get_vm_by_uuid(cmd.uuid)
+        for volume in cmd.volumes:
+            vm._get_target_disk(volume)
+
+        return jsonobject.dumps(rsp)
+
     def _get_new_disk(self, oldDisk, volume):
         def filebased_volume(_v):
             disk = etree.Element('disk', {'type': 'file', 'device': 'disk', 'snapshot': 'external'})
@@ -6937,6 +6948,7 @@ def start(self):
         http_server.register_async_uri(self.KVM_DETACH_ISO_PATH, self.detach_iso)
         http_server.register_async_uri(self.KVM_MIGRATE_VM_PATH, self.migrate_vm)
         http_server.register_async_uri(self.KVM_BLOCK_LIVE_MIGRATION_PATH, self.block_migrate_vm)
+        http_server.register_async_uri(self.KVM_VM_CHECK_VOLUME_PATH, self.check_volume)
         http_server.register_async_uri(self.KVM_TAKE_VOLUME_SNAPSHOT_PATH, self.take_volume_snapshot)
         http_server.register_async_uri(self.KVM_TAKE_VOLUME_BACKUP_PATH, self.take_volume_backup, cmd=TakeVolumeBackupCommand())
         http_server.register_async_uri(self.KVM_TAKE_VOLUMES_SNAPSHOT_PATH, self.take_volumes_snapshots)