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-2238 FALCON-2239 FALCON-2240 bug fixes
Date Tue, 10 Jan 2017 05:45:05 GMT
Repository: falcon
Updated Branches:
  refs/heads/master 860866531 -> ecf9aee3e


FALCON-2238 FALCON-2239 FALCON-2240 bug fixes

Author: Pracheer Agarwal <pracheer.agarwal@inmobi.com>
Author: sandeep <sandysmdl@gmail.com>
Author: Pracheer Agarwal <pracheeragarwal@gmail.com>
Author: Pracheer Agarwal <pr@im2216-x0.corp.inmobi.com>

Reviewers: @sandeepSamudrala, @pallavi-rao

Closes #338 from PracheerAgarwal/bugs and squashes the following commits:

0a4355e [sandeep] bug fixes
c7eaaed [sandeep] FALCON-2238,FALCON-2239,FALCON-2240 bug fixes
a93d71a [Pracheer Agarwal] Merge branch 'master' of https://github.com/PracheerAgarwal/falcon
e3728d5 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon
066c8e2 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon
b20f044 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon
7f572a1 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon
46042fd [Pracheer Agarwal] Merge branch 'master' of https://github.com/PracheerAgarwal/falcon
daa3ffc [Pracheer Agarwal] FALCON-2225 extension owner added for trusted extensions
622cae4 [Pracheer Agarwal] FALCON-2225 extension owner added for trusted extensions


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

Branch: refs/heads/master
Commit: ecf9aee3e61815877f3954455158dda53c5c1bf7
Parents: 8608665
Author: Pracheer Agarwal <pracheer.agarwal@inmobi.com>
Authored: Tue Jan 10 11:14:51 2017 +0530
Committer: Pallavi Rao <pallavi.rao@inmobi.com>
Committed: Tue Jan 10 11:14:51 2017 +0530

----------------------------------------------------------------------
 .../java/org/apache/falcon/cli/FalconExtensionCLI.java  |  4 ++++
 .../org/apache/falcon/client/FalconCLIConstants.java    |  2 ++
 .../java/org/apache/falcon/client/FalconClient.java     |  8 ++++----
 .../falcon/resource/proxy/ExtensionManagerProxy.java    | 12 ++++++------
 4 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/ecf9aee3/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java
