Change in ovirt-engine[master]: engine: Stop checking if hosts support live merge

amureini at redhat.com amureini at redhat.com
Tue Apr 19 17:19:54 UTC 2016


Allon Mureinik has submitted this change and it was merged.

Change subject: engine: Stop checking if hosts support live merge
......................................................................


engine: Stop checking if hosts support live merge

oVirt Engine 3.5.1 introduced the live merge feature in the 3.5 DC
level. However, this DC version allowed RHEL 6.y and RHEL 7.0 hosts with
[relatively] old qemu and libvirt versions which did not support it,
forcing the engine to explicitly check if the host running a VM a
snapshot should be merged on supports the feature.

Since commit 6eecdd7 only DCs of level 3.6 or higher are supported,
meaning that the underlying platform is EL 7.1 or Fedora 22 (at least).
The qemu and libvirt versions there support live merging snapshots,
making this check redundant.

Removing this check not only cleans up the code considerably, but also
reduces execution time in a noticeable way by removing additional
database flows from various places in the flow.

Change-Id: I227efa20d9d7c26c15d536c378734563c87887dc
Signed-off-by: Allon Mureinik <amureini at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotsCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotsCommandTest.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommandTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineError.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDaoImpl.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDaoImpl.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties
M packaging/dbscripts/create_views.sql
A packaging/dbscripts/upgrade/04_00_0510_remove_live_merge_support_check.sql
M packaging/dbscripts/vds_sp.sql
25 files changed, 7 insertions(+), 133 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Allon Mureinik: Verified; Looks good to me, approved



-- 
To view, visit https://gerrit.ovirt.org/56306
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I227efa20d9d7c26c15d536c378734563c87887dc
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Ala Hino <ahino at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika at redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Tal Nisan <tnisan at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>



More information about the Engine-commits mailing list