Merge branch 'master' into site
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/356f9eae Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/356f9eae Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/356f9eae Branch: refs/heads/site Commit: 356f9eae23ad183f814ccbba6bb76e2daf46ba87 Parents: 5c6f578 d864ed1 Author: Terence Yim <[email protected]> Authored: Mon Jun 22 17:44:00 2015 -0700 Committer: Terence Yim <[email protected]> Committed: Mon Jun 22 17:44:00 2015 -0700 ---------------------------------------------------------------------- pom.xml | 8 +- .../org/apache/twill/api/TwillController.java | 6 +- .../org/apache/twill/api/TwillPreparer.java | 10 ++ .../org/apache/twill/api/TwillRunResources.java | 8 + .../internal/DefaultTwillRunResources.java | 12 +- .../twill/internal/ApplicationBundler.java | 15 +- .../twill/internal/BasicTwillContext.java | 3 +- .../java/org/apache/twill/internal/EnvKeys.java | 3 + .../org/apache/twill/internal/JvmOptions.java | 32 ++++ .../apache/twill/internal/ProcessLauncher.java | 2 +- .../twill/internal/TwillContainerLauncher.java | 10 ++ .../twill/internal/json/ArgumentsCodec.java | 10 +- .../twill/internal/json/JvmOptionsCodec.java | 10 +- .../internal/json/TwillRunResourcesCodec.java | 27 ++- .../json/TwillSpecificationAdapter.java | 11 +- .../twill/internal/logging/KafkaAppender.java | 2 +- .../apache/twill/internal/state/Message.java | 2 +- .../twill/internal/state/MessageCallback.java | 2 +- .../twill/internal/state/SimpleMessage.java | 2 +- .../twill/internal/utils/Dependencies.java | 5 +- .../apache/twill/internal/utils/Networks.java | 9 +- .../org/apache/twill/launcher/FindFreePort.java | 5 +- .../apache/twill/launcher/TwillLauncher.java | 10 +- .../apache/twill/internal/DebugOptionsTest.java | 99 +++++++++++ .../internal/utils/ApplicationBundlerTest.java | 5 +- .../org/apache/twill/ext/BundledJarRunner.java | 15 +- .../apache/twill/ext/BundledJarRunnerTest.java | 12 +- .../internal/yarn/Hadoop20YarnAppClient.java | 5 + .../internal/yarn/Hadoop21YarnAMClient.java | 2 +- .../internal/yarn/Hadoop21YarnAppClient.java | 5 + .../internal/yarn/Hadoop21YarnNMClient.java | 2 +- .../org/apache/twill/internal/ServiceMain.java | 8 +- .../appmaster/ApplicationMasterService.java | 19 +-- .../internal/appmaster/RunningContainers.java | 10 +- .../internal/container/TwillContainerMain.java | 20 ++- .../internal/yarn/AbstractYarnTwillService.java | 5 +- .../yarn/VersionDetectYarnAppClientFactory.java | 2 +- .../apache/twill/yarn/YarnTwillPreparer.java | 69 ++++---- .../twill/yarn/YarnTwillRunnerService.java | 13 +- .../org/apache/twill/yarn/DistributedShell.java | 7 +- .../apache/twill/yarn/EchoServerTestRun.java | 9 +- .../twill/yarn/FailureRestartTestRun.java | 5 +- .../org/apache/twill/yarn/LocalFileTestRun.java | 10 +- .../org/apache/twill/yarn/LogLevelTestRun.java | 149 +++++++++++++++++ .../twill/yarn/ResourceReportTestRun.java | 18 +- .../org/apache/twill/yarn/SocketServer.java | 13 +- .../zookeeper/DefaultZKClientService.java | 164 +++++++++++++------ .../internal/zookeeper/LeaderElection.java | 12 +- .../org/apache/twill/zookeeper/ZKClients.java | 10 +- .../apache/twill/zookeeper/ZKClientTest.java | 85 +++++++--- 50 files changed, 681 insertions(+), 296 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/356f9eae/pom.xml ----------------------------------------------------------------------
