You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by st...@apache.org on 2017/07/20 15:42:29 UTC

hive git commit: HIVE-17090: spark.only.query.files are not being run by ptest (Sahil Takiar, reviewed by Sergio Pena)

Repository: hive
Updated Branches:
  refs/heads/master a96d9f71d -> 869ee7c2e


HIVE-17090: spark.only.query.files are not being run by ptest (Sahil Takiar, reviewed by Sergio Pena)


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

Branch: refs/heads/master
Commit: 869ee7c2eb44188891a97eb5bc7ec39a4fe168e2
Parents: a96d9f7
Author: Sahil Takiar <st...@cloudera.com>
Authored: Thu Jul 20 08:41:35 2017 -0700
Committer: Sahil Takiar <st...@cloudera.com>
Committed: Thu Jul 20 08:41:35 2017 -0700

----------------------------------------------------------------------
 .../ptest2/conf/deployed/master-mr2.properties  | 37 ++++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/869ee7c2/testutils/ptest2/conf/deployed/master-mr2.properties
----------------------------------------------------------------------
diff --git a/testutils/ptest2/conf/deployed/master-mr2.properties b/testutils/ptest2/conf/deployed/master-mr2.properties
index 05c0405..7a7dc7d 100644
--- a/testutils/ptest2/conf/deployed/master-mr2.properties
+++ b/testutils/ptest2/conf/deployed/master-mr2.properties
@@ -8,22 +8,23 @@ jiraUrl = https://issues.apache.org/jira
 jiraUser = hiveqa
 #jiraPassword = #TODO Set this value
 jenkinsURL = https://builds.apache.org/job
-logsURL = http://ec2-204-236-174-241.us-west-1.compute.amazonaws.com/logs/
+logsURL = http://104.198.109.242/logs/
 
 mavenArgs =
-mavenEnvOpts = -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128 
+#mavenEnvOpts = -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128
 mavenTestArgs =
 testCasePropertyName = test
 buildTool = maven
-javaHome = /usr/java/jdk1.8.0_25
-javaHomeForTests = /usr/java/jdk1.8.0_25
+javaHome = /usr/lib/jvm/java-8-openjdk-amd64
+javaHomeForTests = /usr/lib/jvm/java-8-openjdk-amd64
+#javaHomeForTests = /usr/java/jdk1.8.0_25
 unitTests.directories = ./
 additionalProfiles =
 
-unitTests.isolate =
+unitTests.isolate = TestAuthorizationPreEventListener TestDefaultHiveMetastoreAuthorizationProvider TestEmbeddedHiveMetaStore TestExecDriver TestHive TestHiveMetaStoreWithEnvironmentContext TestHiveRemote TestMetaStoreAuthorization TestMetaStoreEventListener TestRemoteHiveMetaStore TestRemoteHiveMetaStoreIpAddress TestRemoteUGIHiveMetaStoreIpAddress TestSetUGIOnBothClientServer TestSetUGIOnOnlyClient TestSetUGIOnOnlyServer TestZNodeSetUp TestHCatStorer TestHCatLoader TestHCatExternalDynamicPartitioned TestHCatMutablePartitioned TestHCatDynamicPartitioned TestHCatExternalPartitioned TestHCatMutableDynamicPartitioned
 
 # comes from build-command.xml excludes
-unitTests.exclude = TestSerDe TestHiveMetaStore TestHiveServer2Concurrency TestMiniSparkOnYarnCliDriver TestSparkCliDriver TestMultiSessionsHS2WithLocalClusterSpark TestJdbcWithLocalClusterSpark TestEncryptedHDFSCliDriver
+unitTests.exclude = TestSerDe TestHiveMetaStore TestHiveServer2Concurrency
 
 unitTests.batchSize=20
 
@@ -39,16 +40,17 @@ ut.hbase-handler.batchSize=0
 unitTests.module.metastore=metastore
 ut.metastore.batchSize=12
 
+
 unitTests.module.ql=ql
 ut.ql.batchSize=10
-ut.ql.skipBatching=TestDbTxnManager2 TestTxnCommands2WithSplitUpdateAndVectorization TestTxnCommands2WithSplitUpdate TestOrcFile TestTxnCommands2 TestCompactor TestInitiator TestWorker TestWorker2 TestExecDriver
+ut.ql.skipBatching=TestDbTxnManager2 TestTxnCommands2WithSplitUpdateAndVectorization TestTxnCommands2WithSplitUpdate
 
 unitTests.module.service=service
 ut.service.batchSize=8
 
 unitTests.module.itests.hive-unit=itests.hive-unit
 ut.itests.hive-unit.batchSize=9
-ut.itests.hive-unit.skipBatching=TestAcidOnTezWithSplitUpdate TestAcidOnTez TestMTQueries TestSchedulerQueue TestOperationLoggingAPIWithTez TestSSL TestJdbcDriver2 TestJdbcWithMiniHA TestJdbcWithMiniHS2 TestHBaseAggrStatsCacheIntegration TestEmbeddedHiveMetaStore TestRemoteHiveMetaStore TestSetUGIOnBothClientServer TestSetUGIOnOnlyClient TestSetUGIOnOnlyServer
+ut.itests.hive-unit.skipBatching=TestAcidOnTezWithSplitUpdate TestAcidOnTez TestMTQueries TestCompactor TestSchedulerQueue TestOperationLoggingAPIWithTez TestSSL TestJdbcDriver2 TestJdbcWithMiniHA TestJdbcWithMiniMr
 
 unitTests.module.itests.qtest=itests.qtest
 ut.itests.qtest.batchSize=9
