Shubhendu Tripathi has uploaded a new change for review. Change subject: gluster: Query to get gluster bricks by task id ......................................................................
gluster: Query to get gluster bricks by task id Added a query to get gluster volume bricks by task id. This enables listing the set of bricks participating in a single task of remove-bricks action. Change-Id: I91c5074f29f1913a1b39f00de277c74aacf8bf46 Bug-Url: https://bugzilla.redhat.com/1040686 Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com> --- A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeBricksByTaskIdQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDao.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M packaging/dbscripts/gluster_volumes_sp.sql A packaging/dbscripts/upgrade/03_04_0230_add_task_id_idx_gluster_bricks.sql 8 files changed, 58 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/22344/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeBricksByTaskIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeBricksByTaskIdQuery.java new file mode 100644 index 0000000..2e91827 --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeBricksByTaskIdQuery.java @@ -0,0 +1,14 @@ +package org.ovirt.engine.core.bll.gluster; + +import org.ovirt.engine.core.common.queries.IdQueryParameters; + +public class GetGlusterVolumeBricksByTaskIdQuery<P extends IdQueryParameters> extends GlusterQueriesCommandBase<P> { + public GetGlusterVolumeBricksByTaskIdQuery(P params) { + super(params); + } + + @Override + protected void executeQueryCommand() { + getQueryReturnValue().setReturnValue(getGlusterBrickDao().getGlusterVolumeBricksByTaskId(getParameters().getId())); + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index 90d154d..643d58d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -259,6 +259,7 @@ GetGlusterVolumeOptionsInfo, GetGlusterVolumeBricks, GetGlusterVolumeBricksByServerId, + GetGlusterVolumeBricksByTaskId, GetGlusterBrickById, GetGlusterServersForImport, GetAddedGlusterServers, diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDao.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDao.java index 05e7094..e278b0c 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDao.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDao.java @@ -33,6 +33,8 @@ public GlusterBrickEntity getBrickByServerIdAndDirectory(Guid serverId, String brickDirectory); + public List<GlusterBrickEntity> getGlusterVolumeBricksByTaskId(Guid taskId); + public void updateBrickTask(Guid brickId, Guid taskId); public void updateBrickTasksInBatch(Collection<GlusterBrickEntity> bricks); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java index 92fa2f8..faabf91 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java @@ -135,6 +135,13 @@ } @Override + public List<GlusterBrickEntity> getGlusterVolumeBricksByTaskId(Guid taskId) { + return getCallsHandler().executeReadList("GetBricksByTaskId", + brickRowMapper, + getCustomMapSqlParameterSource().addValue("task_id", taskId)); + } + + @Override protected MapSqlParameterSource createFullParametersMapper(GlusterBrickEntity brick) { return createBrickParams(brick); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java index c1650ec..a0d1682 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoTest.java @@ -61,6 +61,13 @@ } @Test + public void testGetBricksByTaskId() { + List<GlusterBrickEntity> bricks = dao.getGlusterVolumeBricksByTaskId(FixturesTool.GLUSTER_ASYNC_TASK_ID1); + assertNotNull(bricks); + assertEquals(2, bricks.size()); + } + + @Test public void testRemove() { GlusterBrickEntity existingBrick = dao.getById(FixturesTool.GLUSTER_BRICK_UUID1); assertNotNull(existingBrick); @@ -94,6 +101,9 @@ newBrick.setServerId(server.getId()); newBrick.setServerName(server.getHostName()); newBrick.setBrickDirectory("/export/test-vol-distribute-1/dir3"); + GlusterAsyncTask asyncTask = new GlusterAsyncTask(); + asyncTask.setTaskId(FixturesTool.GLUSTER_ASYNC_TASK_ID1); + newBrick.setAsyncTask(asyncTask); newBrick.setStatus(GlusterStatus.UP); newBrick.setBrickOrder(0); @@ -204,7 +214,9 @@ GlusterAsyncTask asyncTask = new GlusterAsyncTask(); asyncTask.setTaskId(FixturesTool.GLUSTER_ASYNC_TASK_ID1); - dao.updateBrickTaskByHostIdBrickDir(existingBrick.getServerId(), existingBrick.getBrickDirectory(), FixturesTool.GLUSTER_ASYNC_TASK_ID1); + dao.updateBrickTaskByHostIdBrickDir(existingBrick.getServerId(), + existingBrick.getBrickDirectory(), + FixturesTool.GLUSTER_ASYNC_TASK_ID1); GlusterBrickEntity newEnity = dao.getById(FixturesTool.GLUSTER_BRICK_UUID1); @@ -231,7 +243,6 @@ List<GlusterBrickEntity> bricks = new ArrayList<>(); bricks.add(updateBrick); bricks.add(updateBrick2); - dao.updateAllBrickTasksByHostIdBrickDirInBatch(bricks); diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 9a8de85..e5fc79d 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -5140,6 +5140,7 @@ <column>id</column> <column>volume_id</column> <column>server_id</column> + <column>task_id</column> <column>brick_dir</column> <column>status</column> <column>brick_order</column> @@ -5151,6 +5152,7 @@ <value>6ccdc294-d77b-4929-809d-8afe7634b47d</value> <value>0c3f45f6-3fe9-4b35-a30c-be0d1a835ea8</value> <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value> + <value>61c94fc7-26b0-43e3-9d26-fc9d8cd6a763</value> <value>/export/test-vol-distribute-1/dir1</value> <value>UP</value> <value>0</value> @@ -5161,6 +5163,7 @@ <value>61c94fc7-26b0-43e3-9d26-fc9d8cd6a754</value> <value>0c3f45f6-3fe9-4b35-a30c-be0d1a835ea8</value> <value>2001751e-549b-4e7a-aff6-32d36856c125</value> + <value>61c94fc7-26b0-43e3-9d26-fc9d8cd6a763</value> <value>/export/test-vol-distribute-1/dir2</value> <value>UP</value> <value>1</value> @@ -5173,6 +5176,7 @@ <value>65d327f8-5864-4330-be04-fe27e1ffb553</value> <value>b2cb2f73-fab3-4a42-93f0-d5e4c069a43e</value> <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value> + <value>61c94fc7-26b0-43e3-9d26-fc9d8cd6a764</value> <value>/export/test-vol-replicate-1/r1dir1</value> <value>UP</value> <value>0</value> @@ -5183,6 +5187,7 @@ <value>2ab384da-6190-4668-aa2e-37bc5c5ff014</value> <value>b2cb2f73-fab3-4a42-93f0-d5e4c069a43e</value> <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value> + <value>61c94fc7-26b0-43e3-9d26-fc9d8cd6a764</value> <value>/export/test-vol-replicate-1/r1dir2</value> <value>UP</value> <value>1</value> @@ -5193,6 +5198,7 @@ <value>2702bb49-3037-405c-81c5-14a38793164e</value> <value>b2cb2f73-fab3-4a42-93f0-d5e4c069a43e</value> <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value> + <value>61c94fc7-26b0-43e3-9d26-fc9d8cd6a764</value> <value>/export/test-vol-replicate-1/r2dir1</value> <value>UP</value> <value>2</value> @@ -5203,6 +5209,7 @@ <value>41eb430f-c2ed-435c-b4eb-e1e19173754e</value> <value>b2cb2f73-fab3-4a42-93f0-d5e4c069a43e</value> <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value> + <value>61c94fc7-26b0-43e3-9d26-fc9d8cd6a764</value> <value>/export/test-vol-replicate-1/r2dir2</value> <value>UP</value> <value>3</value> diff --git a/packaging/dbscripts/gluster_volumes_sp.sql b/packaging/dbscripts/gluster_volumes_sp.sql index abb6c5e..be0946d 100644 --- a/packaging/dbscripts/gluster_volumes_sp.sql +++ b/packaging/dbscripts/gluster_volumes_sp.sql @@ -206,6 +206,17 @@ END; $procedure$ LANGUAGE plpgsql; +Create or replace FUNCTION GetBricksByTaskId(v_task_id UUID) +RETURNS SETOF gluster_volume_bricks_view STABLE +AS $procedure$ +BEGIN +RETURN QUERY SELECT * +FROM gluster_volume_bricks_view +WHERE task_id = v_task_id +ORDER BY brick_order; +END; $procedure$ +LANGUAGE plpgsql; + Create or replace FUNCTION GetGlusterOptionById(v_id UUID) RETURNS SETOF gluster_volume_options STABLE AS $procedure$ diff --git a/packaging/dbscripts/upgrade/03_04_0230_add_task_id_idx_gluster_bricks.sql b/packaging/dbscripts/upgrade/03_04_0230_add_task_id_idx_gluster_bricks.sql new file mode 100644 index 0000000..6628217 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_04_0230_add_task_id_idx_gluster_bricks.sql @@ -0,0 +1,3 @@ +DROP INDEX if exists IDX_gluster_bricks_task_id; +CREATE INDEX IDX_gluster_bricks_task_id ON job(task_id); + -- To view, visit http://gerrit.ovirt.org/22344 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91c5074f29f1913a1b39f00de277c74aacf8bf46 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
