Darshan N has uploaded a new change for review.
Change subject: gluster: Proper checking before retriving volume in
eventMessageLogger
......................................................................
gluster: Proper checking before retriving volume in eventMessageLogger
while retriving volume sometimes it may cause null pointer
exception. So volume is retrived after proper checking.
Change-Id: I78367afc8771b2adb6b653f5d23bdbfe28e126d2
Signed-off-by: ndarshan <dnara...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/21949/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
index de5c151..cef81b0 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
@@ -222,8 +222,14 @@
}
public void eventMessageLogger(GlusterAsyncTask task, JobExecutionStatus
oldStatus, VDSGroup cluster) {
- String vol = task.getTaskParameters().getVolumeName();
- GlusterVolumeEntity volume = getVolumeDao().getByName(cluster.getId(),
vol);
+ GlusterVolumeEntity volume;
+ if ( getVolumeDao().getVolumeByGlusterTask(task.getTaskId()) != null) {
+ volume = getVolumeDao().getVolumeByGlusterTask(task.getTaskId());
+ }
+ else {
+ String vol = task.getTaskParameters().getVolumeName();
+ volume = getVolumeDao().getByName(cluster.getId(), vol);
+ }
if (JobExecutionStatus.ABORTED == task.getStatus() ||
JobExecutionStatus.FINISHED == task.getStatus() || JobExecutionStatus.FAILED ==
task.getStatus()){
if(oldStatus != task.getStatus()){
logMessage(cluster.getId(), volume ,
taskTypeStrMap.get(task.getType()), task.getStatus().name().toLowerCase(),
taskTypeAuditMsg.get(task.getType()));
--
To view, visit http://gerrit.ovirt.org/21949
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78367afc8771b2adb6b653f5d23bdbfe28e126d2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Darshan N <dnara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
