- Engine-commits - oVirt List Archives

Change in ovirt-engine[master]: core: Fix test break in UpdateVmDisksCommandTest
by mlipchuk＠redhat.com 23 May '13

23 May '13

Maor Lipchuk has submitted this change and it was merged. Change subject: core: Fix test break in UpdateVmDisksCommandTest ...................................................................... core: Fix test break in UpdateVmDisksCommandTest Fixed the test break caused by commit b0e796daa33a5c2e693bc785c064b81dc7e9e79f. Change-Id: Ifa0f74d5ebe8aa33b70ce9cb3772d8ce5c894cbb Signed-off-by: Allon Mureinik <amureini(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmDiskCommandTest.java 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Allon Mureinik: Verified Maor Lipchuk: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15026 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa0f74d5ebe8aa33b70ce9cb3772d8ce5c894cbb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com>

1 0

Change in ovirt-engine[master]: Remove double.doubleToLongBits from VM.hashCode
by shavivi＠redhat.com 23 May '13

23 May '13

Shahar Havivi has submitted this change and it was merged. Change subject: Remove double.doubleToLongBits from VM.hashCode ...................................................................... Remove double.doubleToLongBits from VM.hashCode patch http://gerrit.ovirt.org/#/c/14965 added hashCode to VM, but GWT doesn't support doubleToLongBits() method. Change-Id: I4b5f9afabb645ece870df409e5959d151d1952e1 Signed-off-by: Shahar Havivi <shavivi(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Shahar Havivi: Verified Oved Ourfali: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/15025 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b5f9afabb645ece870df409e5959d151d1952e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>

1 0

Change in ovirt-engine[master]: core: Check all attached VMs when updating shared disk boot ...
by tnisan＠redhat.com 23 May '13

23 May '13

Tal Nisan has submitted this change and it was merged. Change subject: core: Check all attached VMs when updating shared disk boot flag ...................................................................... core: Check all attached VMs when updating shared disk boot flag When updating a VM disk to be bootable, the other VMs that the disk is attached to were checked to see if they already have a bootable disk attached and if so the operation would have failed giving an error message that the VM already has a bootable disk attached. This check was changed to check all VMs and after iterating on all if one or more contained a bootable disk fail and give an error message containing all of the VMs that the operation failed on so the user will have all the info in the first try Also introduced a new DAO method to retrieve a VM bootable disk from the DB Bug-Url: https://bugzilla.redhat.com/949923 Change-Id: I82ee07e02e08d60f559017d9f8205ab7df41c5c3 Signed-off-by: Tal Nisan <tnisan(a)redhat.com> --- M backend/manager/dbscripts/all_disks_sp.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDao.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskDaoDbFacadeImpl.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskDaoTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 12 files changed, 69 insertions(+), 7 deletions(-) Approvals: Tal Nisan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14709 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82ee07e02e08d60f559017d9f8205ab7df41c5c3 Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Alissa Bonas <abonas(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Sergey Gotliv <sgotliv(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com> Gerrit-Reviewer: liron aravot <liron.aravot(a)gmail.com>

1 0

Change in ovirt-engine[master]: core: add destination sd to CopyImageVDSCommand log
by tnisan＠redhat.com 23 May '13

23 May '13

Tal Nisan has submitted this change and it was merged. Change subject: core: add destination sd to CopyImageVDSCommand log ...................................................................... core: add destination sd to CopyImageVDSCommand log When executing CopyImageVDSCommand, the destination sd wasn't printed. Adding it to have more clear logs. Change-Id: I8e36973cc099d3a373b1f3d2b8a08bf9fe50100a Signed-off-by: Liron Aravot <laravot(a)redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/CopyImageVDSCommand.java 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Tal Nisan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14986 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e36973cc099d3a373b1f3d2b8a08bf9fe50100a Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Liron Ar <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>

1 0

Change in ovirt-engine[master]: gluster: fix forwarding vdsm errors
by sanjal＠redhat.com 23 May '13

23 May '13

Shireesh Anjal has submitted this change and it was merged. Change subject: gluster: fix forwarding vdsm errors ...................................................................... gluster: fix forwarding vdsm errors set 'null' to VdcFault.Error to make the frontend to show the error returned by vdsm instead of "Internal Server Error". Change-Id: I5df008d6626da5ff0de4ad6231ef65f51e08ec84 Bug-Url: https://bugzilla.redhat.com/956159 Signed-off-by: Kanagaraj M <kmayilsa(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Shireesh Anjal: Looks good to me, approved Kanagaraj M: Verified -- To view, visit http://gerrit.ovirt.org/15022 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5df008d6626da5ff0de4ad6231ef65f51e08ec84 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <kmayilsa(a)redhat.com> Gerrit-Reviewer: Kanagaraj M <kmayilsa(a)redhat.com> Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: Shireesh Anjal <sanjal(a)redhat.com> Gerrit-Reviewer: Shubhendu Tripathi <shtripat(a)redhat.com>

1 0

Change in ovirt-engine[master]: packaging: Updated otopi for fully automated execution
by juan.hernandez＠redhat.com 23 May '13

23 May '13

Juan Hernandez has submitted this change and it was merged. Change subject: packaging: Updated otopi for fully automated execution ...................................................................... packaging: Updated otopi for fully automated execution This patch updates an otopi engine-setup plugin to allow a completely automated setup execution with the additional config file provided on command line. This allows a flow similar to one using an "answerfile" in the legacy setup. Additionally, this patch updates parameters for the automated cleanup flows, so they also can be done in unattended mode. This patch updates the handling of the following constants: OVESETUP_APACHE/configureRootRedirection OVESETUP_APACHE/configureSsl OVESETUP_CONFIG/isoDomainMountPoint OVESETUP_DIALOG/confirmSettings OVESETUP_CORE/engineStop OVESETUP_CORE/remove Change-Id: Ia327a4be9e1f5498e6aedc7dfb66663dd861fc26 Signed-off-by: Alex Lourie <alourie(a)redhat.com> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/apache/root.py M packaging/setup/plugins/ovirt-engine-setup/apache/ssl.py M packaging/setup/plugins/ovirt-engine-setup/config/iso_domain.py M packaging/setup/plugins/ovirt-engine-setup/dialog/preview.py 5 files changed, 61 insertions(+), 26 deletions(-) Approvals: Juan Hernandez: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14985 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia327a4be9e1f5498e6aedc7dfb66663dd861fc26 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alex Lourie <alourie(a)redhat.com> Gerrit-Reviewer: Alex Lourie <alourie(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com> Gerrit-Reviewer: Moran Goldboim <mgoldboi(a)redhat.com> Gerrit-Reviewer: Ofer Schreiber <oschreib(a)redhat.com> Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>

1 0

Change in ovirt-engine[engine_3.2]: restapi: Added usages option to CLI add cluster network
by mpastern＠redhat.com 23 May '13

23 May '13

Michael Pasternak has submitted this change and it was merged. Change subject: restapi: Added usages option to CLI add cluster network ...................................................................... restapi: Added usages option to CLI add cluster network When adding a network via CLI, in cluster context, added the ability to pass the usages option - same as when updating a network. Change-Id: Id4573674ddd1015eba33a05b95d687f685f707c4 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=949884 Signed-off-by: Lior Vernia <lvernia(a)redhat.com> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Michael Pasternak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14859 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4573674ddd1015eba33a05b95d687f685f707c4 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: engine_3.2 Gerrit-Owner: Lior Vernia <lvernia(a)redhat.com> Gerrit-Reviewer: Lior Vernia <lvernia(a)redhat.com> Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>

1 0

Change in ovirt-engine[master]: gluster: Sync gluster service statuses
by sanjal＠redhat.com 23 May '13

23 May '13

Shireesh Anjal has submitted this change and it was merged. Change subject: gluster: Sync gluster service statuses ...................................................................... gluster: Sync gluster service statuses Periodically fetches the status of gluster related services, and updates the database with new statuses. The existing refresh interval defined in the option GlusterRefreshRateLight is used for scheduling the job. Change-Id: I312cacf698cb3420e30d96c42a92959b257c4abd Signed-off-by: Shireesh Anjal <anjalshireesh(a)gmail.com> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterJob.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterJobsManager.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterServiceSyncJob.java A backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterServiceSyncJobTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/gluster/GlusterFeatureSupported.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/gluster/GlusterAuditLogUtil.java M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties 13 files changed, 844 insertions(+), 2 deletions(-) Approvals: Shireesh Anjal: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14644 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I312cacf698cb3420e30d96c42a92959b257c4abd Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shireesh Anjal <sanjal(a)redhat.com> Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com> Gerrit-Reviewer: Shireesh Anjal <sanjal(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>

1 0

Change in ovirt-engine[master]: findbugs: Non serializable field in serializable class
by shavivi＠redhat.com 23 May '13

23 May '13

Shahar Havivi has submitted this change and it was merged. Change subject: findbugs: Non serializable field in serializable class ...................................................................... findbugs: Non serializable field in serializable class findbugs: Se: Non-transient non-serializable instance field in serializable class (SE_BAD_FIELD) Change-Id: Idec371438a72574f9a2e74efe8fc67a74bc74efc Signed-off-by: Shahar Havivi <shavivi(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/AsyncTaskCreationInfo.java 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Shahar Havivi: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14968 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idec371438a72574f9a2e74efe8fc67a74bc74efc Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>

1 0

Change in ovirt-engine[master]: findbugs: class overrides equals, but does not override hash...
by shavivi＠redhat.com 23 May '13

23 May '13

Hello ovirt-engine-commits, I'd like you to do a code review. Please visit http://gerrit.ovirt.org/14965 to review the following change. Change subject: findbugs: class overrides equals, but does not override hashCode ...................................................................... findbugs: class overrides equals, but does not override hashCode findbugs reason: HE: Class defines equals() and uses Object.hashCode() (HE_EQUALS_USE_HASHCODE) Change-Id: I3e276cc87bdfd68e657a8217207dc2518ab96f34 Signed-off-by: Shahar Havivi <shavivi(a)redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java 1 file changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/14965/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 877867c..dc29d81 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 @@ -1214,6 +1214,57 @@ return false; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + long temp; + temp = Double.doubleToLongBits(_actualDiskWithSnapthotsSize); + result = prime * result + (int) (temp ^ (temp >>> 32)); + result = prime * result + (balloonEnabled ? 1231 : 1237); + result = prime * result + ((cdPath == null) ? 0 : cdPath.hashCode()); + result = prime * result + ((configured == null) ? 0 : configured.hashCode()); + result = prime * result + ((diskMap == null) ? 0 : diskMap.hashCode()); + temp = Double.doubleToLongBits(diskSize); + result = prime * result + (int) (temp ^ (temp >>> 32)); + result = prime * result + ((floppyPath == null) ? 0 : floppyPath.hashCode()); + result = prime * result + migreatingFromPort; + result = prime * result + migreatingToPort; + result = prime * result + ((privateGuestAgentVersion == null) ? 0 : privateGuestAgentVersion.hashCode()); + result = prime * result + ((runOnVdsName == null) ? 0 : runOnVdsName.hashCode()); + result = prime * result + (runOnce ? 1231 : 1237); + result = prime * result + ((selectionAlgorithm == null) ? 0 : selectionAlgorithm.hashCode()); + result = prime * result + ((snapshots == null) ? 0 : snapshots.hashCode()); + result = prime * result + ((spiceDriverVersion == null) ? 0 : spiceDriverVersion.hashCode()); + result = prime * result + ((storagePoolId == null) ? 0 : storagePoolId.hashCode()); + result = prime * result + ((storagePoolName == null) ? 0 : storagePoolName.hashCode()); + result = prime * result + (transparentHugePages ? 1231 : 1237); + result = prime * result + (useSysPrep ? 1231 : 1237); + result = + prime * result + ((vdsGroupCompatibilityVersion == null) ? 0 : vdsGroupCompatibilityVersion.hashCode()); + result = prime * result + ((vdsGroupCpuFlagsData == null) ? 0 : vdsGroupCpuFlagsData.hashCode()); + result = prime * result + ((vdsGroupCpuName == null) ? 0 : vdsGroupCpuName.hashCode()); + result = prime * result + ((vdsGroupDescription == null) ? 0 : vdsGroupDescription.hashCode()); + result = prime * result + ((vdsGroupName == null) ? 0 : vdsGroupName.hashCode()); + result = prime * result + ((vmDynamic == null) ? 0 : vmDynamic.hashCode()); + result = prime * result + ((vmPayload == null) ? 0 : vmPayload.hashCode()); + result = prime * result + ((vmPoolId == null) ? 0 : vmPoolId.hashCode()); + result = prime * result + ((vmPoolName == null) ? 0 : vmPoolName.hashCode()); + result = prime * result + ((vmStatic == null) ? 0 : vmStatic.hashCode()); + result = prime * result + ((vmStatistics == null) ? 0 : vmStatistics.hashCode()); + result = prime * result + vmtCpuPerSocket; + result = prime * result + ((vmtCreationDate == null) ? 0 : vmtCreationDate.hashCode()); + result = prime * result + ((vmtDescription == null) ? 0 : vmtDescription.hashCode()); + result = prime * result + vmtMemSizeMb; + result = prime * result + ((vmtName == null) ? 0 : vmtName.hashCode()); + result = prime * result + vmtNumOfCpus; + result = prime * result + vmtNumOfSockets; + result = prime * result + ((vmtOs == null) ? 0 : vmtOs.hashCode()); + result = prime * result + ((vmtTimeZone == null) ? 0 : vmtTimeZone.hashCode()); + result = prime * result + vmtchildCount; + return result; + } + public String getVmPoolName() { return vmPoolName; } -- To view, visit http://gerrit.ovirt.org/14965 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3e276cc87bdfd68e657a8217207dc2518ab96f34 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: ovirt-engine-commits <engine-commits(a)ovirt.org>

1 1