You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2014/09/24 20:26:09 UTC
[1/3] git commit: FALCON-740 Entity kill job calls OozieClient.kill
on bundle coord job ids before calling kill on bundle job id. Contributed by
Sowmya Ramesh
Repository: incubator-falcon
Updated Branches:
refs/heads/master 353ececc6 -> 4da62d1c5
FALCON-740 Entity kill job calls OozieClient.kill on bundle coord job ids before calling kill on bundle job id. Contributed by Sowmya Ramesh
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/dfdb21ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/dfdb21ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/dfdb21ed
Branch: refs/heads/master
Commit: dfdb21edf0eed8f12b623ef36a7edf0e9ffe9443
Parents: 353ecec
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Wed Sep 24 11:24:28 2014 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Wed Sep 24 11:24:28 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../workflow/engine/OozieWorkflowEngine.java | 4 ----
.../falcon/resource/EntityManagerJerseyIT.java | 21 ++++++++++++++++++++
3 files changed, 24 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dfdb21ed/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0558ab4..f19ebef 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -94,6 +94,9 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-740 Entity kill job calls OozieClient.kill on bundle coord job ids
+ before calling kill on bundle job id (Sowmya Ramesh via Venkatesh Seetharam)
+
FALCON-732 Lineage capture fails for an instance thats not generated by
falcon (Sowmya Ramesh via Venkatesh Seetharam)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dfdb21ed/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
----------------------------------------------------------------------
diff --git a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
index ed23813..fd8c63f 100644
--- a/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
+++ b/oozie/src/main/java/org/apache/falcon/workflow/engine/OozieWorkflowEngine.java
@@ -378,10 +378,6 @@ public class OozieWorkflowEngine extends AbstractWorkflowEngine {
LOG.debug("Killed coord {} on cluster {}", coord.getId(), clusterName);
}
- //set end time of bundle
- client.change(job.getId(), OozieClient.CHANGE_VALUE_ENDTIME + "=" + SchemaHelper.formatDateUTC(new Date()));
- LOG.debug("Changed end time of bundle {} on cluster {}", job.getId(), clusterName);
-
//kill bundle
client.kill(job.getId());
LOG.debug("Killed bundle {} on cluster {}", job.getId(), clusterName);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/dfdb21ed/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
index f33a002..ed70a0b 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java
@@ -527,6 +527,27 @@ public class EntityManagerJerseyIT {
context.assertSuccessful(response);
}
+ public void testProcesssScheduleAndDelete() throws Exception {
+ TestContext context = newContext();
+ ClientResponse clientResponse;
+ Map<String, String> overlay = context.getUniqueOverlay();
+ String tmpFileName = TestContext.overlayParametersOverTemplate(TestContext.PROCESS_TEMPLATE, overlay);
+ Process process = (Process) EntityType.PROCESS.getUnmarshaller().unmarshal(new File(tmpFileName));
+ updateEndtime(process);
+ File tmpFile = TestContext.getTempFile();
+ EntityType.PROCESS.getMarshaller().marshal(process, tmpFile);
+ context.scheduleProcess(tmpFile.getAbsolutePath(), overlay);
+ OozieTestUtils.waitForBundleStart(context, Status.RUNNING);
+
+ //Delete a scheduled process
+ clientResponse = context.service
+ .path("api/entities/delete/process/" + context.processName)
+ .header("Cookie", context.getAuthenticationToken())
+ .accept(MediaType.TEXT_XML)
+ .delete(ClientResponse.class);
+ context.assertSuccessful(clientResponse);
+ }
+
public void testGetEntityDefinition() throws Exception {
TestContext context = newContext();
ClientResponse response;
[3/3] git commit: FALCON-651 Typos in Falcon Documentation.
Contributed by Ajay Yadav
Posted by ve...@apache.org.
FALCON-651 Typos in Falcon Documentation. Contributed by Ajay Yadav
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/4da62d1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/4da62d1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/4da62d1c
Branch: refs/heads/master
Commit: 4da62d1c52b1a4bc7f866b07329235b149bbe8ca
Parents: 6150b8a
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Wed Sep 24 11:25:54 2014 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Wed Sep 24 11:25:54 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +
docs/src/site/twiki/FalconCLI.twiki | 7 +-
docs/src/site/twiki/FalconDocumentation.twiki | 2 +-
.../src/site/twiki/restapi/InstanceParams.twiki | 84 ++++++++++++++++++++
4 files changed, 93 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/4da62d1c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index af00fe3..b8ac906 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -33,6 +33,8 @@ Trunk (Unreleased)
FALCON-263 API to get workflow parameters. (pavan kumar kolamuri via Shwetha GS)
IMPROVEMENTS
+ FALCON-651 Typos in Falcon Documentation (Ajay Yadav via Venkatesh Seetharam)
+
FALCON-576 Update Installation notes for Mac OS (Ajay Yadav via
Venkatesh Seetharam)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/4da62d1c/docs/src/site/twiki/FalconCLI.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/FalconCLI.twiki b/docs/src/site/twiki/FalconCLI.twiki
index b61feeb..1d536a1 100644
--- a/docs/src/site/twiki/FalconCLI.twiki
+++ b/docs/src/site/twiki/FalconCLI.twiki
@@ -75,7 +75,12 @@ Update operation allows an already submitted/scheduled entity to be updated. Clu
not allowed.
Usage:
-$FALCON_HOME/bin/falcon entity -type [feed|process] -name <<name>> -update [-effective <<effective time>>]
+$FALCON_HOME/bin/falcon entity -type [feed|process] -name <<name>> -update [-effective <<effective time>>] -file
+<<path_to_file>>
+
+Example:
+$FALCON_HOME/bin/falcon entity -type process -name HourlyReportsGenerator -update -file /process/definition.xml
+
---+++Status
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/4da62d1c/docs/src/site/twiki/FalconDocumentation.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/FalconDocumentation.twiki b/docs/src/site/twiki/FalconDocumentation.twiki
index bff32c6..efa9efd 100644
--- a/docs/src/site/twiki/FalconDocumentation.twiki
+++ b/docs/src/site/twiki/FalconDocumentation.twiki
@@ -258,7 +258,7 @@ With the integration of Hive, Falcon also provides retention for tables in Hive
---+++ Example:
If retention period is 10 hours, and the policy kicks in at time 't', the data retained by system is essentially the
-one falling in between [t-10h,t]. Any data in the boundaries [-�,t-10h) and (t,�] is removed from the system.
+one in range [t-10h, t]. Any data before t-10h and after t is removed from the system.
The 'action' attribute can attain values of DELETE/ARCHIVE. Based upon the tag value, the data eligible for removal is either
deleted/archived.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/4da62d1c/docs/src/site/twiki/restapi/InstanceParams.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/restapi/InstanceParams.twiki b/docs/src/site/twiki/restapi/InstanceParams.twiki
new file mode 100644
index 0000000..af8ab62
--- /dev/null
+++ b/docs/src/site/twiki/restapi/InstanceParams.twiki
@@ -0,0 +1,84 @@
+---++ GET /api/instance/params/:entity-type/:entity-name
+ * <a href="#Description">Description</a>
+ * <a href="#Parameters">Parameters</a>
+ * <a href="#Results">Results</a>
+ * <a href="#Examples">Examples</a>
+
+---++ Description
+Get a list of instances along with the information for workflow params.
+
+---++ Parameters
+ * :entity-type Valid options are cluster, feed or process.
+ * :entity-name Name of the entity.
+ * colo <optional param> Colo on which the query should be run.
+ * lifecycle <optional param> Valid lifecycles for feed are Eviction/Replication(default) and for process is Execution(default).
+ * filterBy <optional param> Filter results by list of field:value pairs. Example: filterBy=CLUSTER:primary-cluster
+ * Supported filter fields are CLUSTER, SOURCECLUSTER, STARTEDAFTER.
+ * Query will do an AND among filterBy fields.
+ * orderBy <optional param> Field by which results should be ordered.
+ * Supports ordering by "status","startTime","endTime","cluster".
+ * offset <optional param> Show results from the offset, used for pagination. Defaults to 0.
+ * numResults <optional param> Number of results to show per request, used for pagination. Only integers > 0 are valid, Default is 10.
+
+
+---++ Results
+List of instances currently running.
+
+---++ Examples
+---+++ Rest Call
+<verbatim>
+GET http://localhost:15000/api/instance/running/process/SampleProcess?colo=*
+</verbatim>
+---+++ Result
+<verbatim>
+{
+ "instances": [
+ {
+ "startTime": "2013-10-21T14:39:28-07:00",
+ "cluster": "primary-cluster",
+ "status": "RUNNING",
+ "instance": "2012-04-03T06:00Z"
+ }
+ ],
+ "requestId": "default\/12e9a7d4-3b4f-4a76-b471-c8f3786a62a0\n",
+ "message": "default\/Running Instances\n",
+ "status": "SUCCEEDED"
+}
+</verbatim>
+
+
+---+++ Rest Call
+<verbatim>
+GET http://localhost:15000/api/instance/running/process/SampleProcess?colo=*&start=2012-04-03T07:00Z&filterBy=CLUSTER:primary-cluster&orderBy=startTime&offset=2&numResults=2
+</verbatim>
+---+++ Result
+<verbatim>
+{
+ "instances": [
+ {
+ "details": "",
+ "endTime": "2013-10-21T14:40:26-07:00",
+ "startTime": "2013-10-21T14:39:56-07:00",
+ "cluster": "primary-cluster",
+ "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933395-oozie-rgau-W",
+ "status": "RUNNING",
+ "instance": "2012-04-03T07:00Z"
+ },
+ {
+ "details": "",
+ "endTime": "2013-10-21T14:42:27-07:00",
+ "startTime": "2013-10-21T14:41:57-07:00",
+ "cluster": "primary-cluster",
+ "logFile": "http:\/\/localhost:11000\/oozie?job=0000070-131021115933397-oozie-rgau-W",
+ "status": "RUNNING",
+ "instance": "2012-04-03T08:00Z"
+ },
+ ],
+
+ "requestId": "default\/e15bb378-d09f-4911-9df2-5334a45153d2\n",
+ "message": "default\/STATUS\n",
+ "status": "SUCCEEDED"
+}
+</verbatim>
+
+
[2/3] git commit: FALCON-576 Update Installation notes for Mac OS.
Contributed by Ajay Yadav
Posted by ve...@apache.org.
FALCON-576 Update Installation notes for Mac OS. Contributed by Ajay Yadav
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/6150b8ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/6150b8ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/6150b8ab
Branch: refs/heads/master
Commit: 6150b8abfaeb3cecd8f3568a7ea9e6bdf6935d9f
Parents: dfdb21e
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Wed Sep 24 11:25:21 2014 -0700
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Wed Sep 24 11:25:21 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 3 +++
docs/src/site/twiki/InstallationSteps.twiki | 12 ++++++++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6150b8ab/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f19ebef..af00fe3 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -33,6 +33,9 @@ Trunk (Unreleased)
FALCON-263 API to get workflow parameters. (pavan kumar kolamuri via Shwetha GS)
IMPROVEMENTS
+ FALCON-576 Update Installation notes for Mac OS (Ajay Yadav via
+ Venkatesh Seetharam)
+
FALCON-666 Add Alerts for unrecoverable failures (Venkatesh Seetharam)
FALCON-665 Handle message consumption failures in JMSMessageConsumer
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6150b8ab/docs/src/site/twiki/InstallationSteps.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki
index 477f6d3..a0323c1 100644
--- a/docs/src/site/twiki/InstallationSteps.twiki
+++ b/docs/src/site/twiki/InstallationSteps.twiki
@@ -160,6 +160,18 @@ In addition you can set any other environment variables you might need. This fil
#export FALCON_EXPANDED_WEBAPP_DIR=
</verbatim>
+
+*NOTE for Mac OS users*
+<verbatim>
+If you are using a Mac OS, you will need to configure the FALCON_SERVER_OPTS (explained above).
+
+In {package dir}/conf/falcon-env.sh uncomment the following line
+#export FALCON_SERVER_OPTS=
+
+and change it to look as below
+export FALCON_SERVER_OPTS="-Djava.awt.headless=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc="
+</verbatim>
+
*Starting Falcon Server*
<verbatim>
bin/falcon-start [-port <port>]