Repository: incubator-reef
Updated Branches:
  refs/heads/master cfdd28127 -> acff87534


[REEF-444] Replace "Activity" with "Task" on 
http://reef.incubator.apache.org/introduction.html

This addressed the issue by
  * Updating images from 
https://cwiki.apache.org/confluence/display/REEF/Website+Artifacts
  * Replacing text occurrences

JIRA:
  [REEF-444](https://issues.apache.org/jira/browse/REEF-444)

Pull Request:
  This closes #361


Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/acff8753
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/acff8753
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/acff8753

Branch: refs/heads/master
Commit: acff875347227d4c487d6761465e7db1b9440d53
Parents: cfdd281
Author: Mariia Mykhailova <michayl...@gmail.com>
Authored: Mon Aug 10 13:27:33 2015 -0700
Committer: Brian Cho <chobr...@apache.org>
Committed: Tue Aug 11 17:40:17 2015 +0900

----------------------------------------------------------------------
 website/src/site/markdown/introduction.md       |  10 +++++-----
 .../src/site/resources/reef-architecture.png    | Bin 23411 -> 23232 bytes
 .../src/site/resources/states-horizontal.png    | Bin 27111 -> 25221 bytes
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/acff8753/website/src/site/markdown/introduction.md
----------------------------------------------------------------------
diff --git a/website/src/site/markdown/introduction.md 
b/website/src/site/markdown/introduction.md
index 37def4d..8a74d2d 100644
--- a/website/src/site/markdown/introduction.md
+++ b/website/src/site/markdown/introduction.md
@@ -40,7 +40,7 @@ Below, we describe the client facing interfaces to these 
components. The core RE
 
 <br></br>
 
-The above figure presents the REEF components in terms of a running 
application, which is written in terms of a `Driver` and task-specific `Task` 
modules. The application code is packaged and submitted to a REEF client API, 
which in turn submits a REEF-AM configuration to YARN. The REEF-AM contains a 
runtime for launching the `Driver` and client libraries for requesting 
Evaluators and launching `Activities`. When a request for `Evaluators` is made, 
the REEF-AM negotiates containers with the YARN-RM and launches an `Evaluator` 
runtime on the YARN-NM that hosts the allocated container. In turn, the 
`Driver` is given an `Evaluator` object reference, which it uses to submit an 
`Task`. The `Driver` is also given a `Task` object reference, which it may use 
to send messages to the `Task` running in the `Evaluator`. The REEF layer 
implements these communication channels and encodes the computational 
life-cycle as state transitions, which are surfaced to the `Driver` in the form 
of Rx messag
 es.
+The above figure presents the REEF components in terms of a running 
application, which is written in terms of a `Driver` and task-specific `Task` 
modules. The application code is packaged and submitted to a REEF client API, 
which in turn submits a REEF-AM configuration to YARN. The REEF-AM contains a 
runtime for launching the `Driver` and client libraries for requesting 
`Evaluators` and launching `Tasks`. When a request for `Evaluators` is made, 
the REEF-AM negotiates containers with the YARN-RM and launches an `Evaluator` 
runtime on the YARN-NM that hosts the allocated container. In turn, the 
`Driver` is given an `Evaluator` object reference, which it uses to submit an 
`Task`. The `Driver` is also given a `Task` object reference, which it may use 
to send messages to the `Task` running in the `Evaluator`. The REEF layer 
implements these communication channels and encodes the computational 
life-cycle as state transitions, which are surfaced to the `Driver` in the form 
of Rx messages.
 
 ###Computational Life-Cycle
 
@@ -50,14 +50,14 @@ The above figure presents the REEF components in terms of a 
running application,
       <img src="states-horizontal.png"></img>
 </div>
 
-*States of `Evaluator`, `Contexts`, and `Activities`*
+*States of `Evaluator`, `Contexts`, and `Tasks`*
 
 <br></br>
 
-The Figure above describes the state transitions for (a) `Evaluator` and 
`Context` and (b) `Task` components. Each state transition is associated with 
an object reference that is surfaced to the `Driver` in an Rx-style interface. 
For instance, when the YARN-RM notifies the REEF-AM of an allocated container, 
the `Driver` is given an `AllocatedEvaluator` object; containing methods for 
adding configurations (i.e., for data services, see below) and file resources, 
and submit methods that bootstraps the `Evaluator` runtime on the YARN-NM. When 
an `Evaluator` bootstrap successfully completes, the `Driver` is given an 
`ActiveContext` object, which can be used to launch `Activities` or to initiate 
a close, which triggers a shutdown event at the `Evaluator` runtime and a 
subsequent container release at the YARN-RM. If at any point a failure occurs, 
the `Driver` is passed a `FailedEvaluator` object; containing an exception 
trace when possible.
+The Figure above describes the state transitions for (a) `Evaluator` and 
`Context` and (b) `Task` components. Each state transition is associated with 
an object reference that is surfaced to the `Driver` in an Rx-style interface. 
For instance, when the YARN-RM notifies the REEF-AM of an allocated container, 
the `Driver` is given an `AllocatedEvaluator` object; containing methods for 
adding configurations (i.e., for data services, see below) and file resources, 
and submit methods that bootstraps the `Evaluator` runtime on the YARN-NM. When 
an `Evaluator` bootstrap successfully completes, the `Driver` is given an 
`ActiveContext` object, which can be used to launch `Tasks` or to initiate a 
close, which triggers a shutdown event at the `Evaluator` runtime and a 
subsequent container release at the YARN-RM. If at any point a failure occurs, 
the `Driver` is passed a `FailedEvaluator` object; containing an exception 
trace when possible.
 
-Recall that the `Driver` launches a `Task` on a submit method call from the 
`ActiveContext` reference. This state transition is denoted in the Figure above 
by the edge labeled submit; spanning the two state machines. The REEF-AM passes 
a `RunningActivity` object to the `Driver` after receiving confirmation of a 
successful `Task` start or resume. The `Driver` may use the `RunningActivity` 
reference to close or suspend the execution; triggering a `CompletedActivity` 
or `SuspendedActivity` object reference to the `Driver`. The 
`SuspendedActivity` object contains a memento used to resume the execution on 
some (possibly alternative) `ActiveContext`. Exceptions during the `Task` 
execution are surfaced to the `Driver` in the form of a `FailedActivity`, which 
contains the actual exception object.
+Recall that the `Driver` launches a `Task` on a submit method call from the 
`ActiveContext` reference. This state transition is denoted in the Figure above 
by the edge labeled submit; spanning the two state machines. The REEF-AM passes 
a `RunningTask` object to the `Driver` after receiving confirmation of a 
successful `Task` start or resume. The `Driver` may use the `RunningTask` 
reference to close or suspend the execution; triggering a `CompletedTask` or 
`SuspendedTask` object reference to the `Driver`. The `SuspendedTask` object 
contains a memento used to resume the execution on some (possibly alternative) 
`ActiveContext`. Exceptions during the `Task` execution are surfaced to the 
`Driver` in the form of a `FailedTask`, which contains the actual exception 
object.
 
 ###Task Component
 
-A `Task` encapsulates the task work of a job. The client interface contains a 
single synchronous call method that takes an optional memento argument and 
returns a byte array, which will be packaged with the `CompletedActivity` 
object surfaced to the `Driver`. An exception may be thrown at any point during 
the call method; returning control back to the `Evaluator`, which packages the 
exception and sends it to the `Driver` where it is surfaced as a 
`FailedActivity`. The `Evaluator` periodically performs a heartbeat with the 
REEF-AM to convey its status information. A `Task` can optionally implement a 
method interface that, when called, returns a (bounded) byte array, which the 
`Evaluator` includes in its heartbeat to the REEF-AM and surfaced to the 
`Driver`.
\ No newline at end of file
+A `Task` encapsulates the task work of a job. The client interface contains a 
single synchronous call method that takes an optional memento argument and 
returns a byte array, which will be packaged with the `CompletedTask` object 
surfaced to the `Driver`. An exception may be thrown at any point during the 
call method; returning control back to the `Evaluator`, which packages the 
exception and sends it to the `Driver` where it is surfaced as a `FailedTask`. 
The `Evaluator` periodically performs a heartbeat with the REEF-AM to convey 
its status information. A `Task` can optionally implement a method interface 
that, when called, returns a (bounded) byte array, which the `Evaluator` 
includes in its heartbeat to the REEF-AM and surfaced to the `Driver`.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/acff8753/website/src/site/resources/reef-architecture.png
----------------------------------------------------------------------
diff --git a/website/src/site/resources/reef-architecture.png 
b/website/src/site/resources/reef-architecture.png
index 321aaae..d6c3f45 100644
Binary files a/website/src/site/resources/reef-architecture.png and 
b/website/src/site/resources/reef-architecture.png differ

http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/acff8753/website/src/site/resources/states-horizontal.png
----------------------------------------------------------------------
diff --git a/website/src/site/resources/states-horizontal.png 
b/website/src/site/resources/states-horizontal.png
index 6627815..0ec8091 100644
Binary files a/website/src/site/resources/states-horizontal.png and 
b/website/src/site/resources/states-horizontal.png differ

Reply via email to