Roy Golan has uploaded a new change for review. Change subject: core: [monitoring] clean up unhelpful logs and comments ......................................................................
core: [monitoring] clean up unhelpful logs and comments Bug-Url: http://https://bugzilla.redhat.com/1077300 Change-Id: I95bbbe94f22c94e6de9140cf8bf19177896934a9 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java 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 3 files changed, 6 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/27202/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index c3c1944..4419084 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -1278,7 +1278,7 @@ public String toString() { // note that mVdsStatic may be null, so the getName with no null protection // is not enough, remove this once mVdsStatic can not be null - return "Host[" + (mVdsStatic == null ? "null" : mVdsStatic.getName()) + "]"; + return "Host[" + (mVdsStatic == null ? "null" : (mVdsStatic.getName() + "," + mVdsStatic.getId())) + "]"; } public String getActiveNic() { 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 2dcd67b..993ab6e 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 @@ -392,16 +392,7 @@ public void refreshHost(VDS vds) { try { - /** - * refresh capabilities - */ - VDSStatus newStatus = refreshCapabilities(new AtomicBoolean(), vds); - if (log.isDebugEnabled()) { - log.debugFormat( - "Succeeded to refreshCapabilities for host {0} , new status will be {1} ", - getVdsId(), - newStatus); - } + refreshCapabilities(new AtomicBoolean(), vds); } finally { if (vds != null) { updateDynamicData(vds.getDynamicData()); @@ -527,7 +518,7 @@ } public VDSStatus refreshCapabilities(AtomicBoolean processHardwareCapsNeeded, VDS vds) { - log.debug("GetCapabilitiesVDSCommand started method"); + log.debugFormat("monitoring: refresh {0} capabilities", vds); VDS oldVDS = vds.clone(); GetCapabilitiesVDSCommand<VdsIdAndVdsVDSCommandParametersBase> vdsBrokerCommand = new GetCapabilitiesVDSCommand<VdsIdAndVdsVDSCommandParametersBase>(new VdsIdAndVdsVDSCommandParametersBase(vds)); @@ -559,14 +550,11 @@ setIsSetNonOperationalExecuted(true); if (returnStatus != VDSStatus.NonOperational) { - if (log.isDebugEnabled()) { - log.debugFormat( - "refreshCapabilities:GetCapabilitiesVDSCommand vds {0} networks do not match its cluster networks, vds will be moved to NonOperational", - vds.getStaticData().getId()); - } + log.debugFormat( + "monitoring: vds {0} networks do not match its cluster networks, vds will be moved to NonOperational", + vds); vds.setStatus(VDSStatus.NonOperational); vds.setNonOperationalReason(nonOperationalReason); - returnStatus = vds.getStatus(); } } 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 bb3c64d..cf5d4c3 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 @@ -485,11 +485,6 @@ // check if its time for statistics refresh if (_vdsManager.getRefreshStatistics() || _vds.getStatus() == VDSStatus.PreparingForMaintenance) { refreshVdsStats(); - } else { - /** - * TODO: Omer if vds team will not implement events to 4.2 please call here to refreshVdsStats - - * refresh dynamic data - */ } } else { // refresh dynamic data -- To view, visit http://gerrit.ovirt.org/27202 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I95bbbe94f22c94e6de9140cf8bf19177896934a9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
