You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2014/07/16 01:43:00 UTC
git commit: OOZIE-1935 Log level (ActionStartXCommand) and Doc fix
(CoordinatorFunctionalSpec)
Repository: oozie
Updated Branches:
refs/heads/master 4f927d6f9 -> 7c15406f0
OOZIE-1935 Log level (ActionStartXCommand) and Doc fix (CoordinatorFunctionalSpec)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7c15406f
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7c15406f
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7c15406f
Branch: refs/heads/master
Commit: 7c15406f020f0d7631bfd24ebf4f2dffc387fcb4
Parents: 4f927d6
Author: mona <ch...@yahoo-inc.com>
Authored: Tue Jul 15 16:42:13 2014 -0700
Committer: mona <ch...@yahoo-inc.com>
Committed: Tue Jul 15 16:42:13 2014 -0700
----------------------------------------------------------------------
.../oozie/command/wf/ActionStartXCommand.java | 4 +--
.../site/twiki/CoordinatorFunctionalSpec.twiki | 36 +++++++++++++++-----
2 files changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/7c15406f/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
index 5d90775..f3a4ba9 100644
--- a/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/wf/ActionStartXCommand.java
@@ -259,7 +259,7 @@ public class ActionStartXCommand extends ActionXCommand<Void> {
}
}
- LOG.warn(XLog.STD, "[***" + wfAction.getId() + "***]" + "Action status=" + wfAction.getStatusStr());
+ LOG.info(XLog.STD, "[***" + wfAction.getId() + "***]" + "Action status=" + wfAction.getStatusStr());
updateList.add(new UpdateEntry<WorkflowActionQuery>(WorkflowActionQuery.UPDATE_ACTION_START, wfAction));
wfJob.setLastModifiedTime(new Date());
@@ -270,7 +270,7 @@ public class ActionStartXCommand extends ActionXCommand<Void> {
if(slaEvent != null) {
insertList.add(slaEvent);
}
- LOG.warn(XLog.STD, "[***" + wfAction.getId() + "***]" + "Action updated in DB!");
+ LOG.info(XLog.STD, "[***" + wfAction.getId() + "***]" + "Action updated in DB!");
}
}
catch (ActionExecutorException ex) {
http://git-wip-us.apache.org/repos/asf/oozie/blob/7c15406f/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki b/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
index ffc4752..cde0515 100644
--- a/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
+++ b/docs/src/site/twiki/CoordinatorFunctionalSpec.twiki
@@ -2497,25 +2497,43 @@ Coordinator applications that use HCatalog data dependencies.
---++++ 6.8.1 coord:databaseIn(String name), coord:databaseOut(String name) EL function
-The functions =${coord:databaseIn(String name}= and =${coord:databaseOut(String name}= are used to pass the database
+The functions =${coord:databaseIn(String name)}= and =${coord:databaseOut(String name)}= are used to pass the database
name of HCat dataset instances, input and output respectively, that will be consumed by a workflow job triggered
by a coordinator action.
-These functions take as argument - name of the dataset and give as string the 'database' name of that dataset.
-If dataset belongs to 'input-events', use =${coord:databaseIn(String name}=, else if it belongs to 'output-events',
-use =${coord:databaseOut(String name}=.
+For input database, you should pass the "data-in" name attribute of your 'input-events' configured in the coordinator.
+Similarly for output database, pass the "data-out" name attribute of your 'output-events'.
+
+To illustrate it better:
+If data belongs to 'input-events' and the name attribute of your =<data-in>= is "raw-logs",
+use =${coord:databaseIn('raw-logs')}=.
+Else if it belongs to 'output-events', and the name attribute of your =<data-out>= is "processed-logs",
+use =${coord:databaseOut('processed-logs')}=.
+Taking this passed argument as input, the EL functions give as string the 'database' name corresponding to your input or output data events.
+
+Pitfall: Please note NOT to pass the =<dataset>= name itself (as defined under combined set =<datasets>=),
+as this function works on the 'data-in' and 'data-out' names.
Refer to the [[CoordinatorFunctionalSpec#HCatPigExampleOne][Example]] below for usage.
---++++ 6.8.2 coord:tableIn(String name), coord:tableOut(String name) EL function
-The functions =${coord:tableIn(String name}= and =${coord:tableOut(String name}= are used to pass the table
+The functions =${coord:tableIn(String name)}= and =${coord:tableOut(String name)}= are used to pass the table
name of HCat dataset instances, input and output respectively, that will be consumed by a workflow job triggered
by a coordinator action.
-These functions take as argument - name of the dataset and give as string the 'table' name of that dataset.
-If dataset belongs to 'input-events', use =${coord:tableIn(String name}=, else if it belongs to 'output-events',
-use =${coord:tableOut(String name}=.
+For input table, you should pass the "data-in" name attribute of your 'input-events' configured in the coordinator.
+Similarly for output table, pass the "data-out" name attribute of your 'output-events'.
+
+To illustrate it better:
+If data belongs to 'input-events' and the name attribute of your =<data-in>= is "raw-logs",
+use =${coord:tableIn('raw-logs')}=.
+Similarly, if it belongs to 'output-events', and the name attribute of your =<data-out>= is "processed-logs",
+use =${coord:tableOut('processed-logs')}=.
+Taking this passed argument as input, the EL functions give as string the 'table' name corresponding to your input or output data events.
+
+Pitfall: Please note NOT to pass the =<dataset>= name itself (as defined under combined set =<datasets>=),
+as this function works on the 'data-in' and 'data-out' names.
Refer to the [[CoordinatorFunctionalSpec#HCatPigExampleOne][Example]] below for usage.
@@ -2588,7 +2606,7 @@ aggregated daily output.
<configuration>
<property>
<name>IN_DB</name>
- <value>${coord:databaseIn('Click-data')}</value>
+ <value>${coord:databaseIn('raw-logs')}</value>
</property>
<property>
<name>IN_TABLE</name>