falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pall...@apache.org
Subject falcon git commit: FALCON-1793 feed element action="archive" is submittable via command line tool falcon
Date Wed, 03 Feb 2016 04:13:16 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 84fb86180 -> b03da47a0


FALCON-1793 feed element action="archive" is submittable via command line tool falcon

Changed as per review comments.

$  bin/falcon entity -submit -type feed -file examples/entity/filesystem/out-feed.xml
ERROR: Bad Request;javax.xml.bind.UnmarshalException
 - with linked exception:
[org.xml.sax.SAXParseException; lineNumber: 29; columnNumber: 59; cvc-enumeration-valid: Value
'archive' is not facet-valid with respect to enumeration '[delete]'. It must be a value from
the enumeration.]

[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Apache Falcon ...................................... SUCCESS [  2.459 s]
[INFO] Apache Falcon UI ................................... SUCCESS [  8.276 s]
[INFO] Build Tools ........................................ SUCCESS [  5.683 s]
[INFO] Apache Falcon Java client .......................... SUCCESS [ 13.753 s]
[INFO] Apache Falcon CLI client ........................... SUCCESS [  4.490 s]
[INFO] Apache Falcon Metrics .............................. SUCCESS [  6.040 s]
[INFO] Apache Falcon Hadoop Dependencies .................. SUCCESS [  3.137 s]
[INFO] Apache Falcon Test Utility ......................... SUCCESS [  4.829 s]
[INFO] Apache Falcon Commons .............................. SUCCESS [02:52 min]
[INFO] Apache Falcon Oozie EL Extension ................... SUCCESS [  7.907 s]
[INFO] Apache Falcon Embedded Hadoop - Test Cluster ....... SUCCESS [ 28.412 s]
[INFO] Apache Falcon Sharelib Hive - Test Cluster ......... SUCCESS [  3.311 s]
[INFO] Apache Falcon Sharelib Pig - Test Cluster .......... SUCCESS [  0.800 s]
[INFO] Apache Falcon Sharelib Hcatalog - Test Cluster ..... SUCCESS [  2.140 s]
[INFO] Apache Falcon Sharelib Oozie - Test Cluster ........ SUCCESS [  0.168 s]
[INFO] Apache Falcon Test Tools - Test Cluster ............ SUCCESS [  0.115 s]
[INFO] Apache Falcon Messaging ............................ SUCCESS [ 21.885 s]
[INFO] Apache Falcon LIfecycle Module ..................... SUCCESS [  7.531 s]
[INFO] Apache Falcon Oozie Adaptor ........................ SUCCESS [01:08 min]
[INFO] Apache Falcon Scheduler ............................ SUCCESS [01:25 min]
[INFO] Apache Falcon Acquisition .......................... SUCCESS [  1.062 s]
[INFO] Apache Falcon Distcp Replication ................... SUCCESS [  8.399 s]
[INFO] Apache Falcon Retention ............................ SUCCESS [ 13.447 s]
[INFO] Apache Falcon Archival ............................. SUCCESS [  0.505 s]
[INFO] Apache Falcon Rerun ................................ SUCCESS [ 15.544 s]
[INFO] Apache Falcon Prism ................................ SUCCESS [01:34 min]
[INFO] falcon-unit ........................................ SUCCESS [02:48 min]
[INFO] Apache Falcon Web Application ...................... SUCCESS [07:42 min]
[INFO] Apache Falcon Documentation ........................ SUCCESS [  6.900 s]
[INFO] Apache Falcon Distro ............................... SUCCESS [04:27 min]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 24:48 min
[INFO] Finished at: 2016-02-03T01:55:36+05:30
[INFO] Final Memory: 719M/2208M
[INFO] ------------------------------------------------------------------------

Author: Deepak Kumar Barr <deepak.barr@gmail.com>

Reviewers: Pallavi Rao <pallavi.rao@inmobi.com>, Ajay Yadava <ajaynsit@gmail.com>

Closes #23 from deepakbarr/falcon-1793-2


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

Branch: refs/heads/master
Commit: b03da47a09aa64c6fcb681a26b5a9ccb6fc11bd4
Parents: 84fb861
Author: Deepak Kumar Barr <deepak.barr@gmail.com>
Authored: Wed Feb 3 09:42:55 2016 +0530
Committer: Pallavi Rao <pallavi.rao@inmobi.com>
Committed: Wed Feb 3 09:42:55 2016 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                   | 2 ++
 client/src/main/resources/feed-0.1.xsd                        | 7 +------
 .../org/apache/falcon/entity/parser/FeedEntityParserTest.java | 2 +-
 common/src/test/resources/config/feed/feed-0.1.xml            | 2 +-
 common/src/test/resources/config/feed/feed-0.2.xml            | 2 +-
 common/src/test/resources/config/feed/feed-0.3.xml            | 2 +-
 common/src/test/resources/config/feed/feed-0.4.xml            | 2 +-
 common/src/test/resources/config/feed/feed-tags-0.1.xml       | 2 +-
 common/src/test/resources/config/feed/hive-table-feed-out.xml | 2 +-
 common/src/test/resources/config/feed/hive-table-feed.xml     | 2 +-
 common/src/test/resources/config/feed/invalid-feed.xml        | 2 +-
 .../config/feed/table-with-multiple-sources-feed.xml          | 2 +-
 oozie/src/test/resources/config/feed/feed-0.1.xml             | 2 +-
 oozie/src/test/resources/config/feed/hive-table-feed-out.xml  | 2 +-
 oozie/src/test/resources/config/feed/hive-table-feed.xml      | 2 +-
 15 files changed, 16 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0028c0f..4b5d368 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -143,6 +143,8 @@ Proposed Release Version: 0.9
   OPTIMIZATIONS
 
   BUG FIXES
+    FALCON-1793 feed element action="archive" is submittable via command line tool falcon
(Deepak Barr)
+
     FALCON-1782 Client returns FalconWebException instead of the expected error message(Praveed
Adlakha via Ajay Yadava)
 
     FALCON-1747 Falcon instance status listing is throwing error message (Peeyush Bishnoi)
   

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/client/src/main/resources/feed-0.1.xsd
----------------------------------------------------------------------
diff --git a/client/src/main/resources/feed-0.1.xsd b/client/src/main/resources/feed-0.1.xsd
index 92a3efc..77e8663 100644
--- a/client/src/main/resources/feed-0.1.xsd
+++ b/client/src/main/resources/feed-0.1.xsd
@@ -346,15 +346,10 @@
                 <xs:documentation>
                     action type specifies the action that should be taken on a feed
                     when the retention period of a feed expires on a cluster,
-                    the valid
-                    actions are
-                    archive, delete, chown and chmod.
+                    the only valid action is delete.
                 </xs:documentation>
             </xs:annotation>
-            <xs:enumeration value="archive"/>
             <xs:enumeration value="delete"/>
-            <xs:enumeration value="chown"/>
-            <xs:enumeration value="chmod"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:complexType name="lifecycle">

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
b/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
index 83e2550..382a8c4 100644
--- a/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
+++ b/common/src/test/java/org/apache/falcon/entity/parser/FeedEntityParserTest.java
@@ -150,7 +150,7 @@ public class FeedEntityParserTest extends AbstractTestBase {
         assertEquals(SchemaHelper.formatDateUTC(feed.getClusters().getClusters().get(1).getValidity()
                 .getEnd()), "2011-12-31T00:00Z");
         assertEquals(feed.getClusters().getClusters().get(1).getRetention()
-                .getAction(), ActionType.ARCHIVE);
+                .getAction(), ActionType.DELETE);
         assertEquals(feed.getClusters().getClusters().get(1).getRetention()
                 .getLimit().toString(), "hours(6)");
 

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/feed-0.1.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/feed-0.1.xml b/common/src/test/resources/config/feed/feed-0.1.xml
index d223d5d..cbe50c6 100644
--- a/common/src/test/resources/config/feed/feed-0.1.xml
+++ b/common/src/test/resources/config/feed/feed-0.1.xml
@@ -47,7 +47,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/feed-0.2.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/feed-0.2.xml b/common/src/test/resources/config/feed/feed-0.2.xml
index c067c7b..ac137fc 100644
--- a/common/src/test/resources/config/feed/feed-0.2.xml
+++ b/common/src/test/resources/config/feed/feed-0.2.xml
@@ -42,7 +42,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
             <locations>
                 <location type="data" path="/backupCluster/projects/falcon/clicks"/>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/feed-0.3.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/feed-0.3.xml b/common/src/test/resources/config/feed/feed-0.3.xml
index fc3ea06..e6d3e01 100644
--- a/common/src/test/resources/config/feed/feed-0.3.xml
+++ b/common/src/test/resources/config/feed/feed-0.3.xml
@@ -57,7 +57,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/feed-0.4.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/feed-0.4.xml b/common/src/test/resources/config/feed/feed-0.4.xml
index 3983c59..c88fb14 100644
--- a/common/src/test/resources/config/feed/feed-0.4.xml
+++ b/common/src/test/resources/config/feed/feed-0.4.xml
@@ -47,7 +47,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/feed-tags-0.1.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/feed-tags-0.1.xml b/common/src/test/resources/config/feed/feed-tags-0.1.xml
index fb9161d..644f0f3 100644
--- a/common/src/test/resources/config/feed/feed-tags-0.1.xml
+++ b/common/src/test/resources/config/feed/feed-tags-0.1.xml
@@ -44,7 +44,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/hive-table-feed-out.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/hive-table-feed-out.xml b/common/src/test/resources/config/feed/hive-table-feed-out.xml
index b814354..d13e538 100644
--- a/common/src/test/resources/config/feed/hive-table-feed-out.xml
+++ b/common/src/test/resources/config/feed/hive-table-feed-out.xml
@@ -32,7 +32,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
             <table uri="catalog:backupCluster:clicks-summary#ds=${YEAR}-${MONTH}-${DAY}-${HOUR}"
/>
         </cluster>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/hive-table-feed.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/hive-table-feed.xml b/common/src/test/resources/config/feed/hive-table-feed.xml
index 80d0dae..7be20ce 100644
--- a/common/src/test/resources/config/feed/hive-table-feed.xml
+++ b/common/src/test/resources/config/feed/hive-table-feed.xml
@@ -30,7 +30,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/invalid-feed.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/invalid-feed.xml b/common/src/test/resources/config/feed/invalid-feed.xml
index 7320efc..1dcc14a 100644
--- a/common/src/test/resources/config/feed/invalid-feed.xml
+++ b/common/src/test/resources/config/feed/invalid-feed.xml
@@ -36,7 +36,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml
----------------------------------------------------------------------
diff --git a/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml b/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml
index 319359f..0c8eba9 100644
--- a/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml
+++ b/common/src/test/resources/config/feed/table-with-multiple-sources-feed.xml
@@ -41,7 +41,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/oozie/src/test/resources/config/feed/feed-0.1.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/config/feed/feed-0.1.xml b/oozie/src/test/resources/config/feed/feed-0.1.xml
index 4317974..d107d4f 100644
--- a/oozie/src/test/resources/config/feed/feed-0.1.xml
+++ b/oozie/src/test/resources/config/feed/feed-0.1.xml
@@ -42,7 +42,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2099-12-31T23:59Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/oozie/src/test/resources/config/feed/hive-table-feed-out.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/config/feed/hive-table-feed-out.xml b/oozie/src/test/resources/config/feed/hive-table-feed-out.xml
index 24a7bb3..8b738ed 100644
--- a/oozie/src/test/resources/config/feed/hive-table-feed-out.xml
+++ b/oozie/src/test/resources/config/feed/hive-table-feed-out.xml
@@ -31,7 +31,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>

http://git-wip-us.apache.org/repos/asf/falcon/blob/b03da47a/oozie/src/test/resources/config/feed/hive-table-feed.xml
----------------------------------------------------------------------
diff --git a/oozie/src/test/resources/config/feed/hive-table-feed.xml b/oozie/src/test/resources/config/feed/hive-table-feed.xml
index 07e2ac4..6b2f8fb 100644
--- a/oozie/src/test/resources/config/feed/hive-table-feed.xml
+++ b/oozie/src/test/resources/config/feed/hive-table-feed.xml
@@ -31,7 +31,7 @@
         </cluster>
         <cluster name="backupCluster" type="target">
             <validity start="2011-11-01T00:00Z" end="2011-12-31T00:00Z"/>
-            <retention limit="hours(6)" action="archive"/>
+            <retention limit="hours(6)" action="delete"/>
             <!-- Limit can be in Time or Instances 100, Action ENUM DELETE,ARCHIVE -->
         </cluster>
     </clusters>


Mime
View raw message