Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5BBDB200D36 for ; Mon, 23 Oct 2017 07:52:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5A614160BEF; Mon, 23 Oct 2017 05:52:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4DD62160BF3 for ; Mon, 23 Oct 2017 07:52:41 +0200 (CEST) Received: (qmail 2768 invoked by uid 500); 23 Oct 2017 05:52:40 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 1948 invoked by uid 99); 23 Oct 2017 05:52:39 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Oct 2017 05:52:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4D4FCE007F; Mon, 23 Oct 2017 05:52:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavi@apache.org To: commits@falcon.apache.org Date: Mon, 23 Oct 2017 05:52:37 -0000 Message-Id: <63bafe512f784ab5ba11395a7e77fc5a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/26] falcon git commit: FALCON-2274 Job list in extension archived-at: Mon, 23 Oct 2017 05:52:42 -0000 FALCON-2274 Job list in extension Author: Pracheer Agarwal Author: Pracheer Agarwal Author: Pracheer Agarwal Reviewers: @sandeepSamudrala,@pallavi-rao Closes #358 from PracheerAgarwal/FALCON-2274 and squashes the following commits: a5ac209 [Pracheer Agarwal] review comment changes 9abd11d [Pracheer Agarwal] review comment changes 53a49bd [Pracheer Agarwal] review comment changes 38f901e [Pracheer Agarwal] review comments changes 917d3d5 [Pracheer Agarwal] review comments changes e73e97d [Pracheer Agarwal] FALCON-2274 Job list in extension 0a9c51c [Pracheer Agarwal] FALCON-2274 Job list in extension ab1d136 [Pracheer Agarwal] FALCON-2274 Job list in extension ba60452 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon ed65aa0 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 9ff05df [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 9c2f0a5 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 9cd8c17 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 778c579 [Pracheer Agarwal] Merge branch 'master' of https://github.com/PracheerAgarwal/falcon e39808d [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon a932633 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon fda3b28 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 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 (cherry picked from commit b23b0a9606d2c6e8145442d97b42506314726bc8) Signed-off-by: Pallavi Rao Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/2368bccf Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/2368bccf Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/2368bccf Branch: refs/heads/master Commit: 2368bccf19e164328e507df0b053a7720ac4cf6c Parents: 7fe2c33 Author: Pracheer Agarwal Authored: Thu Feb 9 16:18:33 2017 +0530 Committer: Pallavi Rao Committed: Thu Feb 9 16:18:54 2017 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/falcon/cli/FalconExtensionCLI.java | 5 ++++- .../org/apache/falcon/resource/AbstractExtensionManager.java | 2 +- .../apache/falcon/resource/proxy/ExtensionManagerProxy.java | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/2368bccf/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 293df23..05bc5f8 100644 --- a/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java +++ b/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java @@ -149,9 +149,12 @@ public class FalconExtensionCLI extends FalconCLI{ validateRequiredParameter(jobName, JOB_NAME_OPT); result = client.deleteExtensionJob(jobName, doAsUser).getMessage(); } else if (optionsList.contains(FalconCLIConstants.LIST_OPT)) { + if (extensionName == null) { + extensionName = ""; + } ExtensionJobList jobs = client.getExtensionJobs(extensionName, doAsUser, commandLine.getOptionValue(FalconCLIConstants.SORT_ORDER_OPT)); - result = jobs != null ? jobs.toString() : "No extension job (" + extensionName + ") found."; + result = jobs.getNumJobs() != 0 ? jobs.toString() : "No extension job found."; } else if (optionsList.contains(INSTANCES_OPT)) { validateRequiredParameter(jobName, JOB_NAME_OPT); ExtensionInstanceList instances = client.listExtensionInstance(jobName, doAsUser, http://git-wip-us.apache.org/repos/asf/falcon/blob/2368bccf/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java index a3b6ef1..4ffeb95 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java @@ -111,7 +111,7 @@ public class AbstractExtensionManager extends AbstractSchedulableEntityManager { TreeMap jobAndExtensionNames = new TreeMap<>(); List extensionJobs = null; - if (extensionName != null) { + if (StringUtils.isNoneBlank(extensionName)) { extensionJobs = ExtensionStore.getMetaStore().getJobsForAnExtension(extensionName); } else { extensionJobs = ExtensionStore.getMetaStore().getAllExtensionJobs(); http://git-wip-us.apache.org/repos/asf/falcon/blob/2368bccf/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 8ac5bbd..5652ca4 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 @@ -46,6 +46,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.xml.bind.JAXBException; + +import org.apache.commons.lang.StringUtils; import org.apache.commons.io.IOUtils; import org.apache.falcon.FalconException; import org.apache.falcon.FalconWebException; @@ -91,14 +93,16 @@ public class ExtensionManagerProxy extends AbstractExtensionManager { //SUSPEND CHECKSTYLE CHECK ParameterNumberCheck @GET - @Path("list/{extension-name}") + @Path("list{extension-name : (/[^/]+)?}") @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_JSON}) public ExtensionJobList getExtensionJobs( @PathParam("extension-name") String extensionName, @DefaultValue(ASCENDING_SORT_ORDER) @QueryParam("sortOrder") String sortOrder, @DefaultValue("") @QueryParam("doAs") String doAsUser) { checkIfExtensionServiceIsEnabled(); - getExtensionIfExists(extensionName); + if (StringUtils.isNotBlank(extensionName)) { + getExtensionIfExists(extensionName); + } try { return super.getExtensionJobs(extensionName, sortOrder, doAsUser); } catch (Throwable e) {