falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject [1/5] falcon git commit: Update falcon branch 0.10-refactored-ui to be up to date with branch 0.10
Date Tue, 16 Aug 2016 22:48:35 GMT
Repository: falcon
Updated Branches:
  refs/heads/0.10-refactored-ui 48b877afd -> 01a303e3b


http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/src/conf/startup.properties
----------------------------------------------------------------------
diff --git a/src/conf/startup.properties b/src/conf/startup.properties
index d732013..345c192 100644
--- a/src/conf/startup.properties
+++ b/src/conf/startup.properties
@@ -42,6 +42,7 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
+                        org.apache.falcon.extensions.ExtensionService,\
                         org.apache.falcon.service.LifecyclePolicyMap,\
                         org.apache.falcon.entity.store.ConfigurationStore,\
                         org.apache.falcon.rerun.service.RetryService,\
@@ -49,8 +50,8 @@
                         org.apache.falcon.metadata.MetadataMappingService,\
                         org.apache.falcon.service.LogCleanupService,\
                         org.apache.falcon.service.GroupsService,\
-                        org.apache.falcon.service.ProxyUserService,\
-                        org.apache.falcon.extensions.ExtensionService
+                        org.apache.falcon.service.ProxyUserService
+
 ##For feed SLA monitoring enable these two
 #                        org.apache.falcon.service.FalconJPAService,\
 #                        org.apache.falcon.service.FeedSLAMonitoringService,\
@@ -123,7 +124,7 @@ prism.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\
 *.config.store.uri=file://${falcon.home}/data/${falcon.app.type}-store
 
 # HDFS location of extension store for extension artifacts
-*.extension.store.uri=
+*.extension.store.uri=file://${falcon.home}/extensions/
 
 #Location to store state of Feed SLA monitoring service
 *.feed.sla.service.store.uri = file://${falcon.home}/data/sla/pendingfeedinstances
@@ -135,6 +136,12 @@ prism.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\
 
 *.falcon.cleanup.service.frequency=days(1)
 
+# Default number of threads to be used to restore entities.
+*.config.store.num.threads.load.entities=100
+
+# Default timeout in minutes to load entities
+*.config.store.start.timeout.minutes=30
+
 ######### Properties for Feed SLA Monitoring #########
 # frequency of serialization for the state of FeedSLAMonitoringService - 1 hour
 *.feed.sla.serialization.frequency.millis=3600000
@@ -173,25 +180,19 @@ prism.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\
 *.falcon.graph.blueprints.graph=com.thinkaurelius.titan.core.TitanFactory
 
 # Graph Storage
-# IMPORTANT:   Please enable one of hbase or berkeleydb backends are enabled
-#  after the backend requirements are provisioned as needed.
+# IMPORTANT:   Please enable one of the graph db backend: hbase or berkeleydb, per instructions
below.
 
-# Enable the following for Berkeley DB.  Make sure je-5.0.73.jar is
-# downloaded and available under Falcon webapp directory or under falcon
-# server classpath.
-
-#*.falcon.graph.storage.directory=/${falcon.home}/data/graphdb
+# Enable the following for Berkeley DB.  Make sure je-5.0.73.jar is downloaded and available
+# under Falcon webapp directory or under falcon server classpath.
 #*.falcon.graph.storage.backend=berkeleyje
-
+#*.falcon.graph.storage.directory=/${falcon.home}/data/graphdb
+#*.falcon.graph.serialize.path=${user.dir}/target/graphdb
 
 # Enable the following for HBase
 #*.falcon.graph.storage.backend=hbase
-#For standalone mode , set hostname to localhost
-#for distributed mode, set to the zookeeper quorum
+# For standalone mode , set hostname to localhost; for distributed mode, set to the zookeeper
quorum
 # @see http://s3.thinkaurelius.com/docs/titan/current/hbase.html#_remote_server_mode_2
-
 #*.falcon.graph.storage.hostname=localhost
-#*.falcon.graph.serialize.path=${user.dir}/target/graphdb
 #*.falcon.graph.storage.hbase.table=falcon_titan
 
 # Avoid acquiring read lock when iterating over large graphs

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/src/main/assemblies/distributed-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/distributed-package.xml b/src/main/assemblies/distributed-package.xml
index 1b5353d..4683a81 100644
--- a/src/main/assemblies/distributed-package.xml
+++ b/src/main/assemblies/distributed-package.xml
@@ -337,6 +337,13 @@
             <outputDirectory>extensions/hive-mirroring</outputDirectory>
             <fileMode>0755</fileMode>
         </file>
