Change in ovirt-engine[ovirt-engine-3.5]: core: GetAllDisksByVmId - race condition leads to NPE
by tnisan＠redhat.com
Tal Nisan 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:
Tal Nisan: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/31554
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffd0f8f695ce88baf2e1fbbe1deedf401a13b246
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5
Gerrit-Owner: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 4 months
Change in ovirt-engine[master]: webamdin: clarify error message on storage creation
by derez＠redhat.com
Daniel Erez has submitted this change and it was merged.
Change subject: webamdin: clarify error message on storage creation
......................................................................
webamdin: clarify error message on storage creation
Clarified error message in the webadmin when trying
to create a file storage domain with a used connection:
"Create operation failed. Storage connection is already
used by the following storage domain: {storage_name}."
Change-Id: Ifc91bc60e42c94b972bb8c2c26a2980072bfe43e
Bug-Url: https://bugzilla.redhat.com/1029934
Signed-off-by: Daniel Erez <derez(a)redhat.com>
---
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tal Nisan: Looks good to me, approved
Daniel Erez: Verified
--
To view, visit http://gerrit.ovirt.org/31549
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc91bc60e42c94b972bb8c2c26a2980072bfe43e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <derez(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
10 years, 4 months
Change in ovirt-engine[ovirt-engine-3.4]: core: Do not convert to preallocated images import to a bloc...
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: core: Do not convert to preallocated images import to a block domain
......................................................................
core: Do not convert to preallocated images import to a block domain
Images that are imported to a block domain were converted to
preallocated since block domain does not support a raw-sparse image.
Instead now we convert the volume format from raw to cow only in case
that the original volume is raw-sparse
Signed-off-by: Tal Nisan <tnisan(a)redhat.com>
Bug-Url: https://bugzilla.redhat.com/1111655
Change-Id: I519cf519857928899bf4cb4b65a862696e3a8aaa
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CopyImageGroupCommand.java
1 file changed, 22 insertions(+), 19 deletions(-)
Approvals:
Tal Nisan: Verified
Allon Mureinik: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/31548
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I519cf519857928899bf4cb4b65a862696e3a8aaa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
10 years, 4 months
Change in ovirt-engine[ovirt-engine-3.5]: aaa: Fix add users
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: aaa: Fix add users
......................................................................
aaa: Fix add users
Topic: AAA
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1127623
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: Verified
Oved Ourfali: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/31552
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0384bab5abb6b8e1b1c9d1582bc630ea012cd4f
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
10 years, 4 months
Change in ovirt-engine[ovirt-engine-3.5]: aaa: Remove "active" from groups
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: aaa: Remove "active" from groups
......................................................................
aaa: Remove "active" from groups
New optimized and reduced user sync algorithm, is syncing users and
the groups users actually belongs to.
This means that if there is group persisted at the database which
does not exist at the authz provider, it will be never reached and
hence not synchronized.
As result, the active/inactive flag in this case is useless as it will
be never changed, nor has any effect.
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720
Change-Id: Id12a172273228609715c7d09c4d173a83478c82c
Topic: AAA
Signed-off-by: Yair Zaslavsky <yzaslavs(a)redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbGroup.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/LdapGroup.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DbGroupDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbGroupDAOTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/user/SubTabUserGeneralView.java
M packaging/dbscripts/ad_groups_sp.sql
M packaging/dbscripts/create_views.sql
A packaging/dbscripts/upgrade/03_05_0890_remove_active_column_from_groups.sql
10 files changed, 23 insertions(+), 66 deletions(-)
Approvals:
Alon Bar-Lev: Verified
Oved Ourfali: Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/31551
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id12a172273228609715c7d09c4d173a83478c82c
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
10 years, 4 months
Change in ovirt-engine[ovirt-engine-3.5]: aaa: Reorder "namespace" and "authz" columns
by tnisan＠redhat.com
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
10 years, 4 months
Change in ovirt-engine[master]: core: GetAllDisksByVmId - race condition leads to NPE
by laravot＠redhat.com
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
10 years, 4 months
Change in ovirt-engine[ovirt-engine-3.4]: core: do not remove execution jobs with ongoing tasks
by oourfali＠redhat.com
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
10 years, 4 months
Change in ovirt-engine[ovirt-engine-3.4]: core: remove job with migration step on engine startup
by oourfali＠redhat.com
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
10 years, 4 months
Change in ovirt-engine[ovirt-engine-3.5]: core: DiskImageDAO - introduce getAllSnapshotsForLeaf
by tnisan＠redhat.com
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
10 years, 4 months