hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [1/4] hbase git commit: HBASE-15145 HBCK and Replication should authenticate to zookepeer using server principal
Date Tue, 26 Jan 2016 23:31:10 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 70fb2e5aa -> 6d56ecfcf
  refs/heads/branch-1.1 04c29b6b3 -> aa5dfae30
  refs/heads/branch-1.2 cf1eaea78 -> b71c3db1f
  refs/heads/master de62ad150 -> d4610df32


HBASE-15145 HBCK and Replication should authenticate to zookepeer using server principal


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

Branch: refs/heads/master
Commit: d4610df32e9e28ad1623f9256e0ccdd0094e2c3b
Parents: de62ad1
Author: Enis Soztutar <enis@apache.org>
Authored: Tue Jan 26 14:43:24 2016 -0800
Committer: Enis Soztutar <enis@apache.org>
Committed: Tue Jan 26 14:43:24 2016 -0800

----------------------------------------------------------------------
 bin/hbase           | 9 +++++++++
 bin/hbase-config.sh | 5 +++++
 2 files changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d4610df3/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 7742b5b..7faaa26 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -77,6 +77,7 @@ if [ $# = 0 ]; then
   echo "Options:"
   echo "  --config DIR    Configuration direction to use. Default: ./conf"
   echo "  --hosts HOSTS   Override the list in 'regionservers' file"
+  echo "  --auth-as-server Authenticate to ZooKeeper using servers configuration"
   echo ""
   echo "Commands:"
   echo "Some commands take arguments. Pass no args or -h for usage."
@@ -280,6 +281,14 @@ else
 	HBASE_OPTS="$HBASE_OPTS $CLIENT_GC_OPTS"
 fi
 
+if [ "$AUTH_AS_SERVER" == "true" ] || [ "$COMMAND" = "hbck" ]; then
+   if [ -n "$HBASE_SERVER_JAAS_OPTS" ]; then
+     HBASE_OPTS="$HBASE_OPTS $HBASE_SERVER_JAAS_OPTS"
+   else
+     HBASE_OPTS="$HBASE_OPTS $HBASE_REGIONSERVER_OPTS"
+   fi
+fi
+
 # figure out which class to run
 if [ "$COMMAND" = "shell" ] ; then
   # eg export JRUBY_HOME=/usr/local/share/jruby

http://git-wip-us.apache.org/repos/asf/hbase/blob/d4610df3/bin/hbase-config.sh
----------------------------------------------------------------------
diff --git a/bin/hbase-config.sh b/bin/hbase-config.sh
index c113adb..d7d7e6f 100644
--- a/bin/hbase-config.sh
+++ b/bin/hbase-config.sh
@@ -61,6 +61,11 @@ do
     hosts=$1
     shift
     HBASE_REGIONSERVERS=$hosts
+  elif [ "--auth-as-server" = "$1" ]
+  then
+    shift
+    # shellcheck disable=SC2034
+    AUTH_AS_SERVER="true"
   else
     # Presume we are at end of options and break
     break


Mime
View raw message