diff --git a/llap-server/src/main/resources/package.py b/llap-server/src/main/resources/package.py index 1e777f644d..b1a60822d9 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 81e2fa9ed2..b8cb8018aa 100644 --- a/llap-server/src/main/resources/templates.py +++ b/llap-server/src/main/resources/templates.py @@ -17,7 +17,7 @@ "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 @@ 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 """