[bigtop] branch branch-1.5 updated: BIGTOP-3515 - Backport HIVE-19231 (#749)

[iw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

iwasakims pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/branch-1.5 by this push:
     new 4ef54c6  BIGTOP-3515 - Backport HIVE-19231 (#749)
4ef54c6 is described below

commit 4ef54c699ddc9e88b1de29654e3d3f5eb5b93dab
Author: Luca Toscano <el...@users.noreply.github.com>
AuthorDate: Thu Mar 4 11:33:03 2021 +0100

    BIGTOP-3515 - Backport HIVE-19231 (#749)
    
    This patch is contained in the Hive 3.x branch, but not in the Hive 2.x one. It
    leads to subtle errors when executing Hive via Python or systemd, and
    having it fixed in the 1.5 branch would allow people to rebuild their
    packages if needed (we could update the docs about it).
---
 bigtop-packages/src/common/hive/patch6-HIVE-19231.diff | 14 ++++++++++++++
 bigtop.bom                                             |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bigtop-packages/src/common/hive/patch6-HIVE-19231.diff b/bigtop-packages/src/common/hive/patch6-HIVE-19231.diff
new file mode 100644
index 0000000..30710fc
--- /dev/null
+++ b/bigtop-packages/src/common/hive/patch6-HIVE-19231.diff
@@ -0,0 +1,14 @@
+diff --git a/bin/hive b/bin/hive
+index a7671c3950..508e73da75 100755
+--- a/bin/hive
++++ b/bin/hive
+@@ -351,7 +351,7 @@ fi
+ 
+ if [[ "$SERVICE" =~ ^(hiveserver2|beeline|cli)$ ]] ; then
+   # If process is backgrounded, don't change terminal settings
+-  if [[ ( ! $(ps -o stat= -p $$) =~ "+" ) && ! ( -p /dev/stdin ) ]]; then
++  if [[ ( ! $(ps -o stat= -p $$) =~ "+" ) && ! ( -p /dev/stdin ) && ( ! $(ps -o tty= -p $$) =~ "?" ) ]]; then
+     export HADOOP_CLIENT_OPTS="$HADOOP_CLIENT_OPTS -Djline.terminal=jline.UnsupportedTerminal"
+   fi
+ fi
+
diff --git a/bigtop.bom b/bigtop.bom
index 9f05c44..a01d715 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -180,7 +180,7 @@ bigtop {
     'hive' {
       name    = 'hive'
       relNotes = 'Apache Hive'
-      version { base = '2.3.6'; pkg = base; release = 1 }
+      version { base = '2.3.6'; pkg = base; release = 2 }
       tarball { destination = "apache-${name}-${version.base}-src.tar.gz"
                 source      = destination }
       url     { download_path = "/$name/$name-${version.base}/"