Merge branch 'master' into site
Project: http://git-wip-us.apache.org/repos/asf/twill/repo Commit: http://git-wip-us.apache.org/repos/asf/twill/commit/3680e00f Tree: http://git-wip-us.apache.org/repos/asf/twill/tree/3680e00f Diff: http://git-wip-us.apache.org/repos/asf/twill/diff/3680e00f Branch: refs/heads/site Commit: 3680e00f0f60700eb0b4ffff94e6fe8f34c77d6c Parents: 7bdf857 401496a Author: Terence Yim <[email protected]> Authored: Sat Apr 8 11:08:16 2017 -0700 Committer: Terence Yim <[email protected]> Committed: Sat Apr 8 11:08:16 2017 -0700 ---------------------------------------------------------------------- NOTICE | 2 +- README.md | 4 +- pom.xml | 6 +- twill-api/pom.xml | 2 +- .../main/java/org/apache/twill/api/Configs.java | 42 +++ .../apache/twill/api/SecureStoreUpdater.java | 5 + .../org/apache/twill/api/ServiceController.java | 32 +- .../org/apache/twill/api/TwillPreparer.java | 21 ++ .../java/org/apache/twill/api/TwillRunner.java | 20 + .../twill/api/security/SecureStoreRenewer.java | 41 ++ .../twill/api/security/SecureStoreWriter.java | 36 ++ twill-common/pom.xml | 2 +- .../org/apache/twill/internal/Constants.java | 12 +- twill-core/pom.xml | 2 +- .../AbstractExecutionServiceController.java | 12 + .../twill/internal/AbstractTwillController.java | 36 +- .../java/org/apache/twill/internal/EnvKeys.java | 2 - .../internal/TwillContainerController.java | 10 +- .../twill/internal/TwillContainerLauncher.java | 12 + .../internal/TwillRuntimeSpecification.java | 26 +- .../internal/json/ResourceReportAdapter.java | 1 + .../json/TwillRuntimeSpecificationCodec.java | 8 +- .../twill/internal/logging/KafkaAppender.java | 30 +- .../apache/twill/launcher/TwillLauncher.java | 44 ++- .../apache/twill/internal/ControllerTest.java | 11 +- twill-discovery-api/pom.xml | 2 +- twill-discovery-core/pom.xml | 2 +- twill-examples/echo/pom.xml | 2 +- twill-examples/pom.xml | 2 +- twill-examples/yarn/pom.xml | 2 +- twill-ext/pom.xml | 2 +- twill-java8-test/pom.xml | 2 +- twill-yarn/pom.xml | 2 +- .../internal/yarn/Hadoop20YarnAppClient.java | 120 +++--- .../yarn/Hadoop20YarnApplicationReport.java | 4 +- .../internal/yarn/Hadoop21YarnAppClient.java | 133 ++++--- .../internal/yarn/Hadoop23YarnAppClient.java | 111 ++++++ .../filesystem/FileContextLocationFactory.java | 77 +++- .../apache/twill/filesystem/HDFSLocation.java | 371 ------------------- .../twill/filesystem/HDFSLocationFactory.java | 107 ------ .../org/apache/twill/internal/ServiceMain.java | 125 +++---- .../ApplicationMasterLiveNodeData.java | 15 +- .../appmaster/ApplicationMasterMain.java | 96 +++-- .../appmaster/ApplicationMasterService.java | 218 +++++------ .../internal/appmaster/ExpectedContainers.java | 13 +- .../appmaster/PlacementPolicyManager.java | 77 ++-- .../appmaster/RunnableContainerRequest.java | 6 +- .../internal/appmaster/RunningContainers.java | 11 +- .../internal/appmaster/TrackerService.java | 37 +- .../internal/container/TwillContainerMain.java | 36 +- .../container/TwillContainerService.java | 7 +- .../internal/yarn/AbstractYarnAMClient.java | 50 +-- .../internal/yarn/AbstractYarnTwillService.java | 18 +- .../yarn/VersionDetectYarnAMClientFactory.java | 2 +- .../yarn/VersionDetectYarnAppClientFactory.java | 25 +- .../twill/internal/yarn/YarnAMClient.java | 40 +- .../apache/twill/internal/yarn/YarnUtils.java | 100 +++-- .../twill/yarn/LocationSecureStoreRenewer.java | 49 +++ .../twill/yarn/LocationSecureStoreUpdater.java | 54 --- .../apache/twill/yarn/ResourceReportClient.java | 28 +- .../apache/twill/yarn/YarnTwillController.java | 79 +++- .../twill/yarn/YarnTwillControllerFactory.java | 2 +- .../apache/twill/yarn/YarnTwillPreparer.java | 269 ++++++++------ .../twill/yarn/YarnTwillRunnerService.java | 312 +++++++++++----- .../filesystem/FileContextLocationTest.java | 58 +-- .../twill/filesystem/HDFSLocationTest.java | 31 -- .../twill/filesystem/LocalLocationTest.java | 23 +- .../twill/filesystem/LocationTestBase.java | 367 +++++++++--------- .../apache/twill/yarn/ContainerSizeTestRun.java | 10 + .../apache/twill/yarn/CustomClassLoader.java | 87 +++++ .../twill/yarn/CustomClassLoaderRunnable.java | 56 +++ .../twill/yarn/CustomClassLoaderTestRun.java | 42 +++ .../apache/twill/yarn/LogHandlerTestRun.java | 44 +++ .../org/apache/twill/yarn/LogLevelTestRun.java | 26 +- .../twill/yarn/ResourceReportTestRun.java | 47 ++- .../apache/twill/yarn/TaskCompletedTestRun.java | 28 +- .../java/org/apache/twill/yarn/TwillTester.java | 5 +- .../org/apache/twill/yarn/YarnTestSuite.java | 1 + twill-yarn/src/test/resources/logback-test.xml | 1 + twill-zookeeper/pom.xml | 2 +- 80 files changed, 2178 insertions(+), 1677 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/twill/blob/3680e00f/pom.xml ----------------------------------------------------------------------
