Repository: hive
Updated Branches:
  refs/heads/master b69e74d59 -> 6d8b9d2d7


HIVE-13916. Reduce max runtime for individual batches to 40 minutes. (Siddharth 
Seth, reviewed by Ashutosh Chauhan)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6d8b9d2d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6d8b9d2d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6d8b9d2d

Branch: refs/heads/master
Commit: 6d8b9d2d70c7f4ac9fc8c18333cf3419994754a8
Parents: b69e74d
Author: Siddharth Seth <ss...@apache.org>
Authored: Thu Jun 2 12:16:21 2016 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Thu Jun 2 12:16:21 2016 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hive/ptest/execution/LocalCommand.java  | 4 ++--
 testutils/ptest2/src/main/resources/batch-exec.vm                | 4 ++--
 .../execution/TestScripts.testAlternativeTestJVM.approved.txt    | 4 ++--
 .../hive/ptest/execution/TestScripts.testBatch.approved.txt      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/6d8b9d2d/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java
 
b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java
index de9fe68..4d397ea 100644
--- 
a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java
+++ 
b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/LocalCommand.java
@@ -42,7 +42,7 @@ public class LocalCommand {
   public LocalCommand(Logger logger, OutputPolicy outputPolicy, String 
command) throws IOException {
     this.commandId = localCommandCounter.incrementAndGet();
     this.logger = logger;
-    logger.info("Starting LocalCommandId={}: {}" + commandId, command);
+    logger.info("Starting LocalCommandId={}: {}", commandId, command);
     stopwatch.start();
     process = new ProcessBuilder().command(new String[] {"bash", "-c", 
command}).redirectErrorStream(true).start();
     streamReader = new StreamReader(outputPolicy, process.getInputStream());
@@ -142,4 +142,4 @@ public class LocalCommand {
       }
     }
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/hive/blob/6d8b9d2d/testutils/ptest2/src/main/resources/batch-exec.vm
----------------------------------------------------------------------
diff --git a/testutils/ptest2/src/main/resources/batch-exec.vm 
b/testutils/ptest2/src/main/resources/batch-exec.vm
index 652084d..d8141b0 100644
--- a/testutils/ptest2/src/main/resources/batch-exec.vm
+++ b/testutils/ptest2/src/main/resources/batch-exec.vm
@@ -62,7 +62,7 @@ then
     testModule=./
   fi
   pushd $testModule
-  timeout 1h mvn -B test -Dmaven.repo.local=$localDir/$instanceName/maven \
+  timeout 40m mvn -B test -Dmaven.repo.local=$localDir/$instanceName/maven \
     $mavenArgs $mavenTestArgs $testArguments 1>$logDir/maven-test.txt 2>&1 
</dev/null &
 #[[
   pid=$!
@@ -70,7 +70,7 @@ then
   popd
 elif [[ "${buildTool}" == "ant" ]]
 then
-  timeout 1h ant ${antTestTarget} -Dtest.junit.output.format=xml \
+  timeout 40m ant ${antTestTarget} -Dtest.junit.output.format=xml \
     -Divy.default.ivy.user.dir=$localDir/$instanceName/ivy \
     -Divy.default.always.check.exact.revision=false \
     -Divy.cache.ttl.default=eternal -Divy.checkmodified=false \

http://git-wip-us.apache.org/repos/asf/hive/blob/6d8b9d2d/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
index 153e4e5..83bcbee 100644
--- 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
+++ 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt
@@ -61,7 +61,7 @@ then
     testModule=./
   fi
   pushd $testModule
-  timeout 1h mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
+  timeout 40m mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
     $mavenArgs $mavenTestArgs -Dtest=arg1 1>/some/log/dir/maven-test.txt 2>&1 
</dev/null &
 
   pid=$!
@@ -69,7 +69,7 @@ then
   popd
 elif [[ "ant" == "ant" ]]
 then
-  timeout 1h ant ${antTestTarget} -Dtest.junit.output.format=xml \
+  timeout 40m ant ${antTestTarget} -Dtest.junit.output.format=xml \
     -Divy.default.ivy.user.dir=/some/local/dir/instance-1/ivy \
     -Divy.default.always.check.exact.revision=false \
     -Divy.cache.ttl.default=eternal -Divy.checkmodified=false \

http://git-wip-us.apache.org/repos/asf/hive/blob/6d8b9d2d/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
index 1dee7e2..5705839 100644
--- 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
+++ 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt
@@ -61,7 +61,7 @@ then
     testModule=./
   fi
   pushd $testModule
-  timeout 1h mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
+  timeout 40m mvn -B test -Dmaven.repo.local=/some/local/dir/instance-1/maven \
     -Dant=arg1 $mavenTestArgs -Dtest=arg1 1>/some/log/dir/maven-test.txt 2>&1 
</dev/null &
 
   pid=$!
@@ -69,7 +69,7 @@ then
   popd
 elif [[ "maven" == "ant" ]]
 then
-  timeout 1h ant testonly -Dtest.junit.output.format=xml \
+  timeout 40m ant testonly -Dtest.junit.output.format=xml \
     -Divy.default.ivy.user.dir=/some/local/dir/instance-1/ivy \
     -Divy.default.always.check.exact.revision=false \
     -Divy.cache.ttl.default=eternal -Divy.checkmodified=false \

Reply via email to