Skip to content

Commit 186ac69

Browse files
committed
Merge remote-tracking branch 'origin/4.14' into 4.15
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2 parents 7a712e2 + 3b5f99a commit 186ac69

File tree

4 files changed

+36
-49
lines changed

4 files changed

+36
-49
lines changed

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2232,6 +2232,12 @@ public Volume migrateVolume(MigrateVolumeCmd cmd) {
22322232
if (capabilities != null) {
22332233
liveMigrateVolume = capabilities.isStorageMotionSupported();
22342234
}
2235+
2236+
if (liveMigrateVolume && HypervisorType.KVM.equals(host.getHypervisorType())) {
2237+
throw new InvalidParameterValueException("KVM does not support volume live migration due to the limited possibility to refresh VM XML domain. " +
2238+
"Therefore, to live migrate a volume between storage pools, one must migrate the VM to a different host as well to force the VM XML domain update. " +
2239+
"Use 'migrateVirtualMachineWithVolumes' instead.");
2240+
}
22352241
}
22362242

22372243
// If vm is running, and hypervisor doesn't support live migration, then return error

ui/nginx.conf

Lines changed: 0 additions & 30 deletions
This file was deleted.

ui/package-lock.json

Lines changed: 26 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"@fortawesome/free-brands-svg-icons": "^5.15.2",
3737
"@fortawesome/free-solid-svg-icons": "^5.15.2",
3838
"@fortawesome/vue-fontawesome": "^2.0.2",
39-
"ant-design-vue": "~1.7.2",
40-
"antd-theme-webpack-plugin": "^1.3.7",
39+
"ant-design-vue": "~1.7.3",
40+
"antd-theme-webpack-plugin": "^1.3.9",
4141
"axios": "^0.21.1",
4242
"babel-plugin-require-context-hook": "^1.0.0",
4343
"core-js": "^3.6.5",
@@ -54,10 +54,10 @@
5454
"vue-cropper": "0.5.6",
5555
"vue-i18n": "^8.22.4",
5656
"vue-ls": "^3.2.2",
57-
"vue-router": "^3.4.9",
57+
"vue-router": "^3.5.1",
5858
"vue-svg-component-runtime": "^1.0.1",
5959
"vuedraggable": "^2.24.3",
60-
"vuex": "^3.6.0"
60+
"vuex": "^3.6.2"
6161
},
6262
"devDependencies": {
6363
"@vue/cli": "^4.4.1",

0 commit comments

Comments
 (0)