@@ -56,17 +58,14 @@ ut.itests.qtest.skipBatching=TestCompareCliDriver TestContribCliDriver TestContr
 
 unitTests.module.hcatalog.core=hcatalog.core
 ut.hcatalog.core.batchSize=9
-ut.hcatalog.core.skipBatching=TestHCatExternalDynamicPartitioned TestHCatMutablePartitioned TestHCatDynamicPartitioned TestHCatExternalPartitioned TestHCatMutableDynamicPartitioned
 
-unitTests.module.hcatalog.hcatalog-pig-adapter=hcatalog.hcatalog-pig-adapter
-ut.hcatalog.hcatalog-pig-adapter.skipBatching=TestHCatStorer TestHCatLoader
 
 qFileTests = clientPositive miniMr clientNegative miniMrNegative hbasePositive miniTez spark miniLlap miniLlapLocal encryptedCli miniSparkOnYarn
 qFileTests.propertyFiles.mainProperties = itests/src/test/resources/testconfiguration.properties
 
 qFileTest.clientPositive.driver = TestCliDriver
 qFileTest.clientPositive.directory = ql/src/test/queries/clientpositive
-qFileTest.clientPositive.batchSize = 25
+qFileTest.clientPositive.batchSize = 30
 qFileTest.clientPositive.queryFilesProperty = qfile
 qFileTest.clientPositive.exclude = minimr
 qFileTest.clientPositive.groups.minimr = mainProperties.${minimr.query.files}
@@ -91,7 +90,7 @@ qFileTest.encryptedCli.groups.long = encryption_insert_partition_dynamic.q encry
 
 qFileTest.miniMrNegative.driver = TestNegativeMinimrCliDriver
 qFileTest.miniMrNegative.directory = ql/src/test/queries/clientnegative
-qFileTest.miniMrNegative.batchSize = 150
+qFileTest.miniMrNegative.batchSize = 1000
 qFileTest.miniMrNegative.queryFilesProperty = minimr.query.negative.files
 qFileTest.miniMrNegative.include = normal
 qFileTest.miniMrNegative.isolate = flaky
@@ -100,14 +99,14 @@ qFileTest.miniMrNegative.groups.normal = mainProperties.${minimr.query.negative.
 
 qFileTest.clientNegative.driver = TestNegativeCliDriver
 qFileTest.clientNegative.directory = ql/src/test/queries/clientnegative
-qFileTest.clientNegative.batchSize = 150
+qFileTest.clientNegative.batchSize = 400
 qFileTest.clientNegative.queryFilesProperty = qfile
 qFileTest.clientNegative.exclude = miniMrNormal failing
 # stats_aggregator_error_1.q fails in both negative client and minimr mode
 # Disable for HIVE-4941 as this tests runs via ant test
-#qFileTest.clientNegative.groups.failing = stats_aggregator_error_1.q 
+#qFileTest.clientNegative.groups.failing = stats_aggregator_error_1.q
 # normal are run via minimr
-qFileTest.clientNegative.groups.miniMrNormal = cluster_tasklog_retrieval.q minimr_broken_pipe.q mapreduce_stack_trace.q mapreduce_stack_trace_turnoff.q mapreduce_stack_trace_hadoop20.q mapreduce_stack_trace_turnoff_hadoop20.q
+qFileTest.clientNegative.groups.miniMrNormal = cluster_tasklog_retrieval.q minimr_broken_pipe.q mapreduce_stack_trace.q mapreduce_stack_trace_turnoff.q mapreduce_stack_trace_turnoff_hadoop20.q
 
 qFileTest.hbasePositive.driver = TestHBaseCliDriver
 qFileTest.hbasePositive.directory = hbase-handler/src/test/queries/positive
@@ -128,7 +127,7 @@ qFileTest.miniTez.groups.normal = mainProperties.${minitez.query.files} mainProp
 
 qFileTest.spark.driver = TestSparkCliDriver
 qFileTest.spark.directory = ql/src/test/queries/clientpositive
-qFileTest.spark.batchSize = 30
+qFileTest.spark.batchSize = 15
 qFileTest.spark.queryFilesProperty = qfile
 qFileTest.spark.include = normal
 qFileTest.spark.groups.normal = mainProperties.${spark.query.files}
@@ -138,11 +137,11 @@ qFileTest.miniSparkOnYarn.directory = ql/src/test/queries/clientpositive
 qFileTest.miniSparkOnYarn.batchSize = 20
 qFileTest.miniSparkOnYarn.queryFilesProperty = qfile
 qFileTest.miniSparkOnYarn.include = normal
-qFileTest.miniSparkOnYarn.groups.normal = mainProperties.${miniSparkOnYarn.query.files}
+qFileTest.miniSparkOnYarn.groups.normal = mainProperties.${miniSparkOnYarn.query.files} mainProperties.${spark.only.query.files}
 
 qFileTest.miniLlap.driver = TestMiniLlapCliDriver
 qFileTest.miniLlap.directory = ql/src/test/queries/clientpositive
-qFileTest.miniLlap.batchSize = 30
+qFileTest.miniLlap.batchSize = 15
 qFileTest.miniLlap.queryFilesProperty = qfile
 qFileTest.miniLlap.include = normal
 qFileTest.miniLlap.isolate = flaky