You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by aj...@apache.org on 2015/09/04 12:10:51 UTC
[1/2] falcon git commit: FALCON-1421 checkColos should be a no-op for
embedded mode. Contributed by Venkat Ranganathan.
Repository: falcon
Updated Branches:
refs/heads/master 916e30ff3 -> 5ae9f314e
FALCON-1421 checkColos should be a no-op for embedded mode. Contributed by Venkat Ranganathan.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f0cdb34a
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f0cdb34a
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f0cdb34a
Branch: refs/heads/master
Commit: f0cdb34a3fb7274490df17341a3b3c5c386f5fbe
Parents: 916e30f
Author: Ajay Yadava <aj...@gmail.com>
Authored: Fri Sep 4 15:12:40 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Fri Sep 4 15:12:40 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../java/org/apache/falcon/resource/AbstractEntityManager.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/f0cdb34a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45674b3..c5b775d 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-1421 checkColos should be a no-op for embedded mode(Venkat Ranganathan via Ajay Yadava)
Branch: 0.7 (Proposed Release Version: 0.7)
http://git-wip-us.apache.org/repos/asf/falcon/blob/f0cdb34a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
index 78964dd..9700baa 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
@@ -101,6 +101,9 @@ public abstract class AbstractEntityManager {
}
protected void checkColo(String colo) {
+ if (DeploymentUtil.isEmbeddedMode()) {
+ return;
+ }
if (StringUtils.isNotEmpty(colo) && !colo.equals("*")) {
if (!DeploymentUtil.getCurrentColo().equals(colo)) {
throw FalconWebException.newException(
[2/2] falcon git commit: FALCON-1413 Filter By throws wrong error in
case of wrong argument being passed. Contributed by Narayan Periwal.
Posted by aj...@apache.org.
FALCON-1413 Filter By throws wrong error in case of wrong argument being passed. Contributed by Narayan Periwal.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/5ae9f314
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/5ae9f314
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/5ae9f314
Branch: refs/heads/master
Commit: 5ae9f314e344d1a31a76fd694f5336f93d63036a
Parents: f0cdb34
Author: Ajay Yadava <aj...@gmail.com>
Authored: Fri Sep 4 15:23:19 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Fri Sep 4 15:23:19 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
client/src/main/java/org/apache/falcon/cli/FalconCLI.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/5ae9f314/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c5b775d..ea11c64 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,8 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-1413 Filter By throws wrong error in case of wrong argument being passed(Narayan Periwal via Ajay Yadava)
+
FALCON-1421 checkColos should be a no-op for embedded mode(Venkat Ranganathan via Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/5ae9f314/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
index 11dfe72..d4da302 100644
--- a/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
+++ b/client/src/main/java/org/apache/falcon/cli/FalconCLI.java
@@ -604,10 +604,10 @@ public class FalconCLI {
}else if (filterType.equals("summary")) {
InstancesSummaryResult.InstanceSummaryFilterFields.valueOf(tempKeyVal[0].toUpperCase());
} else {
- throw new IllegalArgumentException("Invalid API call");
+ throw new IllegalArgumentException("Invalid API call: filterType is not valid");
}
} catch (IllegalArgumentException ie) {
- throw new FalconCLIException("Invalid filterBy argument : " + FILTER_BY_OPT);
+ throw new FalconCLIException("Invalid filterBy argument : " + tempKeyVal[0] + " in : " + s);
}
}
}