Updated Branches: refs/heads/master 7c5411686 -> 8ee3abb64
SAMZA-38; rename run-task.sh to run-container.sh Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/8ee3abb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/8ee3abb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/8ee3abb6 Branch: refs/heads/master Commit: 8ee3abb647d9174e1596f7ea6ce1c47866a23d94 Parents: 7c54116 Author: Rekha Joshi <[email protected]> Authored: Mon Jan 6 10:18:20 2014 -0800 Committer: Chris Riccomini <[email protected]> Committed: Mon Jan 6 10:18:20 2014 -0800 ---------------------------------------------------------------------- .../0.7.0/jobs/configuration-table.html | 2 +- .../learn/documentation/0.7.0/jobs/job-runner.md | 2 +- docs/learn/documentation/0.7.0/jobs/packaging.md | 8 ++++---- docs/learn/documentation/0.7.0/jobs/yarn-jobs.md | 2 +- .../apache/samza/config/ShellCommandConfig.scala | 2 +- samza-shell/src/main/bash/run-container.sh | 19 +++++++++++++++++++ samza-shell/src/main/bash/run-task.sh | 19 ------------------- 7 files changed, 27 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8ee3abb6/docs/learn/documentation/0.7.0/jobs/configuration-table.html ---------------------------------------------------------------------- diff --git a/docs/learn/documentation/0.7.0/jobs/configuration-table.html b/docs/learn/documentation/0.7.0/jobs/configuration-table.html index 7232e02..8b42b3a 100644 --- a/docs/learn/documentation/0.7.0/jobs/configuration-table.html +++ b/docs/learn/documentation/0.7.0/jobs/configuration-table.html @@ -35,7 +35,7 @@ </tr> <tr> <td>task.execute</td> - <td>bin/run-task.sh</td> + <td>bin/run-container.sh</td> <td>The command that a StreamJob should invoke to start the TaskRunner.</td> </tr> <tr> http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8ee3abb6/docs/learn/documentation/0.7.0/jobs/job-runner.md ---------------------------------------------------------------------- diff --git a/docs/learn/documentation/0.7.0/jobs/job-runner.md b/docs/learn/documentation/0.7.0/jobs/job-runner.md index 4c2ab4c..c73b234 100644 --- a/docs/learn/documentation/0.7.0/jobs/job-runner.md +++ b/docs/learn/documentation/0.7.0/jobs/job-runner.md @@ -37,7 +37,7 @@ public interface StreamJob { } ``` -Once the JobRunner gets a job, it calls submit() on the job. This method is what tells the StreamJob implementation to start the TaskRunner. In the case of LocalJobRunner, it uses a run-task.sh script to execute the TaskRunner in a separate process, which will start one TaskRunner locally on the machine that you ran run-job.sh on. +Once the JobRunner gets a job, it calls submit() on the job. This method is what tells the StreamJob implementation to start the TaskRunner. In the case of LocalJobRunner, it uses a run-container.sh script to execute the TaskRunner in a separate process, which will start one TaskRunner locally on the machine that you ran run-job.sh on.  http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8ee3abb6/docs/learn/documentation/0.7.0/jobs/packaging.md ---------------------------------------------------------------------- diff --git a/docs/learn/documentation/0.7.0/jobs/packaging.md b/docs/learn/documentation/0.7.0/jobs/packaging.md index 796d0fe..62c089a 100644 --- a/docs/learn/documentation/0.7.0/jobs/packaging.md +++ b/docs/learn/documentation/0.7.0/jobs/packaging.md @@ -3,14 +3,14 @@ layout: page title: Packaging --- -The [JobRunner](job-runner.html) page talks about run-job.sh, and how it's used to start a job either locally (LocalJobFactory) or with YARN (YarnJobFactory). In the diagram that shows the execution flow, it also shows a run-task.sh script. This script, along with a run-am.sh script, are what Samza actually calls to execute its code. +The [JobRunner](job-runner.html) page talks about run-job.sh, and how it's used to start a job either locally (LocalJobFactory) or with YARN (YarnJobFactory). In the diagram that shows the execution flow, it also shows a run-container.sh script. This script, along with a run-am.sh script, are what Samza actually calls to execute its code. ``` bin/run-am.sh -bin/run-task.sh +bin/run-container.sh ``` -The run-task.sh script is responsible for starting the TaskRunner. The run-am.sh script is responsible for starting Samza's application master for YARN. Thus, the run-am.sh script is only used by the YarnJob, but both YarnJob and ProcessJob use run-task.sh. +The run-container.sh script is responsible for starting the TaskRunner. The run-am.sh script is responsible for starting Samza's application master for YARN. Thus, the run-am.sh script is only used by the YarnJob, but both YarnJob and ProcessJob use run-container.sh. Typically, these two scripts are bundled into a tar.gz file that has a structure like this: @@ -18,7 +18,7 @@ Typically, these two scripts are bundled into a tar.gz file that has a structure bin/run-am.sh bin/run-class.sh bin/run-job.sh -bin/run-task.sh +bin/run-container.sh lib/*.jar ``` http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8ee3abb6/docs/learn/documentation/0.7.0/jobs/yarn-jobs.md ---------------------------------------------------------------------- diff --git a/docs/learn/documentation/0.7.0/jobs/yarn-jobs.md b/docs/learn/documentation/0.7.0/jobs/yarn-jobs.md index 93e8610..3d971cd 100644 --- a/docs/learn/documentation/0.7.0/jobs/yarn-jobs.md +++ b/docs/learn/documentation/0.7.0/jobs/yarn-jobs.md @@ -11,6 +11,6 @@ If you want to use YARN to run your Samza job, you'll also need to define the lo yarn.package.path=http://my.http.server/jobs/ingraphs-package-0.0.55.tgz ``` -This .tgz file follows the conventions outlined on the [Packaging](packaging.html) page (it has bin/run-am.sh and bin/run-task.sh). YARN NodeManagers will take responsibility for downloading this .tgz file on the appropriate machines, and untar'ing them. From there, YARN will execute run-am.sh or run-task.sh for the Samza Application Master, and TaskRunner, respectively. +This .tgz file follows the conventions outlined on the [Packaging](packaging.html) page (it has bin/run-am.sh and bin/run-container.sh). YARN NodeManagers will take responsibility for downloading this .tgz file on the appropriate machines, and untar'ing them. From there, YARN will execute run-am.sh or run-container.sh for the Samza Application Master, and TaskRunner, respectively. ## [Logging »](logging.html) http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8ee3abb6/samza-core/src/main/scala/org/apache/samza/config/ShellCommandConfig.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/config/ShellCommandConfig.scala b/samza-core/src/main/scala/org/apache/samza/config/ShellCommandConfig.scala index 3e4ab29..4c2d365 100644 --- a/samza-core/src/main/scala/org/apache/samza/config/ShellCommandConfig.scala +++ b/samza-core/src/main/scala/org/apache/samza/config/ShellCommandConfig.scala @@ -48,7 +48,7 @@ object ShellCommandConfig { } class ShellCommandConfig(config: Config) extends ScalaMapConfig(config) { - def getCommand = getOption(ShellCommandConfig.COMMAND_SHELL_EXECUTE).getOrElse("bin/run-task.sh") + def getCommand = getOption(ShellCommandConfig.COMMAND_SHELL_EXECUTE).getOrElse("bin/run-container.sh") def getTaskOpts = getOption(ShellCommandConfig.TASK_JVM_OPTS) } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8ee3abb6/samza-shell/src/main/bash/run-container.sh ---------------------------------------------------------------------- diff --git a/samza-shell/src/main/bash/run-container.sh b/samza-shell/src/main/bash/run-container.sh new file mode 100755 index 0000000..72cee18 --- /dev/null +++ b/samza-shell/src/main/bash/run-container.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +exec $(dirname $0)/run-class.sh org.apache.samza.container.SamzaContainer $@ http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/8ee3abb6/samza-shell/src/main/bash/run-task.sh ---------------------------------------------------------------------- diff --git a/samza-shell/src/main/bash/run-task.sh b/samza-shell/src/main/bash/run-task.sh deleted file mode 100755 index 72cee18..0000000 --- a/samza-shell/src/main/bash/run-task.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -exec $(dirname $0)/run-class.sh org.apache.samza.container.SamzaContainer $@
