Sahina Bose has uploaded a new change for review. Change subject: engine: Populate task entity on brick ......................................................................
engine: Populate task entity on brick While returning the bricks list on volume, populate the task entity from volume as this is used by the GWT UI layer. Change-Id: I3f72371323ef7696313b5333707ef4f3f771e7e1 Signed-off-by: Sahina Bose <[email protected]> --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/20017/1 diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java index f375254..2c3e740 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java @@ -312,11 +312,20 @@ */ private void fetchRelatedEntities(GlusterVolumeEntity volume) { if (volume != null) { - volume.setBricks(dbFacade.getGlusterBrickDao().getBricksOfVolume(volume.getId())); volume.setOptions(dbFacade.getGlusterOptionDao().getOptionsOfVolume(volume.getId())); volume.setAccessProtocols(new HashSet<AccessProtocol>(getAccessProtocolsOfVolume(volume.getId()))); volume.setTransportTypes(new HashSet<TransportType>(getTransportTypesOfVolume(volume.getId()))); volume.setAsyncTask(getAsyncTaskOfVolume(volume.getId())); + List<GlusterBrickEntity> bricks = dbFacade.getGlusterBrickDao().getBricksOfVolume(volume.getId()); + if (volume.getAsyncTask()!=null && volume.getAsyncTask().getStepId() != null) { + for (GlusterBrickEntity brick: bricks) + { + if (brick.getAsyncTask() != null && brick.getAsyncTask().getTaskId().equals(volume.getAsyncTask().getTaskId())) { + brick.setAsyncTask(volume.getAsyncTask()); + } + } + } + volume.setBricks(bricks); } } -- To view, visit http://gerrit.ovirt.org/20017 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f72371323ef7696313b5333707ef4f3f771e7e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
