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/08/20 16:21:53 UTC
[1/7] falcon git commit: FALCON-1399 Property for default number of
results is not loaded dynamically. Contributed by Ajay Yadava.
Repository: falcon
Updated Branches:
refs/heads/0.7 37fbf122d -> 44ca0bdbc
FALCON-1399 Property for default number of results is not loaded dynamically. Contributed by Ajay Yadava.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/914c09f4
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/914c09f4
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/914c09f4
Branch: refs/heads/0.7
Commit: 914c09f4e925a48347199f7b4d09341edb78f0d5
Parents: 37fbf12
Author: Ajay Yadava <aj...@gmail.com>
Authored: Mon Aug 17 16:20:43 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Thu Aug 20 19:48:49 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
common/src/main/resources/runtime.properties | 2 +-
.../org/apache/falcon/resource/AbstractEntityManager.java | 6 ++----
.../org/apache/falcon/resource/AbstractInstanceManager.java | 4 ++--
.../apache/falcon/resource/proxy/InstanceManagerProxy.java | 8 ++++----
.../falcon/resource/proxy/SchedulableEntityManagerProxy.java | 2 +-
src/conf/runtime.properties | 2 +-
.../java/org/apache/falcon/resource/InstanceManager.java | 8 ++++----
.../org/apache/falcon/resource/SchedulableEntityManager.java | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1b71717..fda428e 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
(Suhas Vasu)
BUG FIXES
+ FALCON-1399 Property for default number of results is not loaded dynamically(Ajay Yadava)
+
FALCON-1398 CrossEntityValidations contains incorrect validations(Pragya Mittal via Ajay Yadava)
FALCON-1396 Disable the faulty test(Ajay Yadava via Sowmya Ramesh)
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/common/src/main/resources/runtime.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/runtime.properties b/common/src/main/resources/runtime.properties
index f0253e6..086bca0 100644
--- a/common/src/main/resources/runtime.properties
+++ b/common/src/main/resources/runtime.properties
@@ -23,7 +23,7 @@
*.falcon.replication.workflow.maxmaps=5
*.falcon.replication.workflow.mapbandwidth=100
-*.webservices.default.results.per.page=3000
+*.webservices.default.results.per.page=10
# Default configs to handle replication for late arriving feeds.
*.feed.late.allowed=true
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/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 ff5dc04..f2f9826 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractEntityManager.java
@@ -77,8 +77,6 @@ public abstract class AbstractEntityManager {
private static MemoryLocks memoryLocks = MemoryLocks.getInstance();
protected static final int XML_DEBUG_LEN = 10 * 1024;
- protected static final Integer DEFAULT_NUM_RESULTS = getDefaultResultsPerPage();
-
private AbstractWorkflowEngine workflowEngine;
protected ConfigurationStore configStore = ConfigurationStore.get();
@@ -90,8 +88,8 @@ public abstract class AbstractEntityManager {
}
}
- private static int getDefaultResultsPerPage() {
- Integer result = 3000;
+ protected static Integer getDefaultResultsPerPage() {
+ Integer result = 10;
final String key = "webservices.default.results.per.page";
String value = RuntimeProperties.get().getProperty(key, result.toString());
try {
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
index b382f95..ab8a2fd 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
@@ -839,10 +839,10 @@ public abstract class AbstractInstanceManager extends AbstractEntityManager {
private Pair<Date, Date> getStartAndEndDate(Entity entityObject, String startStr, String endStr)
throws FalconException {
- return getStartAndEndDate(entityObject, startStr, endStr, DEFAULT_NUM_RESULTS);
+ return getStartAndEndDate(entityObject, startStr, endStr, getDefaultResultsPerPage());
}
- private Pair<Date, Date> getStartAndEndDate(Entity entityObject, String startStr, String endStr, int numResults)
+ private Pair<Date, Date> getStartAndEndDate(Entity entityObject, String startStr, String endStr, Integer numResults)
throws FalconException {
Pair<Date, Date> clusterStartEndDates = EntityUtil.getEntityStartEndDates(entityObject);
Frequency frequency = EntityUtil.getFrequency(entityObject);
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/prism/src/main/java/org/apache/falcon/resource/proxy/InstanceManagerProxy.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/proxy/InstanceManagerProxy.java b/prism/src/main/java/org/apache/falcon/resource/proxy/InstanceManagerProxy.java
index 465a636..3343c52 100644
--- a/prism/src/main/java/org/apache/falcon/resource/proxy/InstanceManagerProxy.java
+++ b/prism/src/main/java/org/apache/falcon/resource/proxy/InstanceManagerProxy.java
@@ -101,7 +101,7 @@ public class InstanceManagerProxy extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") final String sortOrder,
@DefaultValue("0") @QueryParam("offset") final Integer offset,
@QueryParam("numResults") final Integer numResults) {
- final Integer resultsPerPage = numResults == null ? DEFAULT_NUM_RESULTS : numResults;
+ final Integer resultsPerPage = numResults == null ? getDefaultResultsPerPage() : numResults;
return new InstanceProxy<InstancesResult>(InstancesResult.class) {
@Override
protected InstancesResult doExecute(String colo) throws FalconException {
@@ -133,7 +133,7 @@ public class InstanceManagerProxy extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") final String sortOrder,
@DefaultValue("0") @QueryParam("offset") final Integer offset,
@QueryParam("numResults") Integer numResults) {
- final Integer resultsPerPage = numResults == null ? DEFAULT_NUM_RESULTS : numResults;
+ final Integer resultsPerPage = numResults == null ? getDefaultResultsPerPage() : numResults;
return new InstanceProxy<InstancesResult>(InstancesResult.class) {
@Override
protected InstancesResult doExecute(String colo) throws FalconException {
@@ -161,7 +161,7 @@ public class InstanceManagerProxy extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") final String sortOrder,
@DefaultValue("0") @QueryParam("offset") final Integer offset,
@QueryParam("numResults") final Integer numResults) {
- final Integer resultsPerPage = numResults == null ? DEFAULT_NUM_RESULTS : numResults;
+ final Integer resultsPerPage = numResults == null ? getDefaultResultsPerPage() : numResults;
return new InstanceProxy<InstancesResult>(InstancesResult.class) {
@Override
protected InstancesResult doExecute(String colo) throws FalconException {
@@ -255,7 +255,7 @@ public class InstanceManagerProxy extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") final String sortOrder,
@DefaultValue("0") @QueryParam("offset") final Integer offset,
@QueryParam("numResults") final Integer numResults) {
- final Integer resultsPerPage = numResults == null ? DEFAULT_NUM_RESULTS : numResults;
+ final Integer resultsPerPage = numResults == null ? getDefaultResultsPerPage() : numResults;
return new InstanceProxy<InstancesResult>(InstancesResult.class) {
@Override
protected InstancesResult doExecute(String colo) throws FalconException {
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java b/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
index b49d6f8..aa7fd0c 100644
--- a/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
+++ b/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
@@ -477,7 +477,7 @@ public class SchedulableEntityManagerProxy extends AbstractSchedulableEntityMana
if (StringUtils.isNotEmpty(type)) {
type = type.substring(1);
}
- resultsPerPage = resultsPerPage == null ? DEFAULT_NUM_RESULTS : resultsPerPage;
+ resultsPerPage = resultsPerPage == null ? getDefaultResultsPerPage() : resultsPerPage;
return super.getEntityList(fields, nameSubsequence, tagKeywords, type, tags, filterBy,
orderBy, sortOrder, offset, resultsPerPage);
}
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/src/conf/runtime.properties
----------------------------------------------------------------------
diff --git a/src/conf/runtime.properties b/src/conf/runtime.properties
index 1eb3f1c..b8ebe39 100644
--- a/src/conf/runtime.properties
+++ b/src/conf/runtime.properties
@@ -31,7 +31,7 @@ prism.falcon.local.endpoint=https://localhost:15443
falcon.current.colo=local
#default number of results per call, if numResults option is not specified then this value is used.
-*.webservices.default.results.per.page=3000
+*.webservices.default.results.per.page=10
# retry count - to fetch the status from the workflow engine
*.workflow.status.retry.count=30
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/webapp/src/main/java/org/apache/falcon/resource/InstanceManager.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/falcon/resource/InstanceManager.java b/webapp/src/main/java/org/apache/falcon/resource/InstanceManager.java
index cbc936e..76c66f3 100644
--- a/webapp/src/main/java/org/apache/falcon/resource/InstanceManager.java
+++ b/webapp/src/main/java/org/apache/falcon/resource/InstanceManager.java
@@ -56,7 +56,7 @@ public class InstanceManager extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") String sortOrder,
@DefaultValue("0") @QueryParam("offset") Integer offset,
@QueryParam("numResults") Integer resultsPerPage) {
- resultsPerPage = resultsPerPage == null ? DEFAULT_NUM_RESULTS : resultsPerPage;
+ resultsPerPage = resultsPerPage == null ? getDefaultResultsPerPage() : resultsPerPage;
return super.getRunningInstances(type, entity, colo, lifeCycles, filterBy,
orderBy, sortOrder, offset, resultsPerPage);
}
@@ -82,7 +82,7 @@ public class InstanceManager extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") String sortOrder,
@DefaultValue("0") @QueryParam("offset") Integer offset,
@QueryParam("numResults") Integer resultsPerPage) {
- resultsPerPage = resultsPerPage == null ? DEFAULT_NUM_RESULTS : resultsPerPage;
+ resultsPerPage = resultsPerPage == null ? getDefaultResultsPerPage() : resultsPerPage;
return super.getInstances(type, entity, startStr, endStr, colo, lifeCycles,
filterBy, orderBy, sortOrder, offset, resultsPerPage);
}
@@ -104,7 +104,7 @@ public class InstanceManager extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") String sortOrder,
@DefaultValue("0") @QueryParam("offset") Integer offset,
@QueryParam("numResults") Integer resultsPerPage) {
- resultsPerPage = resultsPerPage == null ? DEFAULT_NUM_RESULTS : resultsPerPage;
+ resultsPerPage = resultsPerPage == null ? getDefaultResultsPerPage() : resultsPerPage;
return super.getStatus(type, entity, startStr, endStr, colo, lifeCycles,
filterBy, orderBy, sortOrder, offset, resultsPerPage);
}
@@ -159,7 +159,7 @@ public class InstanceManager extends AbstractInstanceManager {
@DefaultValue("") @QueryParam("sortOrder") String sortOrder,
@DefaultValue("0") @QueryParam("offset") Integer offset,
@QueryParam("numResults") Integer resultsPerPage) {
- resultsPerPage = resultsPerPage == null ? DEFAULT_NUM_RESULTS : resultsPerPage;
+ resultsPerPage = resultsPerPage == null ? getDefaultResultsPerPage() : resultsPerPage;
return super.getLogs(type, entity, startStr, endStr, colo, runId, lifeCycles,
filterBy, orderBy, sortOrder, offset, resultsPerPage);
}
http://git-wip-us.apache.org/repos/asf/falcon/blob/914c09f4/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java
----------------------------------------------------------------------
diff --git a/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java b/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java
index 9a3d6be..a2af0cd 100644
--- a/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java
+++ b/webapp/src/main/java/org/apache/falcon/resource/SchedulableEntityManager.java
@@ -80,7 +80,7 @@ public class SchedulableEntityManager extends AbstractSchedulableEntityManager {
if (StringUtils.isNotEmpty(type)) {
type = type.substring(1);
}
- resultsPerPage = resultsPerPage == null ? DEFAULT_NUM_RESULTS : resultsPerPage;
+ resultsPerPage = resultsPerPage == null ? getDefaultResultsPerPage() : resultsPerPage;
return super.getEntityList(fields, nameSubsequence, tagKeywords, type, tags, filterBy,
orderBy, sortOrder, offset, resultsPerPage);
}
[5/7] falcon git commit: FALCON-1344 EntityGraph returns null in list
of dependent entities. Contributed by Ajay Yadava.
Posted by aj...@apache.org.
FALCON-1344 EntityGraph returns null in list of dependent entities. Contributed by Ajay Yadava.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/81380f84
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/81380f84
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/81380f84
Branch: refs/heads/0.7
Commit: 81380f8427cda0df3e9cc30f9cea258931f3d938
Parents: 3201e8d
Author: Ajay Yadava <aj...@gmail.com>
Authored: Tue Aug 18 14:59:53 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Thu Aug 20 19:49:01 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../java/org/apache/falcon/entity/v0/EntityGraph.java | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/81380f84/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 554cfea..23d7cf0 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
(Suhas Vasu)
BUG FIXES
+ FALCON-1344 EntityGraph returns null in list of dependent entities(Ajay Yadava)
+
FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces unexpected results(Ajay Yadava)
FALCON-1399 Property for default number of results is not loaded dynamically(Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/81380f84/common/src/main/java/org/apache/falcon/entity/v0/EntityGraph.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/falcon/entity/v0/EntityGraph.java b/common/src/main/java/org/apache/falcon/entity/v0/EntityGraph.java
index 444e28d..bd4c6cf 100644
--- a/common/src/main/java/org/apache/falcon/entity/v0/EntityGraph.java
+++ b/common/src/main/java/org/apache/falcon/entity/v0/EntityGraph.java
@@ -60,8 +60,11 @@ public final class EntityGraph implements ConfigurationChangeListener {
Set<Entity> dependents = new HashSet<Entity>();
for (Node node : graph.get(entityNode)) {
Entity dependentEntity = store.get(node.type, node.name);
- assert dependentEntity != null : "Unable to find " + node;
- dependents.add(dependentEntity);
+ if (dependentEntity != null) {
+ dependents.add(dependentEntity);
+ } else {
+ LOG.error("Dependent entity {} was not found in configuration store.", node);
+ }
}
return dependents;
} else {
@@ -84,16 +87,17 @@ public final class EntityGraph implements ConfigurationChangeListener {
if (nodeEdges == null) {
return;
}
- LOG.trace("Adding edges for {}: {}", entity.getName(), nodeEdges);
+ LOG.debug("Adding edges for {}: {}", entity.getName(), nodeEdges);
for (Map.Entry<Node, Set<Node>> entry : nodeEdges.entrySet()) {
+ LOG.debug("Adding edges : {} for {}", entry.getValue(), entry.getKey());
if (graph.containsKey(entry.getKey())) {
graph.get(entry.getKey()).addAll(entry.getValue());
} else {
graph.put(entry.getKey(), entry.getValue());
}
}
- LOG.trace("Merged edges to graph {}", entity.getName());
+ LOG.debug("Merged edges to graph {}", entity.getName());
}
@Override
[4/7] falcon git commit: FALCON-1407 Temporarily disable failing
tests in ClusterEntityValidationIT. Contributed by Ajay Yadava.
Posted by aj...@apache.org.
FALCON-1407 Temporarily disable failing tests in ClusterEntityValidationIT. Contributed by Ajay Yadava.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/3060e5cb
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/3060e5cb
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/3060e5cb
Branch: refs/heads/0.7
Commit: 3060e5cba6097f1ea6e70d79e2567d1e670217cc
Parents: 862137b
Author: Ajay Yadava <aj...@gmail.com>
Authored: Wed Aug 19 20:25:01 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Thu Aug 20 19:49:01 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/falcon/validation/ClusterEntityValidationIT.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/3060e5cb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index be33ca7..15ee65a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
(Suhas Vasu)
BUG FIXES
+ FALCON-1407 Temporarily disable failing tests in ClusterEntityValidationIT(Ajay Yadava)
+
FALCON-1392 FalconUnit tests fail(Pavan Kumar Kolamuri via Ajay Yadava)
FALCON-1344 EntityGraph returns null in list of dependent entities(Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/3060e5cb/webapp/src/test/java/org/apache/falcon/validation/ClusterEntityValidationIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/validation/ClusterEntityValidationIT.java b/webapp/src/test/java/org/apache/falcon/validation/ClusterEntityValidationIT.java
index 431d334..cc6615b 100644
--- a/webapp/src/test/java/org/apache/falcon/validation/ClusterEntityValidationIT.java
+++ b/webapp/src/test/java/org/apache/falcon/validation/ClusterEntityValidationIT.java
@@ -111,7 +111,7 @@ public class ClusterEntityValidationIT {
};
}
- @Test (dataProvider = "interfaceToInvalidURLs")
+ @Test (dataProvider = "interfaceToInvalidURLs", enabled = false)
public void testClusterEntityWithInvalidInterfaces(Interfacetype interfacetype, String endpoint)
throws Exception {
overlay = context.getUniqueOverlay();
[6/7] falcon git commit: FALCON-1409 Update API throws
NullPointerException. Contributed by Sandeep Samudrala.
Posted by aj...@apache.org.
FALCON-1409 Update API throws NullPointerException. Contributed by Sandeep Samudrala.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/21fc6455
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/21fc6455
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/21fc6455
Branch: refs/heads/0.7
Commit: 21fc6455a014f82fc69fd1d2540ff8a76c01090d
Parents: 3060e5c
Author: Ajay Yadava <aj...@gmail.com>
Authored: Thu Aug 20 14:52:09 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Thu Aug 20 19:49:01 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../resource/proxy/SchedulableEntityManagerProxy.java | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/21fc6455/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 15ee65a..2a1d0a6 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
(Suhas Vasu)
BUG FIXES
+ FALCON-1409 Update API throws NullPointerException(Sandeep Samudrala via Ajay Yadava)
+
FALCON-1407 Temporarily disable failing tests in ClusterEntityValidationIT(Ajay Yadava)
FALCON-1392 FalconUnit tests fail(Pavan Kumar Kolamuri via Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/21fc6455/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java b/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
index aa7fd0c..d22e8a3 100644
--- a/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
+++ b/prism/src/main/java/org/apache/falcon/resource/proxy/SchedulableEntityManagerProxy.java
@@ -257,6 +257,7 @@ public class SchedulableEntityManagerProxy extends AbstractSchedulableEntityMana
oldColos.removeAll(mergedColos); //Old colos where delete should be called
Map<String, APIResult> results = new HashMap<String, APIResult>();
+ boolean result = true;
if (!oldColos.isEmpty()) {
results.put(FALCON_TAG + "/delete", new EntityProxy(type, entityName) {
@Override
@@ -299,8 +300,14 @@ public class SchedulableEntityManagerProxy extends AbstractSchedulableEntityMana
}.execute());
}
+ for (APIResult apiResult : results.values()) {
+ if (apiResult.getStatus() != APIResult.Status.SUCCEEDED) {
+ result = false;
+ }
+ }
+
// update only if all are updated
- if (!embeddedMode && results.get(FALCON_TAG).getStatus() == APIResult.Status.SUCCEEDED) {
+ if (!embeddedMode && result) {
results.put(PRISM_TAG, super.update(bufferedRequest, type, entityName, currentColo));
}
[2/7] falcon git commit: FALCON-1412 Process waits indefinitely and
finally timedout even though missing dependencies are met. Contributed by
Pallavi Rao.
Posted by aj...@apache.org.
FALCON-1412 Process waits indefinitely and finally timedout even though missing dependencies are met. Contributed 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/44ca0bdb
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/44ca0bdb
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/44ca0bdb
Branch: refs/heads/0.7
Commit: 44ca0bdbc25325bf6652a9ba79ce23dd5c7a73fb
Parents: 21fc645
Author: Ajay Yadava <aj...@gmail.com>
Authored: Thu Aug 20 15:24:17 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Thu Aug 20 19:49:01 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
oozie-el-extensions/pom.xml | 22 +++++++++++++++++++++-
src/main/assemblies/distributed-package.xml | 5 +++++
src/main/assemblies/standalone-package.xml | 5 +++++
4 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/44ca0bdb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2a1d0a6..f31f839 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
(Suhas Vasu)
BUG FIXES
+ FALCON-1412 Process waits indefinitely and finally timedout even though missing dependencies are met(Pallavi Rao via Ajay Yadava)
+
FALCON-1409 Update API throws NullPointerException(Sandeep Samudrala via Ajay Yadava)
FALCON-1407 Temporarily disable failing tests in ClusterEntityValidationIT(Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/44ca0bdb/oozie-el-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/oozie-el-extensions/pom.xml b/oozie-el-extensions/pom.xml
index b914426..517ddd1 100644
--- a/oozie-el-extensions/pom.xml
+++ b/oozie-el-extensions/pom.xml
@@ -83,5 +83,25 @@
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>
+ commons-lang3
+ </includeArtifactIds>
+ <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/falcon/blob/44ca0bdb/src/main/assemblies/distributed-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/distributed-package.xml b/src/main/assemblies/distributed-package.xml
index 0b56572..794eaef 100644
--- a/src/main/assemblies/distributed-package.xml
+++ b/src/main/assemblies/distributed-package.xml
@@ -41,6 +41,11 @@
</fileSet>
<fileSet>
+ <directory>oozie-el-extensions/target/dependency</directory>
+ <outputDirectory>oozie/libext</outputDirectory>
+ </fileSet>
+
+ <fileSet>
<directory>docs/target/site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
http://git-wip-us.apache.org/repos/asf/falcon/blob/44ca0bdb/src/main/assemblies/standalone-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/standalone-package.xml b/src/main/assemblies/standalone-package.xml
index 40e6b99..fcff8d7 100644
--- a/src/main/assemblies/standalone-package.xml
+++ b/src/main/assemblies/standalone-package.xml
@@ -40,6 +40,11 @@
</fileSet>
<fileSet>
+ <directory>oozie-el-extensions/target/dependency</directory>
+ <outputDirectory>oozie/libext</outputDirectory>
+ </fileSet>
+
+ <fileSet>
<directory>docs/target/site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
[3/7] falcon git commit: FALCON-1330 When multiple cluster
definitions exist for the same colo,
triage produces unexpected results. Contributed by Ajay Yadava.
Posted by aj...@apache.org.
FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces unexpected results. Contributed by Ajay Yadava.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/3201e8d9
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/3201e8d9
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/3201e8d9
Branch: refs/heads/0.7
Commit: 3201e8d99956752648fa0d3f9245c106e4c370f8
Parents: 914c09f
Author: Ajay Yadava <aj...@gmail.com>
Authored: Tue Aug 18 14:46:33 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Thu Aug 20 19:49:01 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../java/org/apache/falcon/resource/AbstractInstanceManager.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/3201e8d9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fda428e..554cfea 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
(Suhas Vasu)
BUG FIXES
+ FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces unexpected results(Ajay Yadava)
+
FALCON-1399 Property for default number of results is not loaded dynamically(Ajay Yadava)
FALCON-1398 CrossEntityValidations contains incorrect validations(Pragya Mittal via Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/3201e8d9/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
----------------------------------------------------------------------
diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
index ab8a2fd..c1b4da6 100644
--- a/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
+++ b/prism/src/main/java/org/apache/falcon/resource/AbstractInstanceManager.java
@@ -647,7 +647,7 @@ public abstract class AbstractInstanceManager extends AbstractEntityManager {
Entity entity = EntityUtil.getEntity(type, entityName);
TriageResult result = new TriageResult(APIResult.Status.SUCCEEDED, "Success");
List<LineageGraphResult> triageGraphs = new LinkedList<>();
- for (String clusterName : DeploymentUtil.getCurrentClusters()) {
+ for (String clusterName : EntityUtil.getClustersDefinedInColos(entity)) {
Cluster cluster = EntityUtil.getEntity(EntityType.CLUSTER, clusterName);
triageGraphs.add(triage(type, entity, instanceTime, cluster));
}
[7/7] falcon git commit: FALCON-1392 FalconUnit tests fail.
Contributed by Pavan Kumar Kolamuri.
Posted by aj...@apache.org.
FALCON-1392 FalconUnit tests fail. Contributed by Pavan Kumar Kolamuri.
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/862137b9
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/862137b9
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/862137b9
Branch: refs/heads/0.7
Commit: 862137b92b2b8d46d5a6cf480d275f26b4e11b4f
Parents: 81380f8
Author: Ajay Yadava <aj...@gmail.com>
Authored: Tue Aug 18 15:51:51 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Thu Aug 20 19:49:01 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 2 ++
unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java | 2 +-
unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/862137b9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 23d7cf0..be33ca7 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
(Suhas Vasu)
BUG FIXES
+ FALCON-1392 FalconUnit tests fail(Pavan Kumar Kolamuri via Ajay Yadava)
+
FALCON-1344 EntityGraph returns null in list of dependent entities(Ajay Yadava)
FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces unexpected results(Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/862137b9/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
----------------------------------------------------------------------
diff --git a/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java b/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
index bd03efb..9f00d94 100644
--- a/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
+++ b/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
@@ -301,7 +301,7 @@ public class FalconUnitTestBase {
}
protected long waitForStatus(final EntityType entityType, final String entityName, final String instanceTime) {
- return waitFor(20000, new Predicate() {
+ return waitFor(90000, new Predicate() {
public boolean evaluate() throws Exception {
InstancesResult.WorkflowStatus status = falconUnitClient.getInstanceStatus(entityType,
entityName, instanceTime);
http://git-wip-us.apache.org/repos/asf/falcon/blob/862137b9/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
----------------------------------------------------------------------
diff --git a/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java b/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
index 855be79..57b7b1b 100644
--- a/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
+++ b/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
@@ -49,7 +49,7 @@ public class TestFalconUnit extends FalconUnitTestBase {
waitForStatus(EntityType.PROCESS, "process", scheduleTime);
InstancesResult.WorkflowStatus status = falconUnitClient.getInstanceStatus(EntityType.PROCESS,
"process", scheduleTime);
- Assert.assertEquals(InstancesResult.WorkflowStatus.SUCCEEDED, status);
+ Assert.assertEquals(status, InstancesResult.WorkflowStatus.SUCCEEDED);
String outPath = getFeedPathForTS("local", "out", scheduleTime);
Assert.assertTrue(getFileSystem().exists(new Path(outPath)));
FileStatus[] files = getFileSystem().listStatus(new Path(outPath));