Author: smohanty
Date: Tue Apr 9 23:56:33 2013
New Revision: 1466297
URL: http://svn.apache.org/r1466297
Log:
AMBARI-1862. Nagios credentials are freely available at ambari-agent.log.
(smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1466297&r1=1466296&r2=1466297&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 9 23:56:33 2013
@@ -677,6 +677,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1862. Nagios credentials are freely available at ambari-agent.log.
+ (smohanty)
+
AMBARI-1726. It seems upgrades available at the FE is hard-coded to 1.3.0.
(yusaku via srimanth)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py?rev=1466297&r1=1466296&r2=1466297&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/Heartbeat.py
Tue Apr 9 23:56:33 2013
@@ -59,7 +59,7 @@ class Heartbeat:
heartbeat['reports'] = queueResult['reports']
heartbeat['componentStatus'] = queueResult['componentStatus']
pass
- logger.info("Heartbeat : " + pformat(heartbeat))
+ logger.debug("Heartbeat : " + pformat(heartbeat))
if (int(id) >= 0) and state_interval > 0 and (int(id) % state_interval) ==
0:
hostInfo = HostInfo()
Modified:
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py?rev=1466297&r1=1466296&r2=1466297&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/PuppetExecutor.py
Tue Apr 9 23:56:33 2013
@@ -194,7 +194,7 @@ class PuppetExecutor:
else:
result["stderr"] = str(error)
puppetOutput = open(tmpoutfile, 'r').read()
- logger.info("Output from puppet :\n" + puppetOutput)
+ logger.debug("Output from puppet :\n" + puppetOutput)
logger.info("Puppet exit code is " + str(returncode))
if result.has_key("exitcode"):
result["exitcode"] = max(returncode, result["exitcode"])
Modified:
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py?rev=1466297&r1=1466296&r2=1466297&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/manifestGenerator.py
Tue Apr 9 23:56:33 2013
@@ -27,6 +27,7 @@ from datetime import datetime
import AmbariConfig
import pprint
import hostname
+import stat
logger = logging.getLogger()
@@ -75,6 +76,9 @@ def generateManifest(parsedJson, fileNam
'roleParams' : roleParams}]
#writing manifest
manifest = open(fileName, 'w')
+ #Change mode to make site.pp files readable to owner and group only
+ os.chmod(fileName, stat.S_IRWXU)
+
#Check for Ambari Config and make sure you pick the right imports file
#writing imports from external static file
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java?rev=1466297&r1=1466296&r2=1466297&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
Tue Apr 9 23:56:33 2013
@@ -401,7 +401,7 @@ class ActionScheduler implements Runnabl
}
s.setLastAttemptTime(hostname, roleStr, now);
s.incrementAttemptCount(hostname, roleStr);
- LOG.info("Scheduling command: "+cmd.toString()+" for host: "+hostname);
+ LOG.debug("Scheduling command: "+cmd.toString()+" for host: "+hostname);
/** change the hostname in the command for the host itself **/
cmd.setHostname(hostsMap.getHostMap(hostname));
actionQueue.enqueue(hostname, cmd);
Modified:
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java?rev=1466297&r1=1466296&r2=1466297&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
(original)
+++
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java
Tue Apr 9 23:56:33 2013
@@ -50,7 +50,7 @@ public class PersistKeyValueService {
public Response update(String keyValues)
throws WebApplicationException, InvalidStateTransitionException,
JAXBException, IOException {
- LOG.info("Received message from UI " + keyValues);
+ LOG.debug("Received message from UI " + keyValues);
Map<String, String> keyValuesMap = StageUtils.fromJson(keyValues,
Map.class);
/* Call into the heartbeat handler */
@@ -88,7 +88,7 @@ public class PersistKeyValueService {
public String getAllKeyValues() throws JAXBException, IOException {
Map<String, String> ret = persistKeyVal.getAllKeyValues();
String stringRet = StageUtils.jaxbToString(ret);
- LOG.info("Returning " + stringRet);
+ LOG.debug("Returning " + stringRet);
return stringRet;
}
}
