mooli tayer has uploaded a new change for review.
Change subject: backend: check if vds is null on setUpStatus callback.
......................................................................
backend: check if vds is null on setUpStatus callback.
In case an erroneous vds has been deleted, the callback should do nothing.
Change-Id: Ibbae7d5024a9854146e3a1fbe6091baeb53f7b22
Signed-off-by: Mooli Tayer <mta...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
1 file changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/26252/1
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index 18db65a..bfb3fea 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -478,15 +478,17 @@
synchronized (getLockObj()) {
VDS vds = DbFacade.getInstance().getVdsDao().get(getVdsId());
- /**
- * Move vds to Up status from error
- */
- if ( vds.getStatus() == VDSStatus.Error) {
- mFailedToRunVmAttempts.set(0);
- setStatus(VDSStatus.Up, vds);
-
DbFacade.getInstance().getVdsDynamicDao().updateStatus(getVdsId(),
VDSStatus.Up);
- log.infoFormat("Settings host {0} to up after {1} failed
attempts to run a VM", vds.getName(),
- mFailedToRunVmAttempts);
+ if (vds != null) {
+ /**
+ * Move vds to Up status from error
+ */
+ if ( vds.getStatus() == VDSStatus.Error) {
+ mFailedToRunVmAttempts.set(0);
+ setStatus(VDSStatus.Up, vds);
+
DbFacade.getInstance().getVdsDynamicDao().updateStatus(getVdsId(),
VDSStatus.Up);
+ log.infoFormat("Settings host {0} to up after {1} failed
attempts to run a VM", vds.getName(),
+ mFailedToRunVmAttempts);
+ }
}
}
}
--
To view, visit http://gerrit.ovirt.org/26252
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbae7d5024a9854146e3a1fbe6091baeb53f7b22
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: mooli tayer <mta...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
