This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 33a42c3 AMBARI-24715. Clean up ambari-agent.log (aonishuk)
33a42c3 is described below
commit 33a42c32bc45fc0ea5732819214d7b891c3c829f
Author: Andrew Onishuk <[email protected]>
AuthorDate: Mon Oct 1 13:02:50 2018 +0300
AMBARI-24715. Clean up ambari-agent.log (aonishuk)
---
ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py | 2 +-
ambari-agent/src/main/python/ambari_agent/RecoveryManager.py | 1 -
ambari-agent/src/main/python/ambari_agent/alerts/collector.py | 5 +++++
.../src/main/python/ambari_agent/listeners/CommandsEventListener.py | 4 ++++
.../main/python/ambari_agent/listeners/ServerResponsesListener.py | 2 +-
ambari-agent/src/main/python/ambari_agent/main.py | 2 ++
ambari-agent/src/main/python/ambari_agent/security.py | 2 +-
7 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
index 9210e79..36b88d6 100644
--- a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
+++ b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
@@ -143,7 +143,7 @@ class HeartbeatThread(threading.Thread):
try:
listener.on_event({}, response)
except:
- logger.exception("Exception while handing response to request at
{0}. {1}".format(endpoint, response))
+ logger.exception("Exception while handing response to request at {0}
{1}".format(endpoint, response))
raise
finally:
with listener.event_queue_lock:
diff --git a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
index ba6507c..e178457 100644
--- a/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
+++ b/ambari-agent/src/main/python/ambari_agent/RecoveryManager.py
@@ -165,7 +165,6 @@ class RecoveryManager:
component_status = copy.deepcopy(self.default_component_status)
component_status["current"] = state
self.statuses[component] = component_status
- logger.info("New status, current status is set to %s for %s",
self.statuses[component]["current"], component)
finally:
self.__status_lock.release()
pass
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
b/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
index 089301f..daac7ee 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/collector.py
@@ -66,6 +66,11 @@ class AlertCollector():
for cluster,alert_map in self.__buckets.iteritems():
for alert_name in alert_map.keys():
alert = alert_map[alert_name]
+
+ if not 'uuid' in alert:
+ logger.warn("Alert {0} does not have uuid key.".format(alert))
+ continue
+
if alert['uuid'] == alert_uuid:
self.remove(cluster, alert_name)
finally:
diff --git
a/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
b/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
index b25ec69..51ba7df 100644
---
a/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
+++
b/ambari-agent/src/main/python/ambari_agent/listeners/CommandsEventListener.py
@@ -74,6 +74,10 @@ class CommandsEventListener(EventListener):
command['repositoryFile'] = '...'
if 'commandParams' in command:
command['commandParams'] = '...'
+ if 'clusterHostInfo' in command:
+ command['clusterHostInfo'] = '...'
+ if 'componentVersionMap' in command:
+ command['componentVersionMap'] = '...'
except KeyError:
pass
diff --git
a/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
b/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
index 02d60a5..a4af571 100644
---
a/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
+++
b/ambari-agent/src/main/python/ambari_agent/listeners/ServerResponsesListener.py
@@ -74,7 +74,7 @@ class ServerResponsesListener(EventListener):
This string will be used to log received messsage of this type
"""
if Constants.CORRELATION_ID_STRING in headers:
- correlation_id = headers[Constants.CORRELATION_ID_STRING]
+ correlation_id = int(headers[Constants.CORRELATION_ID_STRING])
if correlation_id in self.logging_handlers:
message_json = self.logging_handlers[correlation_id](headers,
message_json)
diff --git a/ambari-agent/src/main/python/ambari_agent/main.py
b/ambari-agent/src/main/python/ambari_agent/main.py
index b7b9042..924b2d6 100644
--- a/ambari-agent/src/main/python/ambari_agent/main.py
+++ b/ambari-agent/src/main/python/ambari_agent/main.py
@@ -112,6 +112,7 @@ from ambari_agent.InitializerModule import InitializerModule
logger = logging.getLogger()
alerts_logger = logging.getLogger('alerts')
+alerts_logger_2 = logging.getLogger('ambari_alerts')
alerts_logger_global = logging.getLogger('ambari_agent.alerts')
apscheduler_logger = logging.getLogger('apscheduler')
apscheduler_logger_global = logging.getLogger('ambari_agent.apscheduler')
@@ -396,6 +397,7 @@ def main(initializer_module, heartbeat_stop_callback=None):
global is_logger_setup
is_logger_setup = True
setup_logging(alerts_logger, AmbariConfig.AmbariConfig.getAlertsLogFile(),
logging_level)
+ setup_logging(alerts_logger_2, AmbariConfig.AmbariConfig.getAlertsLogFile(),
logging_level)
setup_logging(alerts_logger_global,
AmbariConfig.AmbariConfig.getAlertsLogFile(), logging_level)
setup_logging(apscheduler_logger,
AmbariConfig.AmbariConfig.getAlertsLogFile(), logging_level)
setup_logging(apscheduler_logger_global,
AmbariConfig.AmbariConfig.getAlertsLogFile(), logging_level)
diff --git a/ambari-agent/src/main/python/ambari_agent/security.py
b/ambari-agent/src/main/python/ambari_agent/security.py
index e7c934c..377ab79 100644
--- a/ambari-agent/src/main/python/ambari_agent/security.py
+++ b/ambari-agent/src/main/python/ambari_agent/security.py
@@ -129,7 +129,7 @@ class AmbariStompConnection(WsConnection):
correlation_id = self.correlation_id
if presend_hook:
- presend_hook(self.correlation_id)
+ presend_hook(correlation_id)
logged_message = log_message_function(copy.deepcopy(message))
logger.info("Event to server at {0} (correlation_id={1}):
{2}".format(destination, correlation_id, logged_message))
