opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): disk snapshot file locking off

Browse Source
This commit is contained in:
Zexi Li
2021-10-22 11:21:33 +08:00
parent e86201e5e5
commit 85d5b6e707
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/qemu-arm.go
+1 -1
View File
@@ -248,7 +248,7 @@ func (s *SKVMGuestInstance) generateArmStartScript(data *jsonutils.JSONDict) (st
for _, disk := range disks {
format, _ := disk.GetString("format")
cmd += s.getDriveDesc(disk, format)
cmd += s.getDriveDesc(disk, format, true)
cmd += s.getArmVdiskDesc(disk)
}
pkg/hostman/guestman/qemu-kvmhelper.go
+5 -2
View File
@@ -163,7 +163,7 @@ func (s *SKVMGuestInstance) disablePvpanicDev() bool {
return val == "true"
}
func (s *SKVMGuestInstance) getDriveDesc(disk jsonutils.JSONObject, format string) string {
func (s *SKVMGuestInstance) getDriveDesc(disk jsonutils.JSONObject, format string, fileLockingOff bool) string {
diskIndex, _ := disk.Int("index")
cacheMode, _ := disk.GetString("cache_mode")
aioMode, _ := disk.GetString("aio_mode")
@@ -182,6 +182,9 @@ func (s *SKVMGuestInstance) getDriveDesc(disk jsonutils.JSONObject, format strin
if disk.Contains("url") { // # a remote file backed image
cmd += ",copy-on-read=on"
}
if fileLockingOff {
cmd += ",file.locking=off"
}
// #cmd += ",media=disk"
return cmd
}
@@ -616,7 +619,7 @@ function nic_mtu() {
for _, disk := range disks {
format, _ := disk.GetString("format")
cmd += s.getDriveDesc(disk, format)
cmd += s.getDriveDesc(disk, format, false)
cmd += s.getVdiskDesc(disk)
}