Repository: falcon Updated Branches: refs/heads/master 77910aefd -> af9c80ac9
FALCON-1363 Fix retry policy example in documentation. Contributed by Peeyush Bishnoi. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/af9c80ac Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/af9c80ac Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/af9c80ac Branch: refs/heads/master Commit: af9c80ac970043e154c07f52a1438cc6cf9a0ffa Parents: 77910ae Author: Ajay Yadava <[email protected]> Authored: Wed Aug 5 00:48:37 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Wed Aug 5 00:48:37 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ client/src/main/resources/process-0.1.xsd | 7 +++---- docs/src/site/twiki/EntitySpecification.twiki | 4 ++-- docs/src/site/twiki/OnBoarding.twiki | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/af9c80ac/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6148bc6..c6d6fc1 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -73,6 +73,8 @@ Trunk (Unreleased) (Suhas Vasu) BUG FIXES + FALCON-1363 Fix retry policy example in documentation(Peeyush Bishnoi via Ajay Yadava) + FALCON-1327 When using triage on a server for a process which does not exist on that server, a NullPointerException is encountered(Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/af9c80ac/client/src/main/resources/process-0.1.xsd ---------------------------------------------------------------------- diff --git a/client/src/main/resources/process-0.1.xsd b/client/src/main/resources/process-0.1.xsd index 7f62aac..c81d6f7 100644 --- a/client/src/main/resources/process-0.1.xsd +++ b/client/src/main/resources/process-0.1.xsd @@ -154,10 +154,9 @@ </xs:element> <xs:element type="retry" name="retry" minOccurs="0"> <xs:annotation> - <xs:documentation>Retry defines how to handle workflow failures. Policy type - backoff, exponention - backoff along with the delay define how frequenctly - the - workflow should be re-tried. Number of attempts define how many times to re-try the failures. + <xs:documentation>Retry defines how to handle workflow failures. Policy type - periodic, exponential + backoff, final along with the delay define how frequently the workflow should be re-tried. Number of + attempts define how many times to re-try the failures. </xs:documentation> </xs:annotation> </xs:element> http://git-wip-us.apache.org/repos/asf/falcon/blob/af9c80ac/docs/src/site/twiki/EntitySpecification.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/EntitySpecification.twiki b/docs/src/site/twiki/EntitySpecification.twiki index 98d6153..bf45598 100644 --- a/docs/src/site/twiki/EntitySpecification.twiki +++ b/docs/src/site/twiki/EntitySpecification.twiki @@ -757,7 +757,7 @@ Feeds with Hive table storage will send one more parameter apart from the genera <verbatim>$input_filter</verbatim> ---+++ Retry -Retry policy defines how the workflow failures should be handled. Two retry policies are defined: backoff and exp-backoff(exponential backoff). Depending on the delay and number of attempts, the workflow is re-tried after specific intervals. +Retry policy defines how the workflow failures should be handled. Three retry policies are defined: periodic, exp-backoff(exponential backoff) and final. Depending on the delay and number of attempts, the workflow is re-tried after specific intervals. Syntax: <verbatim> <process name="[process name]"> @@ -771,7 +771,7 @@ Examples: <verbatim> <process name="sample-process"> ... - <retry policy="backoff" delay="minutes(10)" attempts="3"/> + <retry policy="periodic" delay="minutes(10)" attempts="3"/> ... </process> </verbatim> http://git-wip-us.apache.org/repos/asf/falcon/blob/af9c80ac/docs/src/site/twiki/OnBoarding.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/OnBoarding.twiki b/docs/src/site/twiki/OnBoarding.twiki index 4f49c5a..8b02150 100644 --- a/docs/src/site/twiki/OnBoarding.twiki +++ b/docs/src/site/twiki/OnBoarding.twiki @@ -148,7 +148,7 @@ Sample process which runs daily at 6th hour on corp cluster. It takes one input <workflow engine="oozie" path="/projects/bootcamp/workflow" /> - <retry policy="backoff" delay="minutes(5)" attempts="3" /> + <retry policy="periodic" delay="minutes(5)" attempts="3" /> <late-process policy="exp-backoff" delay="hours(1)"> <late-input input="input" workflow-path="/projects/bootcamp/workflow/lateinput" />
