- Engine-commits - oVirt List Archives

Change in ovirt-engine[ovirt-engine-3.5]: aaa: Reorder "namespace" and "authz" columns
by tnisan＠redhat.com 17 Aug '14

17 Aug '14

Tal Nisan has submitted this change and it was merged. Change subject: aaa: Reorder "namespace" and "authz" columns ...................................................................... aaa: Reorder "namespace" and "authz" columns Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720 Change-Id: Ifa8b5de8c64231f35a603f12b8f710b6f10130f2 Topic: AAA Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabUserView.java 3 files changed, 25 insertions(+), 26 deletions(-) Approvals: Alon Bar-Lev: Verified Oved Ourfali: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31550 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa8b5de8c64231f35a603f12b8f710b6f10130f2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: core: GetAllDisksByVmId - race condition leads to NPE
by laravot＠redhat.com 17 Aug '14

17 Aug '14

Liron Aravot has submitted this change and it was merged. Change subject: core: GetAllDisksByVmId - race condition leads to NPE ...................................................................... core: GetAllDisksByVmId - race condition leads to NPE The given query is executed to get the vm disks with some required info (properties from the vm_device, snapshots..etc). As there are multiple queries on that flow, if some operation is done while the query runs we might get NPE (and inconsistent results). This patch prevents NPE when the vm device of a given disk was removed (which means that it was detached from the vm). Change-Id: Iffd0f8f695ce88baf2e1fbbe1deedf401a13b246 Bug-Url: https://bugzilla.redhat.com/1130065 Signed-off-by: Liron Aravot <laravot(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java 1 file changed, 9 insertions(+), 6 deletions(-) Approvals: Liron Aravot: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31498 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffd0f8f695ce88baf2e1fbbe1deedf401a13b246 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[ovirt-engine-3.4]: core: do not remove execution jobs with ongoing tasks
by oourfali＠redhat.com 17 Aug '14

17 Aug '14

Oved Ourfali has submitted this change and it was merged. Change subject: core: do not remove execution jobs with ongoing tasks ...................................................................... core: do not remove execution jobs with ongoing tasks In I5973c a mechanism that removes execution jobs that cannot be tracked after engine restart was added. A check whether there are ongoing tasks which are related to the jobs was missing, since if there are such async tasks then the operation can be tracked and resumed. Change-Id: I95b1066ca6fc015fd31101e7b551b4fae1d66904 Bug-Url: https://bugzilla.redhat.com/1099505 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M packaging/dbscripts/job_sp.sql 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Omer Frenkel: Looks good to me, approved Arik Hadas: Verified -- To view, visit http://gerrit.ovirt.org/31491 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I95b1066ca6fc015fd31101e7b551b4fae1d66904 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[ovirt-engine-3.4]: core: remove job with migration step on engine startup
by oourfali＠redhat.com 17 Aug '14

17 Aug '14

Oved Ourfali has submitted this change and it was merged. Change subject: core: remove job with migration step on engine startup ...................................................................... core: remove job with migration step on engine startup In I5973c we removed jobs that cannot be tracked after engine restart. Proper handling for internal migration which is represented as a step was missing, so it is added in this patch. Change-Id: If2de0753cf2773b84a3933f8d1b22516b236ee9b Bug-Url: https://bugzilla.redhat.com/1099505 Signed-off-by: Arik Hadas <ahadas(a)redhat.com> --- M packaging/dbscripts/job_sp.sql 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Omer Frenkel: Looks good to me, approved Arik Hadas: Verified -- To view, visit http://gerrit.ovirt.org/31490 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2de0753cf2773b84a3933f8d1b22516b236ee9b Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[ovirt-engine-3.5]: core: DiskImageDAO - introduce getAllSnapshotsForLeaf
by tnisan＠redhat.com 17 Aug '14

17 Aug '14

Tal Nisan has submitted this change and it was merged. Change subject: core: DiskImageDAO - introduce getAllSnapshotsForLeaf ...................................................................... core: DiskImageDAO - introduce getAllSnapshotsForLeaf Introducing a recursive stored procedure for retrieving a snapshot chain by a leaf image. It is required for ensuring data integrity when querying GetAllDisksByVmId (i.e. avoid race while removing a disk/etc). Change-Id: Ib6068be44fd5e5c47eed2064d87f506d3e3be444 Bug-Url: https://bugzilla.redhat.com/1113087 Signed-off-by: Daniel Erez <derez(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java M packaging/dbscripts/disk_images_sp.sql 13 files changed, 78 insertions(+), 24 deletions(-) Approvals: Daniel Erez: Verified Allon Mureinik: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31547 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6068be44fd5e5c47eed2064d87f506d3e3be444 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[ovirt-engine-3.5]: engine: AudibleLogBase vmid need to set for logging info
by tnisan＠redhat.com 17 Aug '14