+
+        <file>
+            <source>../examples/target/falcon-examples-${project.version}.jar</source>
+            <outputDirectory>examples/app/spark/lib</outputDirectory>
+            <destName>falcon-examples.jar</destName>
+            <fileMode>0644</fileMode>
+        </file>
     </files>
 </assembly>
     

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/src/main/assemblies/standalone-package.xml
----------------------------------------------------------------------
diff --git a/src/main/assemblies/standalone-package.xml b/src/main/assemblies/standalone-package.xml
index 54d89ce..c291697 100644
--- a/src/main/assemblies/standalone-package.xml
+++ b/src/main/assemblies/standalone-package.xml
@@ -305,6 +305,13 @@
         </file>
 
         <file>
+            <source>../examples/target/falcon-examples-${project.version}.jar</source>
+            <outputDirectory>examples/app/spark/lib</outputDirectory>
+            <destName>falcon-examples.jar</destName>
+            <fileMode>0644</fileMode>
+        </file>
+
+        <file>
             <source>../webapp/target/falcon-webapp-${project.version}.war</source>
             <outputDirectory>server/webapp</outputDirectory>
             <destName>falcon.war</destName>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/test-tools/hadoop-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/test-tools/hadoop-webapp/pom.xml b/test-tools/hadoop-webapp/pom.xml
index 213668e..e887d82 100644
--- a/test-tools/hadoop-webapp/pom.xml
+++ b/test-tools/hadoop-webapp/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>falcon-hadoop-webapp</artifactId>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/test-tools/hcatalog-sharelib/pom.xml
----------------------------------------------------------------------
diff --git a/test-tools/hcatalog-sharelib/pom.xml b/test-tools/hcatalog-sharelib/pom.xml
index 46d6c96..034f3d8 100644
--- a/test-tools/hcatalog-sharelib/pom.xml
+++ b/test-tools/hcatalog-sharelib/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>falcon-sharelib-hcatalog</artifactId>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/test-tools/hive-sharelib/pom.xml
----------------------------------------------------------------------
diff --git a/test-tools/hive-sharelib/pom.xml b/test-tools/hive-sharelib/pom.xml
index 7cea8ed..aa2049a 100644
--- a/test-tools/hive-sharelib/pom.xml
+++ b/test-tools/hive-sharelib/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>falcon-sharelib-hive</artifactId>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/test-tools/oozie-sharelib/pom.xml
----------------------------------------------------------------------
diff --git a/test-tools/oozie-sharelib/pom.xml b/test-tools/oozie-sharelib/pom.xml
index 37bc062..9f10e08 100644
--- a/test-tools/oozie-sharelib/pom.xml
+++ b/test-tools/oozie-sharelib/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>falcon-sharelib-oozie</artifactId>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/test-tools/pig-sharelib/pom.xml
----------------------------------------------------------------------
diff --git a/test-tools/pig-sharelib/pom.xml b/test-tools/pig-sharelib/pom.xml
index ae6de96..a96c52a 100644
--- a/test-tools/pig-sharelib/pom.xml
+++ b/test-tools/pig-sharelib/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>falcon-sharelib-pig</artifactId>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/test-tools/pom.xml
----------------------------------------------------------------------
diff --git a/test-tools/pom.xml b/test-tools/pom.xml
index 1ec7bbe..ea78ee3 100644
--- a/test-tools/pom.xml
+++ b/test-tools/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
     </parent>
     <artifactId>falcon-test-tools</artifactId>
     <description>Apache Falcon Test Tools - Test Cluster</description>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/test-util/pom.xml
----------------------------------------------------------------------
diff --git a/test-util/pom.xml b/test-util/pom.xml
index baff8c3..0f65115 100644
--- a/test-util/pom.xml
+++ b/test-util/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
     </parent>
     <artifactId>falcon-test-util</artifactId>
     <description>Apache Falcon Test Utility</description>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/titan/pom.xml
