You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amaterasu.apache.org by ey...@apache.org on 2018/07/24 13:06:16 UTC
[incubator-amaterasu] 01/01: Merge pull request #31 from
roadan/AMATERASU-47
This is an automated email from the ASF dual-hosted git repository.
eyalb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu.git
commit e42a9b184527ee758bc54a2623276a297f0981ce
Merge: 1cc6b2f 1a1bffc
Author: Eyal Ben Ivri <ey...@gmail.com>
AuthorDate: Tue Jul 24 15:06:13 2018 +0200
Merge pull request #31 from roadan/AMATERASU-47
Amaterasu 47
.../spark/dispatcher/build.gradle | 44 +++++++++++++++-------
.../spark/dispatcher}/SparkSetupProvider.scala | 6 ++-
.../spark/runner/pyspark/PySparkEntryPoint.java | 4 +-
.../spark/runner/SparkRunnersProvider.scala | 9 +++--
.../runner/pyspark/PySparkExecutionQueue.scala | 2 +-
.../spark/runner/pyspark/PySparkResultQueue.scala | 4 +-
.../spark/runner/pyspark/PySparkRunner.scala | 2 +-
.../spark/runner/pyspark/ResultQueue.scala | 2 +-
.../spark/runner/repl/AmaSparkILoop.scala | 2 +-
.../spark/runner/repl/SparkRunnerHelper.scala | 2 +-
.../spark/runner/repl/SparkScalaRunner.scala | 6 +--
.../spark/runner/sparkr/SparkRRunner.scala | 2 +-
.../spark/runner/sparksql/SparkSqlRunner.scala | 4 +-
.../spark/runner/RunnersLoadingTests.scala | 2 +-
.../spark/runner}/SparkTestsSuite.scala | 9 ++---
.../spark/runner/pyspark/PySparkRunnerTests.scala | 2 +-
.../spark/runner/repl/SparkScalaRunnerTests.scala | 4 +-
.../runner/sparksql/SparkSqlRunnerTests.scala | 2 +-
.../spark/runtime/AmaContext.scala | 2 +-
leader-common/build.gradle | 44 ++++++++++++++++++++++
.../leader/common}/utilities/DataLoader.scala | 2 +-
.../common}/utilities/MemoryFormatParser.scala | 2 +-
leader/build.gradle | 3 +-
.../org/apache/amaterasu/leader/yarn/Client.java | 41 ++++++++------------
.../leader/mesos/schedulers/JobScheduler.scala | 3 +-
.../amaterasu/leader/yarn/ApplicationMaster.scala | 7 ++--
.../leader/yarn/YarnRMCallbackHandler.scala | 2 +-
leader/src/main/scripts/ama-start-yarn.sh | 2 +
leader/src/main/scripts/amaterasu.properties | 4 +-
settings.gradle | 11 +++++-
30 files changed, 150 insertions(+), 81 deletions(-)