Browse Source

AMBARI-356. Log output to console slows puppet run. (Contributed by Jitendra)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1346667 13f79535-47bb-0310-9956-ffa450edef68
Vikram Dixit K 13 years ago
parent
commit
aae08df1db
3 changed files with 5 additions and 2 deletions
  1. 2 0
      CHANGES.txt
  2. 1 1
      hmc/php/conf/Config.inc
  3. 2 1
      hmc/puppet/modules/puppetApply.sh

+ 2 - 0
CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-356. Log output to console slows puppet run. (Jitendra via Vikram)
+
   AMBARI-359. invalid parameter java_needed during uninstall (Ramya via Vikram) 
 
   AMBARI-354. hmc rpm on install must backup the database (Suresh via Vikram)

+ 1 - 1
hmc/php/conf/Config.inc

@@ -12,7 +12,7 @@ $GLOBALS["puppetMaxParallelKicks"] = 10;
 $GLOBALS["puppetManifestDir"] = "/etc/puppet/master/modules/catalog/files/";
 $GLOBALS["puppetKickVersionFile"] = "/var/lib/puppet/puppet_kick_version.txt";
 $GLOBALS["puppetReportsDir"] = "/var/lib/puppet/reports";
-$GLOBALS["puppetKickTimeout"] = 180;
+$GLOBALS["puppetKickTimeout"] = 120;
 $GLOBALS["puppetModulesDirectory"] = "/etc/puppet/agent/modules";
 $GLOBALS["manifestloaderFile"] = "/etc/puppet/master/manifestloader/site.pp";
 $GLOBALS["manifestloaderDestinationDir"] = "/etc/puppet/master/manifests";

+ 2 - 1
hmc/puppet/modules/puppetApply.sh

@@ -1,5 +1,6 @@
-puppet apply --confdir=/etc/puppet/agent --logdest=console --debug --autoflush --detailed-exitcodes /etc/puppet/agent/site.pp
+puppet apply --confdir=/etc/puppet/agent --logdest=/var/log/puppet_apply.log --debug --autoflush --detailed-exitcodes /etc/puppet/agent/site.pp
 ret=$?
+cat /var/log/puppet_apply.log
 if [ "$ret" == "0" ] || [ "$ret" == "2" ]; then
   exit 0
 else