17 Aug '14

Tal Nisan has submitted this change and it was merged. Change subject: engine: AudibleLogBase vmid need to set for logging info ...................................................................... engine: AudibleLogBase vmid need to set for logging info AttachUserToVmFromPoolAndRunCommand override the setVmId() but is not calling the super.setVmId() - the results is <UNKNOWN> vm name in engines log. Bug-Url: https://bugzilla.redhat.com/1017030 Change-Id: I485bcdb34ed0e3745e2aab3413dfd564dc0234ab Signed-off-by: Shahar Havivi <shaharh(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Shahar Havivi: Verified Omer Frenkel: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31546 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I485bcdb34ed0e3745e2aab3413dfd564dc0234ab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: aaa: Fix add users
by oourfali＠redhat.com 17 Aug '14

17 Aug '14

Oved Ourfali has submitted this change and it was merged. Change subject: aaa: Fix add users ...................................................................... aaa: Fix add users Topic: AAA Change-Id: Ie0384bab5abb6b8e1b1c9d1582bc630ea012cd4f Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueryData.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryGroupByIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/GetDirectoryUserByIdQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/DirectoryIdQueryParameters.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/DirectorySearchParameters.java A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/ResourceConstants.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java 15 files changed, 163 insertions(+), 146 deletions(-) Approvals: Alon Bar-Lev: Looks good to me, but someone else must approve Yair Zaslavsky: Verified Oved Ourfali: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31499 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie0384bab5abb6b8e1b1c9d1582bc630ea012cd4f Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: core: DiskImageDAO - introduce getAllSnapshotsForLeaf
by derez＠redhat.com 17 Aug '14

17 Aug '14

Daniel Erez has submitted this change and it was merged. Change subject: core: DiskImageDAO - introduce getAllSnapshotsForLeaf ...................................................................... core: DiskImageDAO - introduce getAllSnapshotsForLeaf Introducing a recursive stored procedure for retrieving a snapshot chain by a leaf image. It is required for ensuring data integrity when querying GetAllDisksByVmId (i.e. avoid race while removing a disk/etc). Change-Id: Ib6068be44fd5e5c47eed2064d87f506d3e3be444 Bug-Url: https://bugzilla.redhat.com/1113087 Signed-off-by: Daniel Erez <derez(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllDisksByVmIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDAOTest.java M packaging/dbscripts/disk_images_sp.sql 13 files changed, 78 insertions(+), 24 deletions(-) Approvals: Daniel Erez: Verified Allon Mureinik: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31500 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6068be44fd5e5c47eed2064d87f506d3e3be444 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: core: cleanup - removed redundant line
by laravot＠redhat.com 17 Aug '14

17 Aug '14

Liron Aravot has submitted this change and it was merged. Change subject: core: cleanup - removed redundant line ...................................................................... core: cleanup - removed redundant line In CreateAllSnapshotsFromVmCommandTest VmValidator is mock out twice for no reason. Latest mock removed. Change-Id: Id5d6a5edea143c5a92dce6bdd96e691d78aae79c Signed-off-by: Vered Volansky <vvolansk(a)redhat.com> --- M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommandTest.java 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Vered Volansky: Verified Liron Aravot: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31545 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5d6a5edea143c5a92dce6bdd96e691d78aae79c Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vered Volansky <vvolansk(a)redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com> Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com> Gerrit-Reviewer: Vered Volansky <vvolansk(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in ovirt-engine[master]: engine: AudibleLogBase vmid need to set for logging info
by shavivi＠redhat.com 17 Aug '14

17 Aug '14

Shahar Havivi has submitted this change and it was merged. Change subject: engine: AudibleLogBase vmid need to set for logging info ...................................................................... engine: AudibleLogBase vmid need to set for logging info AttachUserToVmFromPoolAndRunCommand override the setVmId() but is not calling the super.setVmId() - the results is <UNKNOWN> vm name in engines log. Bug-Url: https://bugzilla.redhat.com/1017030 Change-Id: I485bcdb34ed0e3745e2aab3413dfd564dc0234ab Signed-off-by: Shahar Havivi <shaharh(a)redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Shahar Havivi: Verified Omer Frenkel: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/31492 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I485bcdb34ed0e3745e2aab3413dfd564dc0234ab Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com> Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com> Gerrit-Reviewer: automation(a)ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server

1 0