AMBARI-12727. Ambari agent should support configuration where it does not attempt to download stack scripts from the server (smohanty)

ambari-agent/src/main/python/ambari_agent/AmbariConfig.py

@@ -18,6 +18,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 '''
 
+import logging
 import ConfigParser
 import StringIO
 import hostname
@@ -27,6 +28,7 @@ import os
 
 from ambari_commons import OSConst
 from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
+logger = logging.getLogger(__name__)
 
 content = """
 
@@ -255,6 +257,7 @@ class AmbariConfig:
         self.add_section(AmbariConfig.AMBARI_PROPERTIES_CATEGORY)
       for k,v in reg_resp[AmbariConfig.AMBARI_PROPERTIES_CATEGORY].items():
         self.set(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, k, v)
+        logger.info("Updating config property (%s) with value (%s)", k, v)
     pass
 
 def updateConfigServerHostname(configFile, new_host):

ambari-agent/src/main/python/ambari_agent/Controller.py

@@ -173,6 +173,7 @@ class Controller(threading.Thread):
         self.recovery_manager.update_configuration_from_registration(ret)
         self.config.update_configuration_from_registration(ret)
         logger.debug("Updated config:" + str(self.config))
+
         # always update alert definitions on registration
         self.alert_scheduler_handler.update_definitions(ret)
       except ssl.SSLError:

ambari-agent/src/main/python/ambari_agent/FileCache.py

@@ -25,6 +25,7 @@ import shutil
 import zipfile
 import urllib2
 import urllib
+from AmbariConfig import AmbariConfig
 
 logger = logging.getLogger()
 
@@ -44,6 +45,7 @@ class FileCache():
   HOST_SCRIPTS_CACHE_DIRECTORY="host_scripts"
   HASH_SUM_FILE=".hash"
   ARCHIVE_NAME="archive.zip"
+  ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY = "agent.auto.cache.update"
 
   BLOCK_SIZE=1024*16
   SOCKET_TIMEOUT=10
@@ -104,6 +106,13 @@ class FileCache():
                                   server_url_prefix)
 
 
+  def auto_cache_update_enabled(self):
+    if self.config and \
+        self.config.has_option(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, FileCache.ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY) and \
+            self.config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, FileCache.ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY).lower() == "false":
+      return False
+    return True
+
   def provide_directory(self, cache_path, subdirectory, server_url_prefix):
     """
     Ensures that directory at cache is up-to-date. Throws a CachingException
@@ -113,8 +122,14 @@ class FileCache():
       subdirectory: subpath inside cache
       server_url_prefix: url of "resources" folder at the server
     """
+
     full_path = os.path.join(cache_path, subdirectory)
     logger.debug("Trying to provide directory {0}".format(subdirectory))
+
+    if not self.auto_cache_update_enabled():
+      logger.debug("Auto cache update is disabled.")
+      return full_path
+
     try:
       if full_path not in self.uptodate_paths:
         logger.debug("Checking if update is available for "
@@ -138,7 +153,7 @@ class FileCache():
     except CachingException, e:
       if self.tolerate_download_failures:
         # ignore
-        logger.warn("Error occured during cache update. "
+        logger.warn("Error occurred during cache update. "
                     "Error tolerate setting is set to true, so"
                     " ignoring this error and continuing with current cache. "
                     "Error details: {0}".format(str(e)))

ambari-agent/src/test/python/ambari_agent/TestFileCache.py

@@ -46,9 +46,11 @@ class TestFileCache(TestCase):
     tmpdir = tempfile.gettempdir()
     self.config = ConfigParser.RawConfigParser()
     self.config.add_section('agent')
+    self.config.add_section('agentConfig')
     self.config.set('agent', 'prefix', tmpdir)
     self.config.set('agent', 'cache_dir', "/var/lib/ambari-agent/cache")
     self.config.set('agent', 'tolerate_download_failures', "true")
+    self.config.set(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, FileCache.ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY, "true")
 
 
   def test_reset(self):
@@ -115,6 +117,21 @@ class TestFileCache(TestCase):
       "('/var/lib/ambari-agent/cache', 'custom_actions', 'server_url_pref')")
     self.assertEquals(res, "dummy value")
 
+  @patch.object(FileCache, "build_download_url")
+  def test_provide_directory_no_update(self, build_download_url_mock):
+    try:
+      self.config.set(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, FileCache.ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY, "false")
+      fileCache = FileCache(self.config)
+
+      # Test uptodate dirs after start
+      path = os.path.join("cache_path", "subdirectory")
+      res = fileCache.provide_directory("cache_path", "subdirectory",
+                                        "server_url_prefix")
+      self.assertEquals(res, path)
+      self.assertFalse(build_download_url_mock.called)
+    finally:
+      self.config.set(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, FileCache.ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY, "true")
+    pass
 
   @patch.object(FileCache, "build_download_url")
   @patch.object(FileCache, "fetch_url")

ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java

@@ -127,6 +127,8 @@ public class Configuration {
   public static final String CLIENT_API_SSL_CRT_PASS_FILE_NAME_KEY = "client.api.ssl.cert_pass_file";
   public static final String CLIENT_API_SSL_CRT_PASS_KEY = "client.api.ssl.crt_pass";
   public static final String CLIENT_API_SSL_KEY_NAME_KEY = "client.api.ssl.key_name";
+  public static final String ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY = "agent.auto.cache.update";
+  public static final String ENABLE_AUTO_AGENT_CACHE_UPDATE_DEFAULT = "true";
   public static final String CHECK_REMOTE_MOUNTS_KEY = "agent.check.remote.mounts";
   public static final String CHECK_REMOTE_MOUNTS_DEFAULT = "true";
   public static final String CHECK_MOUNTS_TIMEOUT_KEY = "agent.check.mounts.timeout";
@@ -530,6 +532,9 @@ public class Configuration {
     agentConfigsMap.put(CHECK_MOUNTS_TIMEOUT_KEY, properties.getProperty(
       CHECK_MOUNTS_TIMEOUT_KEY, CHECK_MOUNTS_TIMEOUT_DEFAULT));
 
+    agentConfigsMap.put(ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY, properties.getProperty(
+        ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY, ENABLE_AUTO_AGENT_CACHE_UPDATE_DEFAULT));
+
     configsMap = new HashMap<String, String>();
     configsMap.putAll(agentConfigsMap);
     configsMap.put(AMBARI_PYTHON_WRAP_KEY, properties.getProperty(

ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java

@@ -914,6 +914,7 @@ public class TestHeartbeatHandler {
     assertTrue("true".equals(config.get(Configuration.CHECK_REMOTE_MOUNTS_KEY)));
     assertTrue(config.containsKey(Configuration.CHECK_MOUNTS_TIMEOUT_KEY));
     assertTrue("0".equals(config.get(Configuration.CHECK_MOUNTS_TIMEOUT_KEY)));
+    assertTrue("true".equals(config.get(Configuration.ENABLE_AUTO_AGENT_CACHE_UPDATE_KEY)));
   }
 
   @Test