This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 91c116886181e9581f392c64f43b0279de1a9ff3
Merge: 01d87b77479 32cc45e8405
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Fri May 2 14:59:05 2025 +0530
Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20
.../storage/vmsnapshot/StorageVMSnapshotStrategy.java | 13 +++++++++----
.../storage/vmsnapshot/VMSnapshotStrategyKVMTest.java | 4 +++-
ui/src/config/section/compute.js | 8 +++++++-
ui/src/views/compute/CreateSnapshotWizard.vue | 13 ++++++++++---
ui/src/views/storage/TakeSnapshot.vue | 9 +++++++--
5 files changed, 36 insertions(+), 11 deletions(-)
diff --cc
engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
index ec73246851c,64d8f0a0df0..e33edc9ce80
---
a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
+++
b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
@@@ -180,8 -182,8 +180,8 @@@ public class StorageVMSnapshotStrategy
answer.setVolumeTOs(volumeTOs);
thawAnswer = (FreezeThawVMAnswer) agentMgr.send(hostId,
thawCmd);
if (thawAnswer != null && thawAnswer.getResult()) {
- s_logger.info(String.format(
+ logger.info(String.format(
- "Virtual machne is thawed. The freeze of virtual
machine took %s milliseconds.",
+ "Virtual machine is thawed. The freeze of virtual
machine took %s milliseconds.",
TimeUnit.MILLISECONDS.convert(elapsedTime(startFreeze), TimeUnit.NANOSECONDS)));
}
} else {
diff --cc ui/src/config/section/compute.js
index 65fbcee52b7,b7c2a342d09..5b7bd0f8b9b
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@@ -190,11 -184,17 +190,17 @@@ export default
label: 'label.action.vmsnapshot.create',
docHelp:
'adminguide/virtual_machines.html#virtual-machine-snapshots',
dataView: true,
- args: ['virtualmachineid', 'name', 'description', 'snapshotmemory',
'quiescevm'],
+ args: (record, store) => {
+ var args = ['virtualmachineid', 'name', 'description',
'snapshotmemory']
+ if (['KVM', 'VMware'].includes(record.hypervisor)) {
+ args.push('quiescevm')
+ }
+ return args
+ },
show: (record) => {
- return ((['Running'].includes(record.state) && record.hypervisor
!== 'LXC') ||
+ return (((['Running'].includes(record.state) && record.hypervisor
!== 'LXC') ||
(['Stopped'].includes(record.state) && ((record.hypervisor !==
'KVM' && record.hypervisor !== 'LXC') ||
- (record.hypervisor === 'KVM' && record.pooltype ===
'PowerFlex'))))
+ (record.hypervisor === 'KVM' && record.pooltype ===
'PowerFlex')))) && record.vmtype !== 'sharedfsvm')
},
disabled: (record) => { return record.hostcontrolstate ===
'Offline' && record.hypervisor === 'KVM' },
mapping: {
