You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by su...@apache.org on 2014/10/15 13:06:51 UTC
git commit: FALCON-764. Falcon retry of failed process/feed instances
broken during restart. Contributed By Shaik Idris
Repository: incubator-falcon
Updated Branches:
refs/heads/master 9f722b3d0 -> c6cee1137
FALCON-764. Falcon retry of failed process/feed instances broken during restart. Contributed By Shaik Idris
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/c6cee113
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/c6cee113
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/c6cee113
Branch: refs/heads/master
Commit: c6cee1137e4a80ea868fac7b6b6748fb1e541325
Parents: 9f722b3
Author: Suhas V <su...@inmobi.com>
Authored: Wed Oct 15 16:35:49 2014 +0530
Committer: Suhas V <su...@inmobi.com>
Committed: Wed Oct 15 16:35:49 2014 +0530
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../java/org/apache/falcon/entity/store/ConfigurationStore.java | 3 ++-
.../src/main/java/org/apache/oozie/client/ProxyOozieClient.java | 3 ++-
.../main/java/org/apache/falcon/rerun/queue/InMemoryQueue.java | 4 +++-
4 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c6cee113/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 71a2278..e4354a7 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -117,6 +117,9 @@ Trunk (Unreleased)
OPTIMIZATIONS
BUG FIXES
+ FALCON-764 Falcon retry of failed process/feed instances broken during restart
+ (Shaik Idris via Suhas Vasu)
+
FALCON-800 Falcon lineage is not working (Sowmya Ramesh via Venkatesh Seetharam)
FALCON-792 Integration test EntityManagerPaginationJerseyIT fails
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c6cee113/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java b/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
index bbb2b12..25fc21b 100644
--- a/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
+++ b/common/src/main/java/org/apache/falcon/entity/store/ConfigurationStore.java
@@ -18,6 +18,7 @@
package org.apache.falcon.entity.store;
+import org.apache.commons.codec.CharEncoding;
import org.apache.falcon.FalconException;
import org.apache.falcon.entity.v0.Entity;
import org.apache.falcon.entity.v0.EntityType;
@@ -55,7 +56,7 @@ public final class ConfigurationStore implements FalconService {
private static final Logger LOG = LoggerFactory.getLogger(ConfigurationStore.class);
private static final Logger AUDIT = LoggerFactory.getLogger("AUDIT");
- private static final String UTF_8 = "UTF-8";
+ private static final String UTF_8 = CharEncoding.UTF_8;
private static final ConfigurationStore STORE = new ConfigurationStore();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c6cee113/oozie/src/main/java/org/apache/oozie/client/ProxyOozieClient.java
----------------------------------------------------------------------
diff --git a/oozie/src/main/java/org/apache/oozie/client/ProxyOozieClient.java b/oozie/src/main/java/org/apache/oozie/client/ProxyOozieClient.java
index 3d0e903..c3ab765 100644
--- a/oozie/src/main/java/org/apache/oozie/client/ProxyOozieClient.java
+++ b/oozie/src/main/java/org/apache/oozie/client/ProxyOozieClient.java
@@ -18,6 +18,7 @@
package org.apache.oozie.client;
+import org.apache.commons.codec.CharEncoding;
import org.apache.falcon.security.CurrentUser;
import org.apache.falcon.security.SecurityUtil;
import org.apache.falcon.util.RuntimeProperties;
@@ -131,7 +132,7 @@ public class ProxyOozieClient extends AuthOozieClient {
throws IOException, OozieClientException {
conn.setRequestProperty("content-type", RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(), "UTF_8");
+ Reader reader = new InputStreamReader(conn.getInputStream(), CharEncoding.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
Properties props = new Properties();
props.putAll(json);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/c6cee113/rerun/src/main/java/org/apache/falcon/rerun/queue/InMemoryQueue.java
----------------------------------------------------------------------
diff --git a/rerun/src/main/java/org/apache/falcon/rerun/queue/InMemoryQueue.java b/rerun/src/main/java/org/apache/falcon/rerun/queue/InMemoryQueue.java
index 10ca1ed..ecd6b0a 100644
--- a/rerun/src/main/java/org/apache/falcon/rerun/queue/InMemoryQueue.java
+++ b/rerun/src/main/java/org/apache/falcon/rerun/queue/InMemoryQueue.java
@@ -17,6 +17,7 @@
*/
package org.apache.falcon.rerun.queue;
+import org.apache.commons.codec.CharEncoding;
import org.apache.falcon.FalconException;
import org.apache.commons.io.IOUtils;
import org.apache.falcon.aspect.GenericAlert;
@@ -127,7 +128,8 @@ public class InMemoryQueue<T extends RerunEvent> extends DelayedQueue<T> {
for (File rerunFile : files) {
BufferedReader reader = null;
try {
- reader = new BufferedReader(new InputStreamReader(new FileInputStream(rerunFile), "UTF_8"));
+ reader = new BufferedReader(new InputStreamReader(new FileInputStream(rerunFile),
+ CharEncoding.UTF_8));
String line;
while ((line = reader.readLine()) != null) {
T event = new RerunEventFactory<T>().getRerunEvent(