You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amaterasu.apache.org by ya...@apache.org on 2018/11/25 13:33:47 UTC

[incubator-amaterasu] 01/01: Merge pull request #37 from ebarten/feature/AMATERASU-51

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

yaniv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu.git

commit d4f3c9ac49ebe9a3ef07055071b4f1649059e14d
Merge: 06806ee 095bac5
Author: Yaniv Rodenski <ro...@gmail.com>
AuthorDate: Mon Nov 26 00:33:43 2018 +1100

    Merge pull request #37 from ebarten/feature/AMATERASU-51
    
    feature/amaterasu-51: Add support for configuring the path for action level environment path

 .../apache/amaterasu/common/logging/Logging.java   |  19 ++-
 .../common/configuration/enums/ActionStatus.kt     |  19 ++-
 .../amaterasu/common/dataobjects/ActionData.kt     |   5 +-
 .../apache/amaterasu/common/logging/KLogging.kt    |  19 ++-
 leader-common/build.gradle                         |   6 +-
 .../amaterasu/leader/common/dsl/JobParser.kt       | 169 +++++++++++++++++++
 .../leader/common/execution/JobManager.kt          | 150 +++++++++++++++++
 .../leader/common/execution/actions/Action.kt      |   1 -
 .../leader/common/execution/actions/ErrorAction.kt |  48 ++++++
 .../common/execution/actions/SequentialAction.kt   |  51 ++++++
 .../execution/actions/SequentialActionBase.kt      |  66 ++++++++
 .../frameworks/FrameworkProvidersFactory.scala     |   2 +-
 .../common}/utilities/ActiveReportListener.scala   |   2 +-
 .../leader/common/utilities/DataLoader.scala       |  30 ++--
 .../common/utilities/MemoryFormatParser.scala      |   2 +-
 leader/build.gradle                                |  20 ++-
 .../org/apache/amaterasu/leader/yarn/Client.java   |   4 +-
 .../leader/common/actions/SequentialAction.scala   | 135 ---------------
 .../apache/amaterasu/leader/dsl/JobParser.scala    | 181 --------------------
 .../amaterasu/leader/execution/JobLoader.scala     |   6 +-
 .../amaterasu/leader/execution/JobManager.scala    | 187 ---------------------
 .../leader/mesos/schedulers/JobScheduler.scala     |  33 ++--
 .../amaterasu/leader/yarn/ApplicationMaster.scala  |  34 ++--
 .../leader/yarn/YarnRMCallbackHandler.scala        |   6 +-
 leader/src/test/resources/simple-maki.yml          |   5 +-
 .../common/execution/ActionStatusTests.scala       |   8 +-
 .../common/execution/JobExecutionTests.scala       |  26 ++-
 .../common/execution/JobParserTests.scala          |  24 ++-
 .../common/execution/JobRestoreTests.scala         |   7 +-
 29 files changed, 664 insertions(+), 601 deletions(-)