Arik Hadas has uploaded a new change for review.
Change subject: core: move existing hibernation volumes to active snapshots
......................................................................
core: move existing hibernation volumes to active snapshots
Move hibernation volumes representations of existing suspended VMs to
their active snapshots. This patch also removes the
hibernation_vol_handle from vm_dynamic which is no longer used after
that change.
Change-Id: If3ac558e2748b02939c0f74f95b60a9960363dd3
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java
M packaging/dbscripts/create_views.sql
4 files changed, 6 insertions(+), 19 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/36523/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
index 6ec5de1..df691e0 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java
@@ -48,6 +48,8 @@
private boolean nextRunConfigurationExists;
+ private String hibernationVolHandle;
+
public String getUserDefinedProperties() {
return vmStatic.getUserDefinedProperties();
}
@@ -1060,11 +1062,11 @@
}
public String getHibernationVolHandle() {
- return this.vmDynamic.getHibernationVolHandle();
+ return hibernationVolHandle;
}
public void setHibernationVolHandle(String value) {
- this.vmDynamic.setHibernationVolHandle(value);
+ this.hibernationVolHandle =(value);
}
public String getCustomCpuName() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
index ad2c554..4b57098 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
@@ -50,8 +50,6 @@
private String clientIp;
private Integer guestRequestedMemory;
@UnchangeableByVdsm
- private String hibernationVolHandle;
- @UnchangeableByVdsm
private BootSequence bootSequence;
private VmExitStatus exitStatus;
private VmPauseStatus pauseStatus;
@@ -101,7 +99,6 @@
result = prime * result + ((guestLastLogoutTime == null) ? 0 :
guestLastLogoutTime.hashCode());
result = prime * result + ((guestOs == null) ? 0 : guestOs.hashCode());
result = prime * result + ((guestRequestedMemory == null) ? 0 :
guestRequestedMemory.hashCode());
- result = prime * result + ((hibernationVolHandle == null) ? 0 :
hibernationVolHandle.hashCode());
result = prime * result + ((kvmEnable == null) ? 0 :
kvmEnable.hashCode());
result = prime * result + ((lastVdsRunOn == null) ? 0 :
lastVdsRunOn.hashCode());
result = prime * result + ((disks == null) ? 0 : disks.hashCode());
@@ -161,7 +158,6 @@
&& ObjectUtils.objectsEqual(guestLastLogoutTime,
other.guestLastLogoutTime)
&& ObjectUtils.objectsEqual(guestOs, other.guestOs)
&& ObjectUtils.objectsEqual(guestRequestedMemory,
other.guestRequestedMemory)
- && ObjectUtils.objectsEqual(hibernationVolHandle,
other.hibernationVolHandle)
&& ObjectUtils.objectsEqual(kvmEnable, other.kvmEnable)
&& ObjectUtils.objectsEqual(lastVdsRunOn, other.lastVdsRunOn)
&& ObjectUtils.objectsEqual(disks, other.disks)
@@ -507,14 +503,6 @@
public void setGuestRequestedMemory(Integer value) {
this.guestRequestedMemory = value;
- }
-
- public String getHibernationVolHandle() {
- return this.hibernationVolHandle;
- }
-
- public void setHibernationVolHandle(String value) {
- this.hibernationVolHandle = value;
}
public void setPauseStatus(VmPauseStatus pauseStatus) {
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java
index 42d760b..486f37e 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDAODbFacadeImpl.java
@@ -115,8 +115,6 @@
.addValue("client_ip", vm.getClientIp())
.addValue("guest_requested_memory",
vm.getGuestRequestedMemory())
- .addValue("hibernation_vol_handle",
- vm.getHibernationVolHandle())
.addValue("exit_status", vm.getExitStatus().getValue())
.addValue("pause_status", vm.getPauseStatus().getValue())
.addValue("exit_message", vm.getExitMessage())
@@ -177,7 +175,6 @@
entity.setLastVdsRunOn(getGuid(rs, "last_vds_run_on"));
entity.setClientIp(rs.getString("client_ip"));
entity.setGuestRequestedMemory((Integer)
rs.getObject("guest_requested_memory"));
-
entity.setHibernationVolHandle(rs.getString("hibernation_vol_handle"));
VmExitStatus exitStatus =
VmExitStatus.forValue(rs.getInt("exit_status"));
VmPauseStatus pauseStatus =
VmPauseStatus.forValue(rs.getInt("pause_status"));
entity.setExitMessage(rs.getString("exit_message"));
diff --git a/packaging/dbscripts/create_views.sql
b/packaging/dbscripts/create_views.sql
index 0224f22..af978de 100644
--- a/packaging/dbscripts/create_views.sql
+++ b/packaging/dbscripts/create_views.sql
@@ -705,7 +705,7 @@
vm_dynamic.vm_pid as vm_pid, vm_dynamic.last_start_time
as last_start_time, vm_dynamic.guest_cur_user_name as guest_cur_user_name,
vm_dynamic.console_cur_user_name as console_cur_user_name,
vm_dynamic.guest_last_login_time as
guest_last_login_time, vm_dynamic.guest_last_logout_time as
guest_last_logout_time, vm_dynamic.guest_os as guest_os,
vm_dynamic.console_user_id as console_user_id,
vm_dynamic.guest_agent_nics_hash as guest_agent_nics_hash,
- vm_dynamic.run_on_vds as run_on_vds,
vm_dynamic.migrating_to_vds as migrating_to_vds, vm_dynamic.app_list as
app_list, vm_dynamic.display as display, vm_dynamic.hibernation_vol_handle as
hibernation_vol_handle,
+ vm_dynamic.run_on_vds as run_on_vds,
vm_dynamic.migrating_to_vds as migrating_to_vds, vm_dynamic.app_list as
app_list, vm_dynamic.display as display,
vm_pool_map_view.vm_pool_name as vm_pool_name,
vm_pool_map_view.vm_pool_id as vm_pool_id, vm_static.vm_guid as vm_guid,
vm_static.num_of_monitors as num_of_monitors, vm_static.single_qxl_pci as
single_qxl_pci, vm_static.allow_console_reconnect as allow_console_reconnect,
vm_static.is_initialized as is_initialized,
vm_static.num_of_sockets as num_of_sockets,
vm_static.cpu_per_socket as cpu_per_socket, vm_static.usb_policy as usb_policy,
vm_dynamic.acpi_enable as acpi_enable, vm_dynamic.session as session,
vm_static.num_of_sockets*vm_static.cpu_per_socket as
num_of_cpus,
@@ -763,7 +763,7 @@
vms.vm_host, vms.vmt_num_of_sockets * vms.vmt_cpu_per_socket AS
vmt_num_of_cpus, vms.vm_pid,
vms.last_start_time, vms.last_stop_time, vms.guest_cur_user_name,
vms.console_cur_user_name, vms.guest_last_login_time, vms.console_user_id,
vms.guest_last_logout_time, vms.guest_os, vms.run_on_vds,
vms.migrating_to_vds, vms.app_list, vms.display,
- vms.hibernation_vol_handle, vms.vm_pool_name, vms.vm_pool_id,
vms.vm_guid, vms.num_of_monitors, vms.single_qxl_pci,
+ vms.vm_pool_name, vms.vm_pool_id, vms.vm_guid,
vms.num_of_monitors, vms.single_qxl_pci,
vms.allow_console_reconnect,
vms.is_initialized, vms.num_of_sockets, vms.cpu_per_socket,
vms.usb_policy, vms.acpi_enable,
vms.session, vms.num_of_sockets * vms.cpu_per_socket AS
num_of_cpus, vms.display_ip, vms.display_type,
--
To view, visit http://gerrit.ovirt.org/36523
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3ac558e2748b02939c0f74f95b60a9960363dd3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
