| commit | e6eba92a5256c26c04c0663dd176ac3e78471de9 | [log] [tgz] |
|---|---|---|
| author | Yaniv Rodenski <yaniv@shinto.io> | Wed May 08 14:26:49 2019 +1000 |
| committer | Yaniv Rodenski <yaniv@shinto.io> | Wed May 08 14:26:49 2019 +1000 |
| tree | 833ddde7cac417877eb6290f3d53d463f80aad36 | |
| parent | c1a2e9ebd5929598e4cdc1ad3a3a664026e42a31 [diff] |
git auth fixed on YARN
diff --git a/frameworks/python/pandas_runtime/dist/amaterasu_pandas-0.2.0-incubating-rc4.zip b/frameworks/python/pandas_runtime/dist/amaterasu_pandas-0.2.0-incubating-rc4.zip index 76cdcff..a90ba7d 100644 --- a/frameworks/python/pandas_runtime/dist/amaterasu_pandas-0.2.0-incubating-rc4.zip +++ b/frameworks/python/pandas_runtime/dist/amaterasu_pandas-0.2.0-incubating-rc4.zip Binary files differ
diff --git a/frameworks/python/python_runtime/dist/amaterasu_python-0.2.0-incubating-rc4.zip b/frameworks/python/python_runtime/dist/amaterasu_python-0.2.0-incubating-rc4.zip index f7a847e..e51cfb1 100644 --- a/frameworks/python/python_runtime/dist/amaterasu_python-0.2.0-incubating-rc4.zip +++ b/frameworks/python/python_runtime/dist/amaterasu_python-0.2.0-incubating-rc4.zip Binary files differ
diff --git a/frameworks/spark/pyspark_runtime/dist/amaterasu_pyspark-0.2.0-incubating-rc4.zip b/frameworks/spark/pyspark_runtime/dist/amaterasu_pyspark-0.2.0-incubating-rc4.zip index d694fff..dd1ab3b 100644 --- a/frameworks/spark/pyspark_runtime/dist/amaterasu_pyspark-0.2.0-incubating-rc4.zip +++ b/frameworks/spark/pyspark_runtime/dist/amaterasu_pyspark-0.2.0-incubating-rc4.zip Binary files differ
diff --git a/leader-yarn/src/main/kotlin/org/apache/amaterasu/leader/yarn/ApplicationMaster.kt b/leader-yarn/src/main/kotlin/org/apache/amaterasu/leader/yarn/ApplicationMaster.kt index 53d683f..a53ee77 100644 --- a/leader-yarn/src/main/kotlin/org/apache/amaterasu/leader/yarn/ApplicationMaster.kt +++ b/leader-yarn/src/main/kotlin/org/apache/amaterasu/leader/yarn/ApplicationMaster.kt
@@ -319,9 +319,8 @@ distributeFile(executable, "${jobManager.jobId}/${actionData.name}/") result[File(executable).name] = createLocalResourceFromPath(Path.mergePaths(yarnJarPath, createDistPath("${jobManager.jobId}/${actionData.name}/$executable"))) - result.forEach { println("entry ${it.key} with value ${it.value}") } + result.forEach { log.debug("entry ${it.key} with value ${it.value}") } - result.forEach { notifier.info("entry ${it.key} with value ${it.value}") } return result.map { x -> x.key.removePrefix("/") to x.value }.toMap() }
diff --git a/leader/src/main/scripts/ama-start-yarn.sh b/leader/src/main/scripts/ama-start-yarn.sh index 4208d0a..6309273 100755 --- a/leader/src/main/scripts/ama-start-yarn.sh +++ b/leader/src/main/scripts/ama-start-yarn.sh
@@ -93,6 +93,14 @@ DEFAULT=YES shift # past argument with no value ;; + -u=*|--user-name=*) + USERNAME="${i#*=}" + shift # past argument=value + ;; + -p=*|--password=*) + PASSWORD="${i#*=}" + shift # past argument=value + ;; *) # unknown option ;; @@ -135,7 +143,17 @@ if [ -n "$JARPATH" ]; then CMD+=" --jar-path=${JARPATH}" fi +if [ -n "$USERNAME" ]; then + CMD+=" --user-name ${USERNAME}" +else + CMD+=" --user-name \"\"" +fi +if [ -n "$PASSWORD" ]; then + CMD+=" --password ${PASSWORD}" +else + CMD+=" --password \"\"" +fi echo $CMD if [ "$FORCE_BIN" = true ] ; then
diff --git a/sdk_python/dist/amaterasu-sdk-0.2.0-incubating-rc4.zip b/sdk_python/dist/amaterasu-sdk-0.2.0-incubating-rc4.zip index feb2b0d..2d355f9 100644 --- a/sdk_python/dist/amaterasu-sdk-0.2.0-incubating-rc4.zip +++ b/sdk_python/dist/amaterasu-sdk-0.2.0-incubating-rc4.zip Binary files differ