Roy Golan has uploaded a new change for review. Change subject: core: [monitoring] process hardware caps before software ......................................................................
core: [monitoring] process hardware caps before software Change-Id: I7b0b7ff7d751c3c617f6ac1e794582346f81706e Bug-Url: http://https://bugzilla.redhat.com/1077300 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 2 files changed, 3 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/26284/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 0edde4a..13e2ebe 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 @@ -382,19 +382,6 @@ DbFacade.getInstance().getVdsStatisticsDao().update(statisticsData); } - public VDS activate() { - VDS vds = null; - try { - vds = DbFacade.getInstance().getVdsDao().get(getVdsId()); - refreshHost(vds); - } catch (Exception e) { - log.infoFormat("Failed to activate VDS = {0} with error: {1}.", - getVdsId(), e.getMessage()); - } - - return vds; - } - public void refreshHost(VDS vds) { try { refreshCapabilities(new AtomicBoolean(), vds); 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 1f5df72..31346bc 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 @@ -370,9 +370,6 @@ _vdsManager.setIsSetNonOperationalExecuted(!ResourceManager.getInstance() .getEventListener() .vdsUpEvent(_vds)); - - // Check hardware capabilities in case VDS moved to up - processHardwareCapsNeeded = true; } // save all data to db saveDataToDb(); @@ -502,6 +499,9 @@ refreshVdsStats(); } } else { + if (_firstStatus != VDSStatus.Up ) { + monitoringStrategy.processHardwareCapabilities(_vds); + } // refresh dynamic data final AtomicBoolean processHardwareNeededAtomic = new AtomicBoolean(); VDSStatus refreshReturnStatus = -- To view, visit http://gerrit.ovirt.org/26284 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b0b7ff7d751c3c617f6ac1e794582346f81706e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
