You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2014/11/05 12:42:53 UTC
[1/2] git commit: FALCON-855 Fix validation in
ProcessInstanceKillsTest#testProcessInstanceKillStartAndEndSame. Contributed
by Ruslan Ostafiychuk
Repository: incubator-falcon
Updated Branches:
refs/heads/master 34533f285 -> 437109646
FALCON-855 Fix validation in ProcessInstanceKillsTest#testProcessInstanceKillStartAndEndSame. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/077f34f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/077f34f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/077f34f8
Branch: refs/heads/master
Commit: 077f34f839f67e629682bb3a566875c6d9322d21
Parents: 34533f2
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Wed Nov 5 13:35:58 2014 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Wed Nov 5 13:35:58 2014 +0200
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 3 +++
.../apache/falcon/regression/ProcessInstanceKillsTest.java | 7 +++----
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/077f34f8/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 4ef0c24..8b88cce 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -129,6 +129,9 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-855 Fix validation in ProcessInstanceKillsTest#testProcessInstanceKillStartAndEndSame
+ (Ruslan Ostafiychuk)
+
FALCON-860 Add label-types for labels added as part of EntitySummaryTest (Raghav Kumar Gautam
via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/077f34f8/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
index aa9773c..17ffa64 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
@@ -112,9 +112,8 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
}
/**
- * Schedule process. Check that in case when -start and -end parameters are equal -kill
- * action results in the same way as in case with only -start parameter is used. Only one
- * instance should be killed. This test will fail because of https://issues.apache.org/jira/browse/FALCON-704
+ * Schedule process. Check that in case when -start and -end parameters are equal zero
+ * instances are killed.
*
* @throws Exception
*/
@@ -132,7 +131,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 5);
InstancesResult r = prism.getProcessHelper()
.getProcessInstanceKill(processName, "?start=2010-01-02T00:03Z&end=2010-01-02T00:03Z");
- InstanceUtil.validateResponse(r, 1, 0, 0, 0, 1);
+ Assert.assertNull(r.getInstances(), "There should be zero instances killed");
}
/**
[2/2] git commit: FALCON-856 Handle JsonSyntaxException in hitUrl.
Contributed by Ruslan Ostafiychuk
Posted by ro...@apache.org.
FALCON-856 Handle JsonSyntaxException in hitUrl. Contributed by Ruslan Ostafiychuk
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/43710964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/43710964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/43710964
Branch: refs/heads/master
Commit: 4371096463d0d56905618c3bff36b6ab20b500b4
Parents: 077f34f
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Wed Nov 5 13:39:49 2014 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Wed Nov 5 13:42:06 2014 +0200
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/core/util/InstanceUtil.java | 13 ++++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/43710964/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 8b88cce..2854075 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -27,6 +27,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-856 Handle JsonSyntaxException in hitUrl (Ruslan Ostafiychuk)
+
FALCON-847 Issue with login from keytab in merlin (Raghav Kumar Gautam)
FALCON-835 Tag authorization tests (Raghav Kumar Gautam)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/43710964/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
index 73cf8c8..b70e112 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/InstanceUtil.java
@@ -22,7 +22,7 @@ import com.google.gson.GsonBuilder;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
+import com.google.gson.JsonSyntaxException;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
@@ -174,14 +174,17 @@ public final class InstanceUtil {
r.setStatusCode(400);
return r;
}
- r = new GsonBuilder().registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
+ try {
+ r = new GsonBuilder().registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
@Override
- public Date deserialize(JsonElement json, Type t, JsonDeserializationContext c)
- throws JsonParseException {
+ public Date deserialize(JsonElement json, Type t, JsonDeserializationContext c) {
return new DateTime(json.getAsString()).toDate();
}
}).create().fromJson(jsonString,
- url.contains("/summary/") ? InstancesSummaryResult.class : InstancesResult.class);
+ url.contains("/summary/") ? InstancesSummaryResult.class : InstancesResult.class);
+ } catch (JsonSyntaxException e) {
+ Assert.fail("Not a valid json:\n" + jsonString);
+ }
LOGGER.info("r.getMessage(): " + r.getMessage());
LOGGER.info("r.getStatusCode(): " + r.getStatusCode());
LOGGER.info("r.getStatus() " + r.getStatus());