Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d65fc9be0 -> 34405206a


AMBARI-20417. Spark2 Thrift Server cannot be started after upgrade due to 
incompletely uploaded tar.gz


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34405206
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34405206
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34405206

Branch: refs/heads/branch-2.5
Commit: 34405206a53ce57c6cfb03aeffd8bd7fed256684
Parents: d65fc9b
Author: Attila Doroszlai <[email protected]>
Authored: Sat Mar 11 18:29:19 2017 +0100
Committer: Attila Doroszlai <[email protected]>
Committed: Thu Mar 16 13:04:49 2017 +0100

----------------------------------------------------------------------
 .../SPARK2/2.0.0/package/scripts/spark_service.py                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/34405206/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
index 3efd1b7..c4bcfd2 100755
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
@@ -41,7 +41,7 @@ def make_tarfile(output_filename, source_dir):
   parent_dir=os.path.dirname(output_filename)
   if not os.path.exists(parent_dir):
     os.makedirs(parent_dir)
-    os.chmod(parent_dir, 0711)
+  os.chmod(parent_dir, 0711)
   with closing(tarfile.open(output_filename, "w:gz")) as tar:
     for file in os.listdir(source_dir):
       tar.add(os.path.join(source_dir,file),arcname=file)
@@ -63,7 +63,7 @@ def spark_service(name, upgrade_type=None, action=None):
           source_dir=params.spark_home+"/jars"
           tmp_archive_file=get_tarball_paths("spark2")[1]
           make_tarfile(tmp_archive_file, source_dir)
-          copy_to_hdfs("spark2", params.user_group, params.hdfs_user, 
skip=params.sysprep_skip_copy_tarballs_hdfs)
+          copy_to_hdfs("spark2", params.user_group, params.hdfs_user, 
skip=params.sysprep_skip_copy_tarballs_hdfs, replace_existing_files=True)
       # create spark history directory
       params.HdfsResource(params.spark_history_dir,
                           type="directory",

Reply via email to