Repository: hive
Updated Branches:
  refs/heads/master d7e2745ea -> 4340d4619


HIVE-14781. ptest killall command does not work. (Siddharth Seth, reviewed by 
Prasanth Jayachandran)


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

Branch: refs/heads/master
Commit: 4340d4619ec10594a2ad6b4189b4656ec1cfbc8b
Parents: d7e2745
Author: Siddharth Seth <ss...@apache.org>
Authored: Mon Sep 19 11:19:05 2016 -0700
Committer: Siddharth Seth <ss...@apache.org>
Committed: Mon Sep 19 11:19:05 2016 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hive/ptest/execution/Phase.java     | 2 +-
 .../execution/TestExecutionPhase.testFailingQFile.approved.txt   | 4 ++--
 .../TestExecutionPhase.testFailingUnitTest.approved.txt          | 4 ++--
 .../TestExecutionPhase.testPassingQFileTest.approved.txt         | 4 ++--
 .../TestExecutionPhase.testPassingUnitTest.approved.txt          | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/4340d461/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Phase.java
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Phase.java 
b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Phase.java
index 47633ec..c049d65 100644
--- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Phase.java
+++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/Phase.java
@@ -137,7 +137,7 @@ public abstract class Phase {
   protected List<RemoteCommandResult> initalizeHost(HostExecutor hostExecutor)
       throws Exception {
     List<RemoteCommandResult> results = Lists.newArrayList();
-    results.add(hostExecutor.exec("killall -q -9 -f java || true").get());
+    results.add(hostExecutor.exec("killall -q -9 java || true").get());
     TimeUnit.SECONDS.sleep(1);
     // order matters in all of these so block
     results.addAll(toListOfResults(hostExecutor.execInstances("rm -rf 
$localDir/$instanceName/scratch $localDir/$instanceName/logs")));

http://git-wip-us.apache.org/repos/asf/hive/blob/4340d461/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingQFile.approved.txt
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingQFile.approved.txt
 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingQFile.approved.txt
index 586da0a..bb85e9e 100644
--- 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingQFile.approved.txt
+++ 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingQFile.approved.txt
@@ -4,11 +4,11 @@
 /tmp/hive-ptest-units/TestExecutionPhase/logs/failed/driver-sometest 
/some/local/dir/somehost-someuser-0/logs/
 /tmp/hive-ptest-units/TestExecutionPhase/scratch/hiveptest-driver-sometest.sh 
/some/local/dir/somehost-someuser-0/scratch/hiveptest-driver-sometest.sh
 bash /some/local/dir/somehost-someuser-0/scratch/hiveptest-driver-sometest.sh
-killall -q -9 -f java || true
+killall -q -9 java || true
 mkdir -p /some/local/dir/somehost-someuser-0/logs 
/some/local/dir/somehost-someuser-0/maven 
/some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/ivy 
/some/local/dir/somehost-someuser-0/repositoryName-source
 mkdir -p /some/local/dir/somehost-someuser-1/logs 
/some/local/dir/somehost-someuser-1/maven 
/some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/ivy 
/some/local/dir/somehost-someuser-1/repositoryName-source
 rm -rf /some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/logs
 rm -rf /some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/logs
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/ivy /some/local/dir/somehost-someuser-1/
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/maven /some/local/dir/somehost-someuser-1/
-rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/
\ No newline at end of file
+rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/

http://git-wip-us.apache.org/repos/asf/hive/blob/4340d461/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingUnitTest.approved.txt
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingUnitTest.approved.txt
 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingUnitTest.approved.txt
index 97b66af..02d1426 100644
--- 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingUnitTest.approved.txt
+++ 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testFailingUnitTest.approved.txt
@@ -4,11 +4,11 @@
 /tmp/hive-ptest-units/TestExecutionPhase/logs/failed/1_driver 
/some/local/dir/somehost-someuser-0/logs/
 /tmp/hive-ptest-units/TestExecutionPhase/scratch/hiveptest-1_driver.sh 
/some/local/dir/somehost-someuser-0/scratch/hiveptest-1_driver.sh
 bash /some/local/dir/somehost-someuser-0/scratch/hiveptest-1_driver.sh
-killall -q -9 -f java || true
+killall -q -9 java || true
 mkdir -p /some/local/dir/somehost-someuser-0/logs 
/some/local/dir/somehost-someuser-0/maven 
/some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/ivy 
/some/local/dir/somehost-someuser-0/repositoryName-source
 mkdir -p /some/local/dir/somehost-someuser-1/logs 
/some/local/dir/somehost-someuser-1/maven 
/some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/ivy 
/some/local/dir/somehost-someuser-1/repositoryName-source
 rm -rf /some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/logs
 rm -rf /some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/logs
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/ivy /some/local/dir/somehost-someuser-1/
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/maven /some/local/dir/somehost-someuser-1/
-rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/
\ No newline at end of file
+rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/

http://git-wip-us.apache.org/repos/asf/hive/blob/4340d461/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingQFileTest.approved.txt
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingQFileTest.approved.txt
 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingQFileTest.approved.txt
index 83991d2..7f1dd9c 100644
--- 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingQFileTest.approved.txt
+++ 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingQFileTest.approved.txt
@@ -4,11 +4,11 @@
 /tmp/hive-ptest-units/TestExecutionPhase/logs/succeeded/driver-sometest 
/some/local/dir/somehost-someuser-0/logs/
 /tmp/hive-ptest-units/TestExecutionPhase/scratch/hiveptest-driver-sometest.sh 
/some/local/dir/somehost-someuser-0/scratch/hiveptest-driver-sometest.sh
 bash /some/local/dir/somehost-someuser-0/scratch/hiveptest-driver-sometest.sh
-killall -q -9 -f java || true
+killall -q -9 java || true
 mkdir -p /some/local/dir/somehost-someuser-0/logs 
/some/local/dir/somehost-someuser-0/maven 
/some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/ivy 
/some/local/dir/somehost-someuser-0/repositoryName-source
 mkdir -p /some/local/dir/somehost-someuser-1/logs 
/some/local/dir/somehost-someuser-1/maven 
/some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/ivy 
/some/local/dir/somehost-someuser-1/repositoryName-source
 rm -rf /some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/logs
 rm -rf /some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/logs
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/ivy /some/local/dir/somehost-someuser-1/
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/maven /some/local/dir/somehost-someuser-1/
-rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/
\ No newline at end of file
+rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/

http://git-wip-us.apache.org/repos/asf/hive/blob/4340d461/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingUnitTest.approved.txt
----------------------------------------------------------------------
diff --git 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingUnitTest.approved.txt
 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingUnitTest.approved.txt
index 9cb4715..e7cb292 100644
--- 
a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingUnitTest.approved.txt
+++ 
b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.testPassingUnitTest.approved.txt
@@ -4,11 +4,11 @@
 /tmp/hive-ptest-units/TestExecutionPhase/logs/succeeded/1_driver 
/some/local/dir/somehost-someuser-0/logs/
 /tmp/hive-ptest-units/TestExecutionPhase/scratch/hiveptest-1_driver.sh 
/some/local/dir/somehost-someuser-0/scratch/hiveptest-1_driver.sh
 bash /some/local/dir/somehost-someuser-0/scratch/hiveptest-1_driver.sh
-killall -q -9 -f java || true
+killall -q -9 java || true
 mkdir -p /some/local/dir/somehost-someuser-0/logs 
/some/local/dir/somehost-someuser-0/maven 
/some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/ivy 
/some/local/dir/somehost-someuser-0/repositoryName-source
 mkdir -p /some/local/dir/somehost-someuser-1/logs 
/some/local/dir/somehost-someuser-1/maven 
/some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/ivy 
/some/local/dir/somehost-someuser-1/repositoryName-source
 rm -rf /some/local/dir/somehost-someuser-0/scratch 
/some/local/dir/somehost-someuser-0/logs
 rm -rf /some/local/dir/somehost-someuser-1/scratch 
/some/local/dir/somehost-someuser-1/logs
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/ivy /some/local/dir/somehost-someuser-1/
 rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/maven /some/local/dir/somehost-someuser-1/
-rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/
\ No newline at end of file
+rsync -qaPe --delete --delete-during --force 
/some/local/dir/somehost-someuser-0/repositoryName-source 
/some/local/dir/somehost-someuser-1/

Reply via email to