----------------------------------------------------------------------
diff --git a/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java b/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java
index 60578d0..d1f2e41 100644
--- a/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java
+++ b/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java
@@ -200,6 +200,8 @@ public class FalconExtensionCLI extends FalconCLI{
         Option suspend = new Option(FalconCLIConstants.SUSPEND_OPT, false, "Suspend an extension
job");
         Option resume = new Option(FalconCLIConstants.RESUME_OPT, false, "Resume an extension
job");
         Option delete = new Option(FalconCLIConstants.DELETE_OPT, false, "Delete an extension
job");
+        Option enable = new Option(FalconCLIConstants.ENABLE_OPT, false, "Enable an extension");
+        Option disable = new Option(FalconCLIConstants.DISABLE_OPT, false, "Disable an extension");
         Option unregister = new Option(FalconCLIConstants.UREGISTER, false, "Un-register
an extension. This will make"
                 + " the extension unavailable for instantiation");
         Option detail = new Option(FalconCLIConstants.DETAIL, false, "Show details of a given
extension");
@@ -225,6 +227,8 @@ public class FalconExtensionCLI extends FalconCLI{
         group.addOption(unregister);
         group.addOption(detail);
         group.addOption(register);
+        group.addOption(enable);
+        group.addOption(disable);
         extensionOptions.addOptionGroup(group);
 
         Option url = new Option(FalconCLIConstants.URL_OPTION, true, "Falcon URL");

http://git-wip-us.apache.org/repos/asf/falcon/blob/ecf9aee3/client/src/main/java/org/apache/falcon/client/FalconCLIConstants.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/client/FalconCLIConstants.java b/client/src/main/java/org/apache/falcon/client/FalconCLIConstants.java
index 26e8937..d437d47 100644
--- a/client/src/main/java/org/apache/falcon/client/FalconCLIConstants.java
+++ b/client/src/main/java/org/apache/falcon/client/FalconCLIConstants.java
@@ -43,6 +43,8 @@ public final class FalconCLIConstants {
     public static final String UPDATE_OPT = "update";
     public static final String UPDATE_CLUSTER_DEPENDENTS_OPT = "updateClusterDependents";
     public static final String DELETE_OPT = "delete";
+    public static final String ENABLE_OPT = "enable";
+    public static final String DISABLE_OPT = "disable";
     public static final String SCHEDULE_OPT = "schedule";
     public static final String CURRENT_COLO = "current.colo";
     public static final String CLIENT_PROPERTIES = "/client.properties";

http://git-wip-us.apache.org/repos/asf/falcon/blob/ecf9aee3/client/src/main/java/org/apache/falcon/client/FalconClient.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/client/FalconClient.java b/client/src/main/java/org/apache/falcon/client/FalconClient.java
index cf457ea..a5fb54c 100644
--- a/client/src/main/java/org/apache/falcon/client/FalconClient.java
+++ b/client/src/main/java/org/apache/falcon/client/FalconClient.java
@@ -341,8 +341,8 @@ public class FalconClient extends AbstractFalconClient {
     protected static enum ExtensionOperations {
 
         ENUMERATE("api/extension/enumerate/", HttpMethod.GET, MediaType.TEXT_XML),
-        DESCRIBE("api/extension/describe/", HttpMethod.GET, MediaType.TEXT_PLAIN),
-        DEFINITION("api/extension/definition", HttpMethod.GET, MediaType.APPLICATION_JSON),
+        DESCRIBE("api/extension/describe/", HttpMethod.GET, MediaType.TEXT_XML),
+        DEFINITION("api/extension/definition", HttpMethod.GET, MediaType.TEXT_XML),
         LIST("api/extension/list", HttpMethod.GET, MediaType.APPLICATION_JSON),
         INSTANCES("api/extension/instances", HttpMethod.GET, MediaType.APPLICATION_JSON),
         SUBMIT("api/extension/submit", HttpMethod.POST, MediaType.TEXT_XML),
@@ -354,8 +354,8 @@ public class FalconClient extends AbstractFalconClient {
         RESUME("api/extension/resume", HttpMethod.POST, MediaType.TEXT_XML),
         DELETE("api/extension/delete", HttpMethod.POST, MediaType.TEXT_XML),
         UNREGISTER("api/extension/unregister/", HttpMethod.POST, MediaType.TEXT_XML),
-        DETAIL("api/extension/detail/", HttpMethod.GET, MediaType.APPLICATION_JSON),
-        JOB_DETAILS("api/extension/extensionJobDetails/", HttpMethod.GET, MediaType.APPLICATION_JSON),
+        DETAIL("api/extension/detail/", HttpMethod.GET, MediaType.TEXT_XML),
+        JOB_DETAILS("api/extension/extensionJobDetails/", HttpMethod.GET, MediaType.TEXT_XML),
         REGISTER("api/extension/register/", HttpMethod.POST, MediaType.TEXT_XML),
         ENABLE("api/extension/enable", HttpMethod.POST, MediaType.TEXT_XML),
         DISABLE("api/extension/disable", HttpMethod.POST, MediaType.TEXT_XML);

http://git-wip-us.apache.org/repos/asf/falcon/blob/ecf9aee3/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java
b/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java
index 8733170..6e0b02f 100644
--- a/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java
+++ b/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java
@@ -641,7 +641,7 @@ public class ExtensionManagerProxy extends AbstractExtensionManager {
 
     @GET
     @Path("describe/{extension-name}")
-    @Produces(MediaType.TEXT_PLAIN)
+    @Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_XML})
     public APIResult getExtensionDescription(
             @PathParam("extension-name") String extensionName) {
         checkIfExtensionServiceIsEnabled();
@@ -655,7 +655,7 @@ public class ExtensionManagerProxy extends AbstractExtensionManager {
 
     @GET
     @Path("detail/{extension-name}")
-    @Produces({MediaType.APPLICATION_JSON})
+    @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_XML, MediaType.TEXT_PLAIN})
     public APIResult getDetail(@PathParam("extension-name") String extensionName) {
         checkIfExtensionServiceIsEnabled();
         validateExtensionName(extensionName);
@@ -668,7 +668,7 @@ public class ExtensionManagerProxy extends AbstractExtensionManager {
 
     @GET
     @Path("extensionJobDetails/{job-name}")
-    @Produces({MediaType.APPLICATION_JSON})
+    @Produces({MediaType.APPLICATION_JSON, MediaType.TEXT_XML, MediaType.TEXT_PLAIN})
     public APIResult getExtensionJobDetail(@PathParam("job-name") String jobName) {
         checkIfExtensionServiceIsEnabled();
         try {
@@ -710,7 +710,7 @@ public class ExtensionManagerProxy extends AbstractExtensionManager {
 
     @GET
     @Path("definition/{extension-name}")
-    @Produces({MediaType.APPLICATION_JSON})
+    @Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_XML})
     public APIResult getExtensionDefinition(
             @PathParam("extension-name") String extensionName) {
         checkIfExtensionServiceIsEnabled();
@@ -725,7 +725,7 @@ public class ExtensionManagerProxy extends AbstractExtensionManager {
     @POST
     @Path("disable/{extension-name}")
     @Consumes({MediaType.TEXT_XML, MediaType.TEXT_PLAIN})
-    @Produces(MediaType.TEXT_PLAIN)
+    @Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_XML})
     public APIResult disableExtension(
             @PathParam("extension-name") String extensionName) {
         checkIfExtensionServiceIsEnabled();
@@ -740,7 +740,7 @@ public class ExtensionManagerProxy extends AbstractExtensionManager {
     @POST
     @Path("enable/{extension-name}")
     @Consumes({MediaType.TEXT_XML, MediaType.TEXT_PLAIN})
-    @Produces(MediaType.TEXT_PLAIN)
+    @Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_XML})
     public APIResult enableExtension(
             @PathParam("extension-name") String extensionName) {
         checkIfExtensionServiceIsEnabled();


Mime
View raw message