sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jar...@apache.org
Subject sqoop git commit: SQOOP-2474: Fix the problem in the integration test case Derby1_99_4UpgradeTest
Date Fri, 14 Aug 2015 14:49:07 GMT
Repository: sqoop
Updated Branches:
  refs/heads/sqoop2 269029625 -> 719e3aa96


SQOOP-2474: Fix the problem in the integration test case Derby1_99_4UpgradeTest

(Colin Ma via Jarek Jarcec Cecho)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/719e3aa9
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/719e3aa9
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/719e3aa9

Branch: refs/heads/sqoop2
Commit: 719e3aa9664a5203a6c3dfd7ed1bc4cd08953754
Parents: 2690296
Author: Jarek Jarcec Cecho <jarcec@apache.org>
Authored: Fri Aug 14 07:48:14 2015 -0700
Committer: Jarek Jarcec Cecho <jarcec@apache.org>
Committed: Fri Aug 14 07:48:14 2015 -0700

----------------------------------------------------------------------
 pom.xml                                                          | 4 ++++
 .../apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java    | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/719e3aa9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e283c0e..b1dbdc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -736,6 +736,10 @@ limitations under the License.
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>2.18.1</version>
+          <configuration>
+            <!-- See SQOOP-2120 for details about use of -XX:-UseSplitVerifier -->
+            <argLine>-Xms512m -Xmx2g -XX:MaxPermSize=1024m -XX:-UseSplitVerifier</argLine>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

http://git-wip-us.apache.org/repos/asf/sqoop/blob/719e3aa9/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
b/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
index 9f7301b..18a4b12 100644
--- a/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
+++ b/test/src/main/java/org/apache/sqoop/test/minicluster/TomcatSqoopMiniCluster.java
@@ -99,6 +99,10 @@ public class TomcatSqoopMiniCluster extends SqoopMiniCluster {
     Map<String, String> map = new HashMap<String, String>((Map) System.getProperties());
     container.setSystemProperties(map);
 
+    // Set the timeout for the container, the default value will cause the
+    // problem described in SQOOP-2474
+    container.setTimeout(600000L);
+
     // Propagate Hadoop jars to the container classpath
     // In real world, they would be installed manually by user
     List<String> extraClassPath = new LinkedList<String>();


Mime
View raw message