[hive] branch master updated: HIVE-22937: Use unique names for the zip and tarball bundle for LLAP (RAMESH KUMAR THANGARAJAN via Slim Bouguerra)

[bs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bslim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 1fe0bd2  HIVE-22937: Use unique names for the zip and tarball bundle for LLAP (RAMESH KUMAR THANGARAJAN  via Slim Bouguerra)
1fe0bd2 is described below

commit 1fe0bd2298ece4eb37a89c5d9e983d597e2b93eb
Author: RAMESH KUMAR THANGARAJAN <ra...@gmail.com>
AuthorDate: Thu Mar 5 16:53:24 2020 -0800

    HIVE-22937: Use unique names for the zip and tarball bundle for LLAP (RAMESH KUMAR THANGARAJAN  via Slim Bouguerra)
---
 llap-server/src/main/resources/package.py   | 2 +-
 llap-server/src/main/resources/templates.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/llap-server/src/main/resources/package.py b/llap-server/src/main/resources/package.py
index 1e777f6..b1a6082 100644
--- a/llap-server/src/main/resources/package.py
+++ b/llap-server/src/main/resources/package.py
@@ -184,7 +184,7 @@ def main(args):
 	# Make the llap tarball
 	print "%s Prepared the files" % (strftime("%H:%M:%S", gmtime()))
 
-	tarball = tarfile.open(join(output, "llap-%s.tar.gz" %  version), "w:gz")
+	tarball = tarfile.open(join(output, "%s-%s.tar.gz" % (resource.clusterName, version), "w:gz")
 	# recursive add + -C chdir inside
 	tarball.add(input, "")
 	tarball.close()
diff --git a/llap-server/src/main/resources/templates.py b/llap-server/src/main/resources/templates.py
index 81e2fa9..b8cb801 100644
--- a/llap-server/src/main/resources/templates.py
+++ b/llap-server/src/main/resources/templates.py
@@ -17,7 +17,7 @@ yarnfile = """
       "number_of_containers": %(instances)d,
       "launch_command": "$LLAP_DAEMON_BIN_HOME/llapDaemon.sh start &> $LLAP_DAEMON_TMP_DIR/shell.out",
       "artifact": {
-        "id": "%(hdfs_package_dir)s/package/LLAP/llap-%(version)s.tar.gz",
+        "id": "%(hdfs_package_dir)s/package/LLAP/%(name)s-%(version)s.tar.gz",
         "type": "TARBALL"
       },
       "resource": {
@@ -74,6 +74,6 @@ BASEDIR=$(dirname $0)
 yarn app -stop %(name)s
 yarn app -destroy %(name)s
 hdfs dfs -mkdir -p %(hdfs_package_dir)s/package/LLAP
-hdfs dfs -copyFromLocal -f $BASEDIR/llap-%(version)s.tar.gz %(hdfs_package_dir)s/package/LLAP
+hdfs dfs -copyFromLocal -f $BASEDIR/%(name)s-%(version)s.tar.gz %(hdfs_package_dir)s/package/LLAP
 yarn app -launch %(name)s $BASEDIR/Yarnfile
 """