You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2016/01/27 00:31:10 UTC
[1/4] hbase git commit: HBASE-15145 HBCK and Replication should
authenticate to zookepeer using server principal
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 <en...@apache.org>
Authored: Tue Jan 26 14:43:24 2016 -0800
Committer: Enis Soztutar <en...@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
[2/4] hbase git commit: HBASE-15145 HBCK and Replication should
authenticate to zookepeer using server principal
Posted by en...@apache.org.
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/6d56ecfc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6d56ecfc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6d56ecfc
Branch: refs/heads/branch-1
Commit: 6d56ecfcf7d7aa3a525076108c061455b5b5bb05
Parents: 70fb2e5
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Jan 26 14:43:24 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Jan 26 14:43:30 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/6d56ecfc/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index f4722ac..7901033 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."
@@ -281,6 +282,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/6d56ecfc/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
[4/4] hbase git commit: HBASE-15145 HBCK and Replication should
authenticate to zookepeer using server principal
Posted by en...@apache.org.
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/aa5dfae3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aa5dfae3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aa5dfae3
Branch: refs/heads/branch-1.1
Commit: aa5dfae303260d3d1f7c39233f67a6038b9fc6d2
Parents: 04c29b6
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Jan 26 14:43:24 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Jan 26 14:46:07 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/aa5dfae3/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 7b0d97b..c920f32 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/aa5dfae3/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
[3/4] hbase git commit: HBASE-15145 HBCK and Replication should
authenticate to zookepeer using server principal
Posted by en...@apache.org.
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/b71c3db1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b71c3db1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b71c3db1
Branch: refs/heads/branch-1.2
Commit: b71c3db1f39d092e1fbb0483ce17410c81094da3
Parents: cf1eaea
Author: Enis Soztutar <en...@apache.org>
Authored: Tue Jan 26 14:43:24 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Tue Jan 26 14:44:44 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/b71c3db1/bin/hbase
----------------------------------------------------------------------
diff --git a/bin/hbase b/bin/hbase
index 7b0d97b..c920f32 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/b71c3db1/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