You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amaterasu.apache.org by na...@apache.org on 2019/06/22 07:10:46 UTC
[incubator-amaterasu] branch master updated (150ceda -> 02fc862)
This is an automated email from the ASF dual-hosted git repository.
nadavha pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu.git.
from 150ceda Update build.gradle
new bec8bd0 additional clean up for common
new d721be7 fixed git ignore to ignore .zip files
new faff1b8 kotlin job scheduler added
new e0adb8d mesos leader kotlin rewrite
new d9f7d73 fixed job completion
new 6a74ba0 moved leader scripts to leader common
new dbfc89b removed deprecated leader and executor projects
new c12bf32 implemented code review remarks
new 90a504f fixed the build issues
new 50ad796 fixed the build issues
new 998ad52 fixed the build issues
new 1a0fda8 Merge branch 'master' into AMATERASU-36-mesos
new 02fc862 Merge pull request #57 from roadan/AMATERASU-36-mesos
The 798 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +-
.../amaterasu/common/dataobjects/Export.scala | 19 -
.../amaterasu/common/dataobjects/JobData.scala | 21 -
.../apache/amaterasu/common/utils/FileUtils.scala | 28 --
executor/build.gradle | 105 ----
.../common/executors/ProvidersFactory.scala | 75 ---
.../mesos/executors/MesosActionsExecutor.scala | 153 ------
.../executor/mesos/executors/MesosNotifier.scala | 63 ---
.../executor/yarn/executors/ActionsExecutor.scala | 96 ----
executor/src/test/resources/codegen.pyc | Bin 25151 -> 0 bytes
frameworks/python/dispatcher/build.gradle | 3 +-
.../python/dispatcher/PythonSetupProvider.kt | 12 +-
.../spark/dispatcher/SparkSetupProvider.kt | 10 +-
.../providers/SparkSubmitScalaRunnerProvider.kt | 2 +-
frameworks/spark/runtime/build.gradle | 6 +-
leader-common/build.gradle | 18 +-
.../amaterasu/leader/common/execution/JobLoader.kt | 2 +-
.../leader/common/execution/JobManager.kt | 6 +-
.../FrameworkProvidersFactory.kt | 16 +-
.../common/utilities/ActiveReportListener.kt | 2 +-
.../leader/common/utilities/HttpServer.kt | 81 ++++
.../frameworks/FrameworkProvidersFactory.scala | 61 ---
.../src/main/scripts/amaterasu.properties | 0
.../src/main/scripts/log4j.properties | 0
.../common/configuration/ConfigManagerTests.kt | 1 -
...ParserArtifactTests.kt => ActionStatusTests.kt} | 49 +-
.../amaterasu/leader/common/dsl/GitUtilTests.kt | 16 +
.../leader/common/dsl/JobExecutionTests.kt | 128 +++++
...JobParserArtifactTests.kt => JobParserTests.kt} | 37 +-
.../leader/common/utilities/HttpServerTests.kt | 57 +++
.../dist/jetty-fileserver-test-file-1.txt | 0
.../dist/jetty-fileserver-test-file-2.txt | 0
.../src/test/resources/jetty-test-data.txt | 0
.../src/test/resources/simple-maki.yml | 0
leader-mesos/build.gradle | 86 ++++
.../org/apache/amaterasu/leader/mesos/Client.kt | 8 +
.../amaterasu/leader/mesos/ClientArgsParser.kt | 69 +++
.../apache/amaterasu/leader/mesos/JobScheduler.kt | 384 +++++++++++++++
.../src/main/scripts/ama-start-mesos.sh | 2 +-
.../amaterasu/leader/yarn/ApplicationMaster.kt | 6 +-
.../org/apache/amaterasu/leader/yarn/Client.kt | 4 +-
.../amaterasu/leader/yarn/ClientArgsParser.kt | 2 +-
.../src/main/scripts/ama-start-yarn.sh | 0
leader/build.gradle | 138 ------
leader/src/main/resources/log4j.properties | 23 -
.../amaterasu/leader/mesos/MesosJobLauncher.scala | 65 ---
.../leader/mesos/executors/JobExecutor.scala | 50 --
.../mesos/schedulers/AmaterasuScheduler.scala | 32 --
.../leader/mesos/schedulers/JobScheduler.scala | 526 ---------------------
.../apache/amaterasu/leader/utilities/Args.scala | 95 ----
.../leader/utilities/BaseJobLauncher.scala | 42 --
.../amaterasu/leader/utilities/HttpServer.scala | 88 ----
leader/src/test/resources/amaterasu.properties | 32 --
.../common/execution/ActionStatusTests.scala | 70 ---
.../common/execution/JobExecutionTests.scala | 158 -------
.../common/execution/JobParserTests.scala | 74 ---
.../common/execution/JobRestoreTests.scala | 83 ----
.../apache/amaterasu/integration/GitTests.scala | 36 --
.../amaterasu/leader/mesos/MesosTestUtil.scala | 50 --
.../amaterasu/utilities/HttpServerTests.scala | 78 ---
.../sdk/frameworks/FrameworkSetupProvider.kt | 4 +-
settings.gradle | 7 +-
62 files changed, 927 insertions(+), 2354 deletions(-)
delete mode 100644 common/src/main/scala/org/apache/amaterasu/common/dataobjects/Export.scala
delete mode 100755 common/src/main/scala/org/apache/amaterasu/common/dataobjects/JobData.scala
delete mode 100644 common/src/main/scala/org/apache/amaterasu/common/utils/FileUtils.scala
delete mode 100644 executor/build.gradle
delete mode 100644 executor/src/main/scala/org/apache/amaterasu/executor/common/executors/ProvidersFactory.scala
delete mode 100755 executor/src/main/scala/org/apache/amaterasu/executor/mesos/executors/MesosActionsExecutor.scala
delete mode 100755 executor/src/main/scala/org/apache/amaterasu/executor/mesos/executors/MesosNotifier.scala
delete mode 100644 executor/src/main/scala/org/apache/amaterasu/executor/yarn/executors/ActionsExecutor.scala
delete mode 100644 executor/src/test/resources/codegen.pyc
rename leader-common/src/main/kotlin/org/apache/amaterasu/leader/common/execution/{frameworls => frameworks}/FrameworkProvidersFactory.kt (75%)
create mode 100644 leader-common/src/main/kotlin/org/apache/amaterasu/leader/common/utilities/HttpServer.kt
delete mode 100644 leader-common/src/main/scala/org/apache/amaterasu/leader/common/execution/frameworks/FrameworkProvidersFactory.scala
rename {leader => leader-common}/src/main/scripts/amaterasu.properties (100%)
rename {leader => leader-common}/src/main/scripts/log4j.properties (100%)
copy leader-common/src/test/kotlin/org/apache/amaterasu/leader/common/dsl/{JobParserArtifactTests.kt => ActionStatusTests.kt} (50%)
create mode 100644 leader-common/src/test/kotlin/org/apache/amaterasu/leader/common/dsl/JobExecutionTests.kt
copy leader-common/src/test/kotlin/org/apache/amaterasu/leader/common/dsl/{JobParserArtifactTests.kt => JobParserTests.kt} (61%)
create mode 100644 leader-common/src/test/kotlin/org/apache/amaterasu/leader/common/utilities/HttpServerTests.kt
rename {leader => leader-common}/src/test/resources/dist/jetty-fileserver-test-file-1.txt (100%)
rename {leader => leader-common}/src/test/resources/dist/jetty-fileserver-test-file-2.txt (100%)
rename {leader => leader-common}/src/test/resources/jetty-test-data.txt (100%)
rename {leader => leader-common}/src/test/resources/simple-maki.yml (100%)
create mode 100644 leader-mesos/src/main/kotlin/org/apache/amaterasu/leader/mesos/Client.kt
create mode 100644 leader-mesos/src/main/kotlin/org/apache/amaterasu/leader/mesos/ClientArgsParser.kt
create mode 100644 leader-mesos/src/main/kotlin/org/apache/amaterasu/leader/mesos/JobScheduler.kt
rename {leader => leader-mesos}/src/main/scripts/ama-start-mesos.sh (98%)
rename {leader => leader-yarn}/src/main/scripts/ama-start-yarn.sh (100%)
delete mode 100644 leader/build.gradle
delete mode 100644 leader/src/main/resources/log4j.properties
delete mode 100755 leader/src/main/scala/org/apache/amaterasu/leader/mesos/MesosJobLauncher.scala
delete mode 100755 leader/src/main/scala/org/apache/amaterasu/leader/mesos/executors/JobExecutor.scala
delete mode 100755 leader/src/main/scala/org/apache/amaterasu/leader/mesos/schedulers/AmaterasuScheduler.scala
delete mode 100755 leader/src/main/scala/org/apache/amaterasu/leader/mesos/schedulers/JobScheduler.scala
delete mode 100644 leader/src/main/scala/org/apache/amaterasu/leader/utilities/Args.scala
delete mode 100644 leader/src/main/scala/org/apache/amaterasu/leader/utilities/BaseJobLauncher.scala
delete mode 100644 leader/src/main/scala/org/apache/amaterasu/leader/utilities/HttpServer.scala
delete mode 100755 leader/src/test/resources/amaterasu.properties
delete mode 100755 leader/src/test/scala/org/apache/amaterasu/common/execution/ActionStatusTests.scala
delete mode 100755 leader/src/test/scala/org/apache/amaterasu/common/execution/JobExecutionTests.scala
delete mode 100755 leader/src/test/scala/org/apache/amaterasu/common/execution/JobParserTests.scala
delete mode 100755 leader/src/test/scala/org/apache/amaterasu/common/execution/JobRestoreTests.scala
delete mode 100755 leader/src/test/scala/org/apache/amaterasu/integration/GitTests.scala
delete mode 100755 leader/src/test/scala/org/apache/amaterasu/leader/mesos/MesosTestUtil.scala
delete mode 100644 leader/src/test/scala/org/apache/amaterasu/utilities/HttpServerTests.scala