diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml
index d504e17f54..f019570179 100644
--- a/data/conf/hive-site.xml
+++ b/data/conf/hive-site.xml
@@ -69,6 +69,11 @@
true
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml
index ecb3467021..71eb019f40 100644
--- a/data/conf/llap/hive-site.xml
+++ b/data/conf/llap/hive-site.xml
@@ -79,6 +79,11 @@
true
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/perf-reg/spark/hive-site.xml b/data/conf/perf-reg/spark/hive-site.xml
index 15ec63048e..eb47f541b5 100644
--- a/data/conf/perf-reg/spark/hive-site.xml
+++ b/data/conf/perf-reg/spark/hive-site.xml
@@ -48,6 +48,11 @@
false
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/perf-reg/tez/hive-site.xml b/data/conf/perf-reg/tez/hive-site.xml
index 2951f30531..d1d47d6e25 100644
--- a/data/conf/perf-reg/tez/hive-site.xml
+++ b/data/conf/perf-reg/tez/hive-site.xml
@@ -72,6 +72,11 @@
false
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/rlist/hive-site.xml b/data/conf/rlist/hive-site.xml
index 630e481edc..40ca39e0bc 100644
--- a/data/conf/rlist/hive-site.xml
+++ b/data/conf/rlist/hive-site.xml
@@ -63,6 +63,11 @@
true
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/spark/local/hive-site.xml b/data/conf/spark/local/hive-site.xml
index a56ce61785..9729209f30 100644
--- a/data/conf/spark/local/hive-site.xml
+++ b/data/conf/spark/local/hive-site.xml
@@ -49,6 +49,11 @@
true
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/spark/standalone/hive-site.xml b/data/conf/spark/standalone/hive-site.xml
index 27cbd07db2..e0c60cfd82 100644
--- a/data/conf/spark/standalone/hive-site.xml
+++ b/data/conf/spark/standalone/hive-site.xml
@@ -49,6 +49,11 @@
true
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/spark/yarn-cluster/hive-site.xml b/data/conf/spark/yarn-cluster/hive-site.xml
index 4ce6b10586..7cafb548c3 100644
--- a/data/conf/spark/yarn-cluster/hive-site.xml
+++ b/data/conf/spark/yarn-cluster/hive-site.xml
@@ -49,6 +49,11 @@
true
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.metastore.schema.verification
false
diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml
index 1aa8fa5984..d124e8fde4 100644
--- a/data/conf/tez/hive-site.xml
+++ b/data/conf/tez/hive-site.xml
@@ -67,6 +67,11 @@
true
+
+ datanucleus.connectionPool.maxPoolSize
+ 1
+
+
hive.exec.local.scratchdir
${test.tmp.dir}/localscratchdir/