Michael Kublin has uploaded a new change for review.
Change subject: engine: Improving VdsEventListener.vdsUpEvent
......................................................................
engine: Improving VdsEventListener.vdsUpEvent
The following patch will remove an unneeded query for retrieve status of vdsm,
in case of moving vdsm to NonOperational, VdsEventListener.vdsUpEvent should
return false
Change-Id: Idb5d5baecd9cc162e2d9082f42acdc715cf89da6
Signed-off-by: Michael Kublin <mkub...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
3 files changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/8718/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
index 32439ea..4f7ff69 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
@@ -130,10 +130,11 @@
}
@Override
- public void vdsUpEvent(final Guid vdsId) {
+ public boolean vdsUpEvent(final Guid vdsId) {
StoragePoolParametersBase tempVar = new
StoragePoolParametersBase(Guid.Empty);
tempVar.setVdsId(vdsId);
- if (Backend.getInstance().runInternalAction(VdcActionType.InitVdsOnUp,
tempVar).getSucceeded()) {
+ boolean isSucceeded =
Backend.getInstance().runInternalAction(VdcActionType.InitVdsOnUp,
tempVar).getSucceeded();
+ if (isSucceeded) {
ThreadPoolUtil.execute(new Runnable() {
@Override
public void run() {
@@ -183,6 +184,7 @@
}
});
}
+ return isSucceeded;
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
index 2d591fb..4c19477 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/IVdsEventListener.java
@@ -29,7 +29,7 @@
*/
void processOnVmStop(Guid vmId);
- void vdsUpEvent(Guid vdsId);
+ boolean vdsUpEvent(Guid vdsId);
void processOnClientIpChange(VDS vds, Guid vmId);
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
index eeb9a70..c350cf9 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
@@ -279,8 +279,9 @@
if (log.isDebugEnabled()) {
log.debugFormat("vds {0}-{1} firing up event.",
_vds.getId(), _vds.getvds_name());
}
-
ResourceManager.getInstance().getEventListener().vdsUpEvent(_vds.getId());
- markIsSetNonOperationalExecuted();
+
_vdsManager.setIsSetNonOperationalExecuted(!ResourceManager.getInstance()
+ .getEventListener()
+ .vdsUpEvent(_vds.getId()));
// Check hardware capabilities in case VDS moved to up
processHardwareCapsNeeded = true;
--
To view, visit http://gerrit.ovirt.org/8718
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb5d5baecd9cc162e2d9082f42acdc715cf89da6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Kublin <mkub...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
