Alissa Bonas has uploaded a new change for review.
Change subject: core: improve logs in VdsManager
......................................................................
core: improve logs in VdsManager
Fix mispellings, remove "resource manager" from logging statements
since it's a wrong class name, rephrase log statements to be more clear, remove
isDebugEnabled around logException (which is logged as error)
Change-Id: I815f0c7bdadc25be5fa3f0829114f1d7f2a2dddd
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
1 file changed, 17 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/11270/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 15d1fdf..3d57d13 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
@@ -125,12 +125,13 @@
private final Guid _vdsId;
private VdsManager(VDS vds) {
+ log.info("Entered VdsManager constructor");
_vds = vds;
_vdsId = vds.getId();
monitoringStrategy =
MonitoringStrategyFactory.getMonitoringStrategyForVds(vds);
mUnrespondedAttempts = new AtomicInteger();
mFailedToRunVmAttempts = new AtomicInteger();
- log.info("Eneterd VdsManager:constructor");
+
if (_vds.getstatus() == VDSStatus.PreparingForMaintenance) {
_vds.setprevious_status(_vds.getstatus());
} else {
@@ -171,7 +172,7 @@
}
private void InitVdsBroker() {
- log.infoFormat("vdsBroker({0},{1})", _vds.gethost_name(),
_vds.getport());
+ log.infoFormat("Initialize vdsBroker ({0},{1})", _vds.gethost_name(),
_vds.getport());
int clientTimeOut = Config.<Integer> GetValue(ConfigValues.vdsTimeout)
* 1000;
Pair<VdsServerConnector, HttpClient> returnValue =
XmlRpcUtils.getConnection(_vds.gethost_name(),
@@ -231,12 +232,8 @@
HandleVdsRecoveringException(ex);
} catch (IRSErrorException ex) {
logFailureMessage(ex);
- if (log.isDebugEnabled()) {
- logException(ex);
- }
} catch (RuntimeException ex) {
logFailureMessage(ex);
- logException(ex);
}
try {
if (_vdsUpdater != null) {
@@ -279,10 +276,10 @@
private void logFailureMessage(RuntimeException ex) {
log.warnFormat(
- "VdsManager::refreshVdsRunTimeInfo::Failed to refresh VDS ,
vds = {0} : {1}, error = '{2}', continuing.",
+ "Failed to refresh VDS , vds = {0} : {1}, error = '{2}',
continuing.",
_vds.getId(),
_vds.getvds_name(),
- ExceptionUtils.getMessage(ex));
+ ex);
}
private static void logException(final RuntimeException ex) {
@@ -291,7 +288,7 @@
private void logAfterRefreshFailureMessage(RuntimeException ex) {
log.warnFormat(
- "ResourceManager::refreshVdsRunTimeInfo::Failed to
AfterRefreshTreatment VDS error = '{0}', continuing.",
+ "Failed to AfterRefreshTreatment VDS error = '{0}',
continuing.",
ExceptionUtils.getMessage(ex));
}
@@ -312,7 +309,7 @@
logable.AddCustomValue("ErrorMessage", ex.getMessage());
AuditLogDirector.log(logable, AuditLogType.VDS_INITIALIZING);
log.warnFormat(
- "ResourceManager::refreshVdsRunTimeInfo::Failed to refresh
VDS , vds = {0} : {1}, error = {2}, continuing.",
+ "Failed to refresh VDS , vds = {0} : {1}, error = {2},
continuing.",
_vds.getId(),
_vds.getvds_name(),
ex.getMessage());
@@ -372,7 +369,7 @@
// refresh vds from db in case changed while was down
if (log.isDebugEnabled()) {
log.debugFormat(
- "ResourceManager::activateVds - trying to activate
host {0} , meanwhile setting status to Unassigned meanwhile",
+ "Trying to activate host {0} , meanwhile setting
status to Unassigned meanwhile",
getVdsId());
}
vds = DbFacade.getInstance().getVdsDao().get(getVdsId());
@@ -382,14 +379,14 @@
VDSStatus newStatus = refreshCapabilities(new AtomicBoolean(),
vds);
if (log.isDebugEnabled()) {
log.debugFormat(
- "ResourceManager::activateVds - success to
refreshCapabilities for host {0} , new status will be {1} ",
+ "Succeeded to refreshCapabilities for host {0} , new
status will be {1} ",
getVdsId(),
newStatus);
}
} catch (java.lang.Exception e) {
- log.infoFormat("ResourceManager::activateVds - failed to get VDS =
{0} capabilities with error: {1}.",
+ log.infoFormat("Failed to get VDS = {0} capabilities with error:
{1}.",
getVdsId(), e.getMessage());
- log.infoFormat("ResourceManager::activateVds - failed to activate
VDS = {0}", getVdsId());
+ log.infoFormat("Failed to activate VDS = {0}", getVdsId());
} finally {
if (vds != null) {
@@ -477,7 +474,7 @@
setStatus(VDSStatus.Up, vds);
UpdateDynamicData(vds.getDynamicData());
}
- log.infoFormat("OnVdsDuringFailureTimer of vds {0} entered.
Time:{1}. Attemts after{2}", vds.getvds_name(),
+ log.infoFormat("OnVdsDuringFailureTimer of vds {0} entered.
Time:{1}. Attempts after {2}", vds.getvds_name(),
new java.util.Date(), mFailedToRunVmAttempts);
}
}
@@ -494,7 +491,7 @@
logable.AddCustomValue("Time", Config.<Integer>
GetValue(ConfigValues.TimeToReduceFailedRunOnVdsInMinutes)
.toString());
AuditLogDirector.log(logable, AuditLogType.VDS_FAILED_TO_RUN_VMS);
- log.infoFormat("Vds {0} moved to Error mode after {1} attemts.
Time: {2}", vds.getvds_name(),
+ log.infoFormat("Vds {0} moved to Error mode after {1} attempts.
Time: {2}", vds.getvds_name(),
mFailedToRunVmAttempts, new java.util.Date());
}
}
@@ -540,7 +537,7 @@
if (isSetNonOperational && returnStatus !=
VDSStatus.NonOperational) {
if (log.isDebugEnabled()) {
log.debugFormat(
- "refreshCapabilities:GetCapabilitiesVDSCommand vds
{0} networks not match it's cluster networks, vds will be moved to
NonOperational",
+ "refreshCapabilities:GetCapabilitiesVDSCommand vds
{0} networks do not match its cluster networks, vds will be moved to
NonOperational",
vds.getStaticData().getId());
}
vds.setstatus(VDSStatus.NonOperational);
@@ -604,7 +601,7 @@
}
setStatus(VDSStatus.NonResponsive, vds);
log.errorFormat(
- "VDS::handleNetworkException Server failed to respond,
vds_id = {0}, vds_name = {1}, error = {2}",
+ "VDS::handleNetworkException Server failed to respond,
vds_id = {0}, vds_name = {1}, error = {2}",
vds.getId(), vds.getvds_name(), ex.getMessage());
AuditLogableBase logable = new AuditLogableBase(vds.getId());
@@ -632,14 +629,14 @@
break;
case NonResponsive:
log.debugFormat(
- "ResourceManager::refreshVdsRunTimeInfo::Failed to refresh
VDS , vds = {0} : {1}, VDS Network Error, continuing.\n{2}",
+ "Failed to refresh VDS , vds = {0} : {1}, VDS Network
Error, continuing.\n{2}",
_vds.getId(),
_vds.getvds_name(),
e.getMessage());
break;
default:
log.warnFormat(
- "ResourceManager::refreshVdsRunTimeInfo::Failed to refresh
VDS , vds = {0} : {1}, VDS Network Error, continuing.\n{2}",
+ "Failed to refresh VDS , vds = {0} : {1}, VDS Network
Error, continuing.\n{2}",
_vds.getId(),
_vds.getvds_name(),
e.getMessage());
--
To view, visit http://gerrit.ovirt.org/11270
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I815f0c7bdadc25be5fa3f0829114f1d7f2a2dddd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