----------------------------------------------------------------------
diff --git a/titan/pom.xml b/titan/pom.xml
index 1409cfa..0f71acc 100644
--- a/titan/pom.xml
+++ b/titan/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>falcon-main</artifactId>
         <groupId>org.apache.falcon</groupId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
     </parent>
     <artifactId>falcon-titan</artifactId>
     <description>Titan HBase 1.0 shaded libraries for 0.5.4 for Falcon</description>
@@ -48,11 +48,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.vividsolutions</groupId>
-            <artifactId>jts</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>com.thinkaurelius.titan</groupId>
             <artifactId>titan-es</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/unit/pom.xml
----------------------------------------------------------------------
diff --git a/unit/pom.xml b/unit/pom.xml
index 4902fcc..1ca4533 100644
--- a/unit/pom.xml
+++ b/unit/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>falcon-main</artifactId>
         <groupId>org.apache.falcon</groupId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>falcon-unit</artifactId>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index f98c5e3..90ba089 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.falcon</groupId>
         <artifactId>falcon-main</artifactId>
-        <version>0.10-SNAPSHOT</version>
+        <version>0.10</version>
     </parent>
     <artifactId>falcon-webapp</artifactId>
     <description>Apache Falcon Web Application</description>
@@ -182,11 +182,13 @@
         <dependency>
             <groupId>org.apache.falcon</groupId>
             <artifactId>falcon-metrics</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.falcon</groupId>
             <artifactId>falcon-rerun</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -387,6 +389,7 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                            <excludeScope>provided</excludeScope>
                         </configuration>
                     </execution>
                     <execution>

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java b/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java
index b352be4..6efe884 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java
@@ -18,6 +18,7 @@
 
 package org.apache.falcon.resource;
 
+import org.apache.falcon.entity.v0.EntityType;
 import org.apache.falcon.extensions.ExtensionProperties;
 import org.apache.falcon.extensions.mirroring.hdfs.HdfsMirroringExtensionProperties;
 import org.apache.falcon.extensions.store.AbstractTestExtensionStore;
@@ -30,8 +31,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Unit tests for org.apache.falcon.extensions.ExtensionManager.
+ * IT tests for org.apache.falcon.extensions.ExtensionManager.
  */
