arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

QEMU config disk - improve error handling

Browse Source 
(cherry picked from commit 068c31038f)
This commit is contained in:
Bernhard Ehlers 2020-07-03 11:31:17 +02:00
parent 053828f3e8
commit 9acb2ceda1
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gns3server/compute/qemu/qemu_vm.py
View File

@ -1686,17 +1686,15 @@ class QemuVM(BaseNode):
config_dir = os.path.join(self.working_dir, "configs") config_dir = os.path.join(self.working_dir, "configs")
zip_file = os.path.join(self.working_dir, "config.zip") zip_file = os.path.join(self.working_dir, "config.zip")
try: try:
shutil.rmtree(config_dir, ignore_errors=True)
os.mkdir(config_dir) os.mkdir(config_dir)
await self._mcopy(disk, "-s", "-m", "-n", "--", "::/", config_dir)
if os.path.exists(zip_file): if os.path.exists(zip_file):
os.remove(zip_file) os.remove(zip_file)
await self._mcopy(disk, "-s", "-m", "-n", "--", "::/", config_dir)
pack_zip(zip_file, config_dir) pack_zip(zip_file, config_dir)
except OSError as e: except OSError as e:
log.warning("Can't export config: {}".format(e)) log.warning("Can't export config: {}".format(e))
self.project.emit("log.warning", {"message": "{}: Can't export config: {}".format(self._name, e)}) self.project.emit("log.warning", {"message": "{}: Can't export config: {}".format(self._name, e)})
finally: shutil.rmtree(config_dir, ignore_errors=True)
shutil.rmtree(config_dir, ignore_errors=True)
async def _import_config(self): async def _import_config(self):
disk_name = getattr(self, "config_disk_name") disk_name = getattr(self, "config_disk_name")
@ -1705,23 +1703,23 @@ class QemuVM(BaseNode):
return return
config_dir = os.path.join(self.working_dir, "configs") config_dir = os.path.join(self.working_dir, "configs")
disk = os.path.join(self.working_dir, disk_name) disk = os.path.join(self.working_dir, disk_name)
disk_tmp = disk + ".tmp"
try: try:
shutil.rmtree(config_dir, ignore_errors=True)
os.mkdir(config_dir) os.mkdir(config_dir)
shutil.copyfile(getattr(self, "config_disk_image"), disk_tmp)
unpack_zip(zip_file, config_dir) unpack_zip(zip_file, config_dir)
shutil.copyfile(getattr(self, "config_disk_image"), disk)
config_files = [os.path.join(config_dir, fname) config_files = [os.path.join(config_dir, fname)
for fname in os.listdir(config_dir)] for fname in os.listdir(config_dir)]
if config_files: if config_files:
await self._mcopy(disk, "-s", "-m", "-o", "--", *config_files, "::/") await self._mcopy(disk_tmp, "-s", "-m", "-o", "--", *config_files, "::/")
os.replace(disk_tmp, disk)
except OSError as e: except OSError as e:
log.warning("Can't import config: {}".format(e)) log.warning("Can't import config: {}".format(e))
self.project.emit("log.warning", {"message": "{}: Can't import config: {}".format(self._name, e)}) self.project.emit("log.warning", {"message": "{}: Can't import config: {}".format(self._name, e)})
if os.path.exists(disk): if os.path.exists(disk_tmp):
os.remove(disk) os.remove(disk_tmp)
os.remove(zip_file) os.remove(zip_file)
finally: shutil.rmtree(config_dir, ignore_errors=True)
shutil.rmtree(config_dir, ignore_errors=True)
def _disk_interface_options(self, disk, disk_index, interface, format=None): def _disk_interface_options(self, disk, disk_index, interface, format=None):
options = [] options = []
@ -1830,12 +1828,15 @@ class QemuVM(BaseNode):
if interface == "ide": if interface == "ide":
interface = getattr(self, "hda_disk_interface", "none") interface = getattr(self, "hda_disk_interface", "none")
await self._import_config() await self._import_config()
if not os.path.exists(disk): disk_exists = os.path.exists(disk)
if not disk_exists:
try: try:
shutil.copyfile(disk_image, disk) shutil.copyfile(disk_image, disk)
disk_exists = True
except OSError as e: except OSError as e:
raise QemuError("Could not create '{}' disk image: {}".format(disk_name, e)) log.warning("Could not create '{}' disk image: {}".format(disk_name, e))
options.extend(self._disk_interface_options(disk, 3, interface, "raw")) if disk_exists:
options.extend(self._disk_interface_options(disk, 3, interface, "raw"))
return options return options