You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/03/04 03:07:19 UTC
ambari git commit: AMBARI-9804. Agent is spamming logs with
exceptions [fix merge issues] (rlevas)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 6df638843 -> abacc556e
AMBARI-9804. Agent is spamming logs with exceptions [fix merge issues] (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/abacc556
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/abacc556
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/abacc556
Branch: refs/heads/branch-2.0.0
Commit: abacc556e683819fc98427d64d38a2f7a87cf8d2
Parents: 6df6388
Author: Robert Levas <rl...@hortonworks.com>
Authored: Tue Mar 3 21:07:12 2015 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Tue Mar 3 21:07:12 2015 -0500
----------------------------------------------------------------------
.../python/resource_management/libraries/script/script.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/abacc556/ambari-common/src/main/python/resource_management/libraries/script/script.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 9b3611b..00580c0 100644
--- a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -110,7 +110,12 @@ class Script(object):
# version is only set in a specific way and should not be carried
if "version" in Script.structuredOut:
del Script.structuredOut["version"]
-
+ # reset security issues and errors found on previous runs
+ if "securityIssuesFound" in Script.structuredOut:
+ del Script.structuredOut["securityIssuesFound"]
+ if "securityStateErrorInfo" in Script.structuredOut:
+ del Script.structuredOut["securityStateErrorInfo"]
+
def put_structured_out(self, sout):
curr_content = Script.structuredOut.copy()
Script.structuredOut.update(sout)