[hive] branch master updated: HIVE-25764: Add reason for the compaction failure message (Peter Vary reviewed by Denys Kuzmenko) (#2836)

2021-12-12 Thread pvary
This is an automated email from the ASF dual-hosted git repository.

pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
 new bc9cb14  HIVE-25764: Add reason for the compaction failure message 
(Peter Vary reviewed by Denys Kuzmenko) (#2836)
bc9cb14 is described below

commit bc9cb14cf6e38b18022ccda0dd1f812d93e383a9
Author: pvary 
AuthorDate: Sun Dec 12 21:27:32 2021 +0100

HIVE-25764: Add reason for the compaction failure message (Peter Vary 
reviewed by Denys Kuzmenko) (#2836)
---
 ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java 
b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java
index bcd4833..a90e307 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Worker.java
@@ -722,7 +722,8 @@ public class Worker extends RemoteCompactorThread 
implements MetaStoreThread {
   LockRequest lockRequest = createLockRequest(ci, txnId);
   LockResponse res = msc.lock(lockRequest);
   if (res.getState() != LockState.ACQUIRED) {
-throw new TException("Unable to acquire lock(S) on " + 
ci.getFullPartitionName());
+throw new TException("Unable to acquire lock(s) on {" + 
ci.getFullPartitionName()
++ "}, status {" + res.getState() + "}, reason {" + 
res.getErrorMessage() + "}");
   }
   lockId = res.getLockid();
 


[hive] branch master updated: HIVE-25795: [CVE-2021-44228] Update log4j2 version to 2.15.0

2021-12-12 Thread sankarh
This is an automated email from the ASF dual-hosted git repository.

sankarh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
 new f577834  HIVE-25795: [CVE-2021-44228] Update log4j2 version to 2.15.0
f577834 is described below

commit f5778344034912fa47a770ca2917d95c9fcfff12
Author: guptanikhil007 
AuthorDate: Sun Dec 12 21:52:12 2021 +0530

HIVE-25795: [CVE-2021-44228] Update log4j2 version to 2.15.0

Signed-off-by: Sankar Hariappan 
Closes (#2863)
---
 bin/hive-config.sh   | 4 
 pom.xml  | 2 +-
 standalone-metastore/pom.xml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/hive-config.sh b/bin/hive-config.sh
index d52b84e..8381a25 100644
--- a/bin/hive-config.sh
+++ b/bin/hive-config.sh
@@ -68,3 +68,7 @@ export HIVE_AUX_JARS_PATH=$HIVE_AUX_JARS_PATH
 
 # Default to use 256MB 
 export HADOOP_HEAPSIZE=${HADOOP_HEAPSIZE:-256}
+
+# Disable the JNDI. This feature has critical RCE vulnerability.
+# when 2.x <= log4j.version <= 2.14.1
+export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS 
-Dlog4j2.formatMsgNoLookups=true"
diff --git a/pom.xml b/pom.xml
index 3f28653..adc6f34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
 
 0.9.3
 0.14.1
-2.13.2
+2.15.0
 2.5.0
 6.2.1.jre8
 8.0.27
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 9b3d3a3..bd331e3 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -91,7 +91,7 @@
 5.6.2
 0.9.3
 0.14.1
-2.13.2
+2.15.0
 3.3.3
 1.6.9