[impala] 02/03: IMPALA-9402: Relax bootstrap condition for PostgreSQL permission tweaks

[ta...@apache.org]

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

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

commit fa383b007154df7885784102af0ad801cb69406f
Author: Laszlo Gaal <la...@cloudera.com>
AuthorDate: Wed Feb 19 18:21:46 2020 +0100

    IMPALA-9402: Relax bootstrap condition for PostgreSQL permission tweaks
    
    bin/bootstrap_system.sh was looking for a strict combination of
    OS platform / pg_hba.conf location / default authN method
    when setting up the default Impala build environment.
    
    This combo proved to be too strict for CentOS 7.4 running with
    PostreSQL 9.2, and failed to set up this environment correctly,
    which lead to a failure in the dataload phase.
    
    The patch fixes the permission tweak for this combination by relaxing
    the initial condition where the tweak may be applied.
    
    Change-Id: I31cbee6c22f9c27b1ff2b9200bb356be14429f39
    Reviewed-on: http://gerrit.cloudera.org:8080/15243
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/bootstrap_system.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index aeba274..9d043d0 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -311,7 +311,7 @@ ubuntu sudo service postgresql stop
 # widely.
 ubuntu sudo sed -ri 's/local +all +all +peer/local all all trust/g' \
   /etc/postgresql/*/main/pg_hba.conf
-redhat sudo sed -ri 's/local +all +all +ident/local all all trust/g' \
+redhat sudo sed -ri 's/local +all +all +(ident|peer)/local all all trust/g' \
   /var/lib/pgsql/data/pg_hba.conf
 # Accept md5 passwords from localhost
 redhat sudo sed -i -e 's,\(host.*\)ident,\1md5,' /var/lib/pgsql/data/pg_hba.conf