+@Test (enabled = false)
 public class ExtensionManagerIT extends AbstractTestExtensionStore {
     private static final String HDFS_MIRRORING_PROPERTY_TEMPLATE = "/hdfs-mirroring-property-template.txt";
     private static final String JOB_NAME_1 = "hdfs-mirroring-job-1";
@@ -56,7 +58,7 @@ public class ExtensionManagerIT extends AbstractTestExtensionStore {
         TestContext.deleteEntitiesFromStore();
     }
 
-    @Test
+    @Test (enabled = false)
     public void testTrustedExtensionJob() throws Exception {
         Map<String, String> overlay = context.getUniqueOverlay();
         String endTime = context.getProcessEndTime();
@@ -110,12 +112,15 @@ public class ExtensionManagerIT extends AbstractTestExtensionStore {
                 "extension -instances -jobName " + JOB_NAME_2 + " -fields status,clusters,tags"),
0);
 
         // validate instance list results
+        context.waitForInstancesToStart(EntityType.PROCESS.name(), JOB_NAME_1, 10000);
         ExtensionInstanceList instanceList = context.getExtensionInstances(JOB_NAME_1, START_TIME_1,
endTime, "RUNNING",
                 null, null, null, null, null, null);
         System.out.println("Validate running instances of extension job " + JOB_NAME_1 +
": \n"
                 + instanceList.toString());
         Assert.assertEquals(instanceList.numEntities, 1);
         Assert.assertEquals(instanceList.entitySummary.get(0).instances.length, 1);
+
+        context.waitForInstancesToStart(EntityType.PROCESS.name(), JOB_NAME_2, 10000);
         instanceList = context.getExtensionInstances(JOB_NAME_2, START_TIME_1, endTime, "RUNNING",
                 null, null, null, null, null, null);
         System.out.println("Validate running instances of extension job " + JOB_NAME_2 +
": \n"

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/webapp/src/test/java/org/apache/falcon/resource/InstanceSchedulerManagerJerseyIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/InstanceSchedulerManagerJerseyIT.java
b/webapp/src/test/java/org/apache/falcon/resource/InstanceSchedulerManagerJerseyIT.java
index 6d6d40b..00dbf7a 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/InstanceSchedulerManagerJerseyIT.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/InstanceSchedulerManagerJerseyIT.java
@@ -28,6 +28,7 @@ import java.util.Map;
 /**
  * Tests for Instance operations using Falcon Native Scheduler.
  */
+@Test (enabled = false)
 public class InstanceSchedulerManagerJerseyIT extends AbstractSchedulerManagerJerseyIT {
 
 
@@ -40,7 +41,7 @@ public class InstanceSchedulerManagerJerseyIT extends AbstractSchedulerManagerJe
         super.setup();
     }
 
-    @Test
+    @Test (enabled = false)
     public void testProcessInstanceExecution() throws Exception {
         UnitTestContext context = new UnitTestContext();
         Map<String, String> overlay = context.getUniqueOverlay();
@@ -64,7 +65,7 @@ public class InstanceSchedulerManagerJerseyIT extends AbstractSchedulerManagerJe
 
     }
 
-    @Test
+    @Test (enabled = false)
     public void testKillAndRerunInstances() throws Exception {
         UnitTestContext context = new UnitTestContext();
         Map<String, String> overlay = context.getUniqueOverlay();
@@ -98,7 +99,7 @@ public class InstanceSchedulerManagerJerseyIT extends AbstractSchedulerManagerJe
 
     }
 
-    @Test
+    @Test (enabled = false)
     public void testSuspendResumeInstances() throws Exception {
         UnitTestContext context = new UnitTestContext();
         Map<String, String> overlay = context.getUniqueOverlay();
@@ -128,7 +129,7 @@ public class InstanceSchedulerManagerJerseyIT extends AbstractSchedulerManagerJe
                 START_INSTANCE, InstancesResult.WorkflowStatus.RUNNING);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testListInstances() throws Exception {
         UnitTestContext context = new UnitTestContext();
         Map<String, String> overlay = context.getUniqueOverlay();
@@ -149,7 +150,7 @@ public class InstanceSchedulerManagerJerseyIT extends AbstractSchedulerManagerJe
         Assert.assertEquals(result.getInstances()[2].getInstance(), START_INSTANCE);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testInstanceSummary() throws Exception {
         UnitTestContext context = new UnitTestContext();
         Map<String, String> overlay = context.getUniqueOverlay();
@@ -173,7 +174,7 @@ public class InstanceSchedulerManagerJerseyIT extends AbstractSchedulerManagerJe
         Assert.assertEquals(result.getInstancesSummary()[0].getSummaryMap().get("READY").longValue(),
1L);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testProcessWithInputs() throws Exception {
         UnitTestContext context = new UnitTestContext();
         Map<String, String> overlay = context.getUniqueOverlay();

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/webapp/src/test/java/org/apache/falcon/resource/ProcessInstanceManagerIT.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/ProcessInstanceManagerIT.java
b/webapp/src/test/java/org/apache/falcon/resource/ProcessInstanceManagerIT.java
index 4687520..37f8b99 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/ProcessInstanceManagerIT.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/ProcessInstanceManagerIT.java
@@ -37,6 +37,7 @@ import java.io.IOException;
 /**
  * Test class for Process Instance REST API.
  */
+@Test (enabled = false)
 public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT {
 
     private static final String START_INSTANCE = "2012-04-20T00:00Z";
@@ -71,7 +72,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         OozieTestUtils.waitForProcessWFtoStart(context);
     }
 
-    //@Test
+    @Test (enabled = false)
     public void testGetRunningInstances() throws Exception {
         TestContext context = new TestContext();
         schedule(context);
@@ -86,7 +87,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         assertInstance(response.getInstances()[0], START_INSTANCE, WorkflowStatus.RUNNING);
     }
 
-    //@Test
+    @Test (enabled = false)
     public void testGetRunningInstancesPagination()  throws Exception {
         TestContext context = new TestContext();
         schedule(context, 4);
@@ -117,7 +118,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         Assert.assertEquals(processInstance.getStatus(), status);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testGetInstanceStatus() throws Exception {
         UnitTestContext context = new UnitTestContext();
         schedule(context);
@@ -131,7 +132,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         Assert.assertEquals(response.getInstances()[0].getStatus(), WorkflowStatus.RUNNING);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testGetInstanceStatusPagination() throws Exception {
         UnitTestContext context = new UnitTestContext();
         schedule(context);
@@ -146,7 +147,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         Assert.assertEquals(response.getInstances()[0].getStatus(), WorkflowStatus.RUNNING);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testKillInstances() throws Exception {
         UnitTestContext context = new UnitTestContext();
         schedule(context);
@@ -172,7 +173,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         Assert.assertEquals(response.getInstances()[0].getStatus(), WorkflowStatus.KILLED);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testReRunInstances() throws Exception {
         UnitTestContext context = new UnitTestContext();
         schedule(context);
@@ -201,7 +202,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         Assert.assertEquals(response.getInstances()[0].getStatus(), WorkflowStatus.RUNNING);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testSuspendInstances() throws Exception {
         UnitTestContext context = new UnitTestContext();
         schedule(context);
@@ -220,7 +221,7 @@ public class ProcessInstanceManagerIT extends AbstractSchedulerManagerJerseyIT
{
         Assert.assertEquals(response.getInstances()[0].getStatus(), WorkflowStatus.SUSPENDED);
     }
 
-    @Test
+    @Test (enabled = false)
     public void testResumesInstances() throws Exception {
         UnitTestContext context = new UnitTestContext();
         schedule(context);

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/webapp/src/test/java/org/apache/falcon/resource/TestContext.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/TestContext.java b/webapp/src/test/java/org/apache/falcon/resource/TestContext.java
index 5412608..8201506 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/TestContext.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/TestContext.java
@@ -324,6 +324,21 @@ public class TestContext extends AbstractTestContext {
         return response.getEntity(ExtensionInstanceList.class);
     }
 
+    public void waitForInstancesToStart(String entityType, String entityName, long timeout)
{
+        long mustEnd = System.currentTimeMillis() + timeout;
+        WebResource resource = this.service.path("api/instance/running/" + entityType + "/"
+ entityName);
+        InstancesResult instancesResult;
+        while (System.currentTimeMillis() < mustEnd) {
+            ClientResponse response = resource.header("Cookie", AUTH_COOKIE_EQ + authenticationToken)
+                    .accept(MediaType.APPLICATION_JSON).type(MediaType.TEXT_XML)
+                    .method(HttpMethod.GET, ClientResponse.class);
+            instancesResult = response.getEntity(InstancesResult.class);
+            if (instancesResult.getInstances() != null && instancesResult.getInstances().length
> 0) {
+                break;
+            }
+        }
+    }
+
     public ClientResponse submitAndSchedule(String template, Map<String, String> overlay,
EntityType entityType)
         throws Exception {
         return submitAndSchedule(template, overlay, entityType, null, "", null);

http://git-wip-us.apache.org/repos/asf/falcon/blob/01a303e3/webapp/src/test/resources/startup.properties
----------------------------------------------------------------------
diff --git a/webapp/src/test/resources/startup.properties b/webapp/src/test/resources/startup.properties
index fd62bc4..1cfebab 100644
--- a/webapp/src/test/resources/startup.properties
+++ b/webapp/src/test/resources/startup.properties
@@ -32,6 +32,7 @@
 *.application.services=org.apache.falcon.security.AuthenticationInitializationService,\
                         org.apache.falcon.workflow.WorkflowJobEndNotificationService, \
                         org.apache.falcon.service.ProcessSubscriberService,\
+                        org.apache.falcon.extensions.ExtensionService,\
                         org.apache.falcon.service.FalconJPAService,\
                         org.apache.falcon.entity.store.ConfigurationStore,\
                         org.apache.falcon.rerun.service.RetryService,\
@@ -42,8 +43,7 @@
                         org.apache.falcon.notification.service.impl.SchedulerService,\
                         org.apache.falcon.notification.service.impl.AlarmService,\
                         org.apache.falcon.notification.service.impl.DataAvailabilityService,\
-                        org.apache.falcon.execution.FalconExecutionService,\
-                        org.apache.falcon.extensions.ExtensionService
+                        org.apache.falcon.execution.FalconExecutionService
 
 ##### Falcon Configuration Store Change listeners #####
 *.configstore.listeners=org.apache.falcon.entity.v0.EntityGraph,\


Mime
View raw message