Michael Kublin has uploaded a new change for review. Change subject: engine: Fixing saveOrUpdate qmethod in AsyncTaskUtils ......................................................................
engine: Fixing saveOrUpdate qmethod in AsyncTaskUtils The following patch should solve a bug, when async_task_entities table never filled. The bug was caused because of using a wrong API, so a fix is start to use a correct API and remove unused APIs Change-Id: I8874a4222ac17ecc4ca9de3fbccc18e16efe20c8 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAO.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java 3 files changed, 5 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/13614/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java index 57697ca..f1fb5cd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/AsyncTaskUtils.java @@ -18,32 +18,17 @@ public static void addOrUpdateTaskInDB(SPMAsyncTask asyncTask) { try { if (asyncTask.getParameters().getDbAsyncTask() != null) { - DbFacade.getInstance().getAsyncTaskDao().saveOrUpdate(asyncTask.getParameters().getDbAsyncTask()); + DbFacade.getInstance() + .getAsyncTaskDao() + .saveOrUpdate(asyncTask.getParameters().getDbAsyncTask(), + asyncTask.getEntityType(), + asyncTask.getAssociatedEntities()); } } catch (RuntimeException e) { log.error(String.format( "Adding/Updating task %1$s to DataBase threw an exception.", asyncTask.getTaskID()), e); } - } - - /** - * Saves async task in DB - * @param asyncTask - * async task entity to be saved in DB - */ - public static void saveAsyncTaskInDB(SPMAsyncTask asyncTask) { - DbFacade.getInstance().getAsyncTaskDao().save(asyncTask.getParameters().getDbAsyncTask(),asyncTask.getEntityType(),asyncTask.getAssociatedEntities()); - - } - - /** - * Updates existing task in DB - * @param asyncTask async task entity to be updated in DB - */ - public static void updateAsyncTaskInDB(SPMAsyncTask asyncTask) { - DbFacade.getInstance().getAsyncTaskDao().update(asyncTask.getParameters().getDbAsyncTask()); - } private static final Log log = LogFactory.getLog(AsyncTaskUtils.class); diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAO.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAO.java index 738a147..e8ff590 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAO.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAO.java @@ -81,11 +81,4 @@ * @param task the task to save */ void save(AsyncTasks newAsyncTask); - - /** - * Saves or updates the async task - * @param asyncTask the task to update or save - */ - void saveOrUpdate(AsyncTasks asyncTask); - } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java index 1c3d426..37e5600 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AsyncTaskDAODbFacadeImpl.java @@ -126,11 +126,6 @@ } @Override - public void saveOrUpdate(AsyncTasks task) { - saveOrUpdate(task, null, EMPTY_GUIDS_ARRAY); - } - - @Override public void saveOrUpdate(AsyncTasks task, VdcObjectType entityType, Guid... entityIds) { AsyncTaskParameterSource parameterSource = getTaskParameterSource(task); parameterSource.addValue("entity_type", (entityType != null) ? entityType.toString() : null); -- To view, visit http://gerrit.ovirt.org/13614 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8874a4222ac17ecc4ca9de3fbccc18e16efe20c8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
