AMBARI-12927. RU: Falcon server restart failed during tar, need to add retries to command (Swapan Shridhar via alejandro)

ambari-common/src/main/python/resource_management/libraries/functions/tar_archive.py

@@ -23,9 +23,10 @@ from resource_management.core.resources.system import Execute
 def archive_dir(output_filename, input_dir):
   Execute(('tar', '-zcvf', output_filename, input_dir),
     sudo = True,
+    tries = 3,
+    try_sleep = 1,
   )
 
-
 def archive_directory_dereference(archive, directory):
   """
   Creates an archive of the specified directory. This will ensure that
@@ -34,15 +35,19 @@ def archive_directory_dereference(archive, directory):
   :param directory:   the directory to include
   :return:  None
   """
-  
+
   Execute(('tar', '-zcvhf', archive, directory),
     sudo = True,
+    tries = 3,
+    try_sleep = 1,
   )
-  
+
 def untar_archive(archive, directory):
   """
   :param directory:   can be a symlink and is followed
   """
   Execute(('tar','-xvf',archive,'-C',directory+"/"),
-          sudo = True,
+    sudo = True,
+    tries = 3,
+    try_sleep = 1,
   )

ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py

@@ -216,13 +216,13 @@ class TestFalconServer(RMFTestCase):
      '-zcvhf',
      '/tmp/falcon-upgrade-backup/falcon-conf-backup.tar',
      '/usr/hdp/current/falcon-server/conf'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('tar',
      '-zcvhf',
      '/tmp/falcon-upgrade-backup/falcon-local-backup.tar',
      u'/hadoop/falcon'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'falcon-server', u'2.2.1.0-2135'),
         sudo = True,
@@ -232,14 +232,14 @@ class TestFalconServer(RMFTestCase):
      '/tmp/falcon-upgrade-backup/falcon-conf-backup.tar',
      '-C',
      '/usr/hdp/current/falcon-server/conf/'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('tar',
      '-xvf',
      '/tmp/falcon-upgrade-backup/falcon-local-backup.tar',
      '-C',
      u'/hadoop/falcon/'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Directory', '/tmp/falcon-upgrade-backup',
         action = ['delete'],
@@ -546,14 +546,14 @@ class TestFalconServer(RMFTestCase):
      '/tmp/falcon-upgrade-backup/falcon-conf-backup.tar',
      '-C',
      '/usr/hdp/current/falcon-server/conf/'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('tar',
      '-xvf',
      '/tmp/falcon-upgrade-backup/falcon-local-backup.tar',
      '-C',
      u'/hadoop/falcon/'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Directory', '/tmp/falcon-upgrade-backup',
         action = ['delete'],

ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py

@@ -255,13 +255,13 @@ class TestKnoxGateway(RMFTestCase):
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-conf-backup.tar',
      '/usr/hdp/current/knox-server/conf/'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('tar',
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-data-backup.tar',
      '/var/lib/knox/data'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'knox-server', '2.2.1.0-3242'),
         sudo = True,
@@ -299,13 +299,13 @@ class TestKnoxGateway(RMFTestCase):
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-conf-backup.tar',
      '/usr/hdp/current/knox-server/conf/'),
-        sudo = True,
+        sudo = True,  tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('tar',
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-data-backup.tar',
      '/var/lib/knox/data'),
-        sudo = True,
+        sudo = True,  tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'knox-server', version),
         sudo = True,
@@ -320,7 +320,7 @@ class TestKnoxGateway(RMFTestCase):
      '/tmp/knox-upgrade-backup/knox-conf-backup.tar',
      '-C',
      '/usr/hdp/current/knox-server/conf/'),
-        sudo = True,
+        sudo = True,  tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('File', '/usr/hdp/current/knox-server/conf/knox-conf-backup.tar',
         action = ['delete'],
@@ -371,13 +371,13 @@ class TestKnoxGateway(RMFTestCase):
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-conf-backup.tar',
      '/usr/hdp/current/knox-server/conf/'),
-        sudo = True,
+        sudo = True,  tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('tar',
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-data-backup.tar',
      '/var/lib/knox/data'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('ambari-python-wrap', '/usr/bin/hdp-select', 'set', 'knox-server', version),
         sudo = True,
@@ -392,7 +392,7 @@ class TestKnoxGateway(RMFTestCase):
      '/tmp/knox-upgrade-backup/knox-conf-backup.tar',
      '-C',
      '/usr/hdp/current/knox-server/conf/'),
-        sudo = True,
+        sudo = True, tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('File', '/usr/hdp/current/knox-server/conf/knox-conf-backup.tar',
         action = ['delete'],
@@ -443,13 +443,13 @@ class TestKnoxGateway(RMFTestCase):
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-conf-backup.tar',
      '/usr/hdp/current/knox-server/conf/'),
-        sudo = True,
+        sudo = True,  tries = 3, try_sleep = 1,
     )
     self.assertResourceCalled('Execute', ('tar',
      '-zcvhf',
      '/tmp/knox-upgrade-backup/knox-data-backup.tar',
      "/usr/hdp/%s/knox/data" % source_version),
-        sudo = True,
+        sudo = True,  tries = 3, try_sleep = 1,
     )
 
     '''