From 8218119cdd8f7f9c3132814b203fff6e6fa8816a Mon Sep 17 00:00:00 2001 From: Matt Robertson Date: Tue, 14 Jun 2016 12:52:41 -0500 Subject: [PATCH 1/7] removed isi_run from script, as it can cause long delays in current 7.2 code When setting permissions, the script queries the user UID and group GID and sets it directly --- onefs/isilon_create_directories.sh | 31 +++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/onefs/isilon_create_directories.sh b/onefs/isilon_create_directories.sh index 92ee1d0..80d136b 100644 --- a/onefs/isilon_create_directories.sh +++ b/onefs/isilon_create_directories.sh @@ -61,9 +61,15 @@ function fixperm() { if [ "z$1" == "z" ] ; then echo "ERROR -- function fixperm needs directory owner group perm as an argument" else - isi_run -z $ZONEID chown $2 $1 - isi_run -z $ZONEID chown :$3 $1 - isi_run -z $ZONEID chmod $4 $1 + uid=$(getUserUid $2) + gid=$(getGroupGid $3) + chown $uid $1 + chown :$gid $1 + chmod $4 $1 + + #isi_run -z $ZONEIDchown $2 $1 + #isi_run -z $ZONEID chown :$3 $1 + #isi_run -z $ZONEID chmod $4 $1 fi } @@ -80,10 +86,25 @@ function getHdfsRoot() { function getAccessZoneId() { local zoneid - hdfsroot=$(isi zone zones view $1 | grep "Zone ID:" | cut -f2 -d :) - echo $hdfsroot + zoneid=$(isi zone zones view $1 | grep "Zone ID:" | cut -f2 -d :) + echo $zoneid +} + +#Params: Username +function getUserUid() { + local uid + uid=$(isi auth users view --zone $ZONE $1 | grep " UID" | cut -f2 -d :) + echo $uid } +#Params: GroupName +function getGroupGid() { + local gid + gid=$(isi auth groups view --zone $ZONE $1 | grep " GID:" | cut -f2 -d :) + echo $gid +} + + if [ "`uname`" != "Isilon OneFS" ]; then fatal "Script must be run on Isilon cluster as root." fi From cef7a7aa51b02325bf49c33442fd3e2723ee2aae Mon Sep 17 00:00:00 2001 From: Matt Robertson Date: Tue, 14 Jun 2016 13:59:24 -0500 Subject: [PATCH 2/7] added an append cluster option for users --- onefs/isilon_create_directories.sh | 8 +++++++- onefs/isilon_create_users.sh | 30 ++++++++++++++++++------------ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/onefs/isilon_create_directories.sh b/onefs/isilon_create_directories.sh index 80d136b..3224035 100644 --- a/onefs/isilon_create_directories.sh +++ b/onefs/isilon_create_directories.sh @@ -16,6 +16,7 @@ declare -a ERRORLIST=() DIST="" FIXPERM="n" ZONE="System" +CLUSTERNAME="" #set -x @@ -93,7 +94,7 @@ function getAccessZoneId() { #Params: Username function getUserUid() { local uid - uid=$(isi auth users view --zone $ZONE $1 | grep " UID" | cut -f2 -d :) + uid=$(isi auth users view --zone $ZONE $1$CLUSTERNAME | grep " UID" | cut -f2 -d :) echo $uid } @@ -132,6 +133,11 @@ while [ "z$1" != "z" ] ; do echo "Info: will fix permissions and owners on existing directories" FIXPERM="y" ;; + "--append-cluster-name" + shift + CLUSTERNAME="-$1" + echo "Info: will add clustername to end of usernames: $CLUSTERNAME" + ;; *) echo "ERROR -- unknown arg $1" usage ;; diff --git a/onefs/isilon_create_users.sh b/onefs/isilon_create_users.sh index 1b1e5b0..f4485ef 100755 --- a/onefs/isilon_create_users.sh +++ b/onefs/isilon_create_users.sh @@ -17,6 +17,7 @@ DIST="" STARTUID=1000 STARTGID=1000 ZONE="System" +CLUSTERNAME="" #set -x @@ -27,7 +28,7 @@ function banner() { } function usage() { - echo "$0 --dist [--startgid ] [--startuid ] [--zone ]" + echo "$0 --dist [--startgid ] [--startuid ] [--zone ] [--append-cluster-name ]" exit 1 } @@ -59,11 +60,11 @@ function uidInUse() { } function userExists() { - isi auth users view $1 --zone $2 > /dev/null 2>&1 + isi auth users view $1$CLUSTERNAME --zone $2 > /dev/null 2>&1 } function groupExists() { - isi auth groups view $1 --zone $2 > /dev/null 2>&1 + isi auth groups view $1$CLUSTERNAME --zone $2 > /dev/null 2>&1 } function gidInUse() { @@ -72,7 +73,7 @@ function gidInUse() { function getUidFromUser() { local uid - uid=$(isi auth users view $1 --zone $2 | awk '/^ *UID:/ {print $2}') + uid=$(isi auth users view $1$CLUSTERNAME --zone $2 | awk '/^ *UID:/ {print $2}') echo $uid } @@ -84,7 +85,7 @@ function getUserFromUid() { function getGidFromGroup() { local gid - gid=$(isi auth groups view $1 --zone $2 | awk '/^ *GID:/ {print $2}') + gid=$(isi auth groups view $1$CLUSTERNAME --zone $2 | awk '/^ *GID:/ {print $2}') echo $gid } @@ -140,6 +141,11 @@ while [ "z$1" != "z" ] ; do ZONE="$1" echo "Info: will put users in zone: $ZONE" ;; + "--append-cluster-name" + shift + CLUSTERNAME="-$1" + echo "Info: will add clustername to end of usernames: $CLUSTERNAME" + ;; *) echo "ERROR -- unknown arg $1" usage @@ -217,7 +223,7 @@ for user in $REQUIRED_USERS; do user=$(getUserFromUid $uid $ZONE) addError "UID $uid already in use by user $user in zone $ZONE" else - isi auth users create $user --uid $uid --primary-group $user --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user + isi auth users create $user$CLUSTERNAME --uid $uid --primary-group $user --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user [ $? -ne 0 ] && addError "Could not create user $user with uid $uid in zone $ZONE" fi uid=$(( $uid + 1 )) @@ -225,23 +231,23 @@ done for user in $SUPER_USERS; do for group in $SUPER_GROUPS; do - isi auth groups modify $group --add-user $user --zone $ZONE - [ $? -ne 0 ] && addError "Could not add user $user to $group group in zone $ZONE" + isi auth groups modify $group --add-user $user$CLUSTERNAME --zone $ZONE + [ $? -ne 0 ] && addError "Could not add user $user$CLUSTERNAME to $group group in zone $ZONE" done done # Special cases case "$DIST" in "cdh") - isi auth groups modify sqoop --add-user sqoop2 --zone $ZONE + isi auth groups modify sqoop --add-user sqoop2$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user sqoop2 to sqoop group in zone $ZONE" ;; "bi") - isi auth groups modify users --add-user hive --zone $ZONE + isi auth groups modify users$ --add-user hive$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user hive to users group in zone $ZONE" - isi auth groups modify hcat --add-user hive --zone $ZONE + isi auth groups modify hcat --add-user hive$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user hive to hcat group in zone $ZONE" - isi auth groups modify knox --add-user kafka --zone $ZONE + isi auth groups modify knox --add-user kafka$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user kafka to knox group in zone $ZONE" ;; esac From 63633177ab7c73f1f624581739bfb98dd76a568f Mon Sep 17 00:00:00 2001 From: Matt Robertson Date: Tue, 14 Jun 2016 14:13:47 -0500 Subject: [PATCH 3/7] fix param parsing --- onefs/isilon_create_directories.sh | 4 ++-- onefs/isilon_create_users.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/onefs/isilon_create_directories.sh b/onefs/isilon_create_directories.sh index 3224035..f28a4be 100644 --- a/onefs/isilon_create_directories.sh +++ b/onefs/isilon_create_directories.sh @@ -27,7 +27,7 @@ function banner() { } function usage() { - echo "$0 --dist [--zone ] [--fixperm]" + echo "$0 --dist [--zone ] [--fixperm] [--append-cluster-name ]" exit 1 } @@ -133,7 +133,7 @@ while [ "z$1" != "z" ] ; do echo "Info: will fix permissions and owners on existing directories" FIXPERM="y" ;; - "--append-cluster-name" + "--append-cluster-name") shift CLUSTERNAME="-$1" echo "Info: will add clustername to end of usernames: $CLUSTERNAME" diff --git a/onefs/isilon_create_users.sh b/onefs/isilon_create_users.sh index f4485ef..04fe79e 100755 --- a/onefs/isilon_create_users.sh +++ b/onefs/isilon_create_users.sh @@ -141,7 +141,7 @@ while [ "z$1" != "z" ] ; do ZONE="$1" echo "Info: will put users in zone: $ZONE" ;; - "--append-cluster-name" + "--append-cluster-name") shift CLUSTERNAME="-$1" echo "Info: will add clustername to end of usernames: $CLUSTERNAME" From ddabfa18c0eb86f90b8f7ed247e3b6594924ded3 Mon Sep 17 00:00:00 2001 From: Matt Robertson Date: Tue, 14 Jun 2016 14:59:38 -0500 Subject: [PATCH 4/7] added a -p to the mkdir cmd, was failing on creating the system/yarn/node-labels folder --- onefs/isilon_create_directories.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onefs/isilon_create_directories.sh b/onefs/isilon_create_directories.sh index f28a4be..5550465 100644 --- a/onefs/isilon_create_directories.sh +++ b/onefs/isilon_create_directories.sh @@ -54,7 +54,7 @@ function makedir() { if [ "z$1" == "z" ] ; then echo "ERROR -- function makedir needs directory as an argument" else - mkdir $1 + mkdir -p $1 fi } From 9438bc1d86ea8fad77c67b3bef8426e5ab181e81 Mon Sep 17 00:00:00 2001 From: Matt Robertson Date: Tue, 14 Jun 2016 15:40:08 -0500 Subject: [PATCH 5/7] also add cluster name suffix to groups --- onefs/isilon_create_directories.sh | 2 +- onefs/isilon_create_users.sh | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/onefs/isilon_create_directories.sh b/onefs/isilon_create_directories.sh index 5550465..a17a456 100644 --- a/onefs/isilon_create_directories.sh +++ b/onefs/isilon_create_directories.sh @@ -101,7 +101,7 @@ function getUserUid() { #Params: GroupName function getGroupGid() { local gid - gid=$(isi auth groups view --zone $ZONE $1 | grep " GID:" | cut -f2 -d :) + gid=$(isi auth groups view --zone $ZONE $1$CLUSTERNAME | grep " GID:" | cut -f2 -d :) echo $gid } diff --git a/onefs/isilon_create_users.sh b/onefs/isilon_create_users.sh index 04fe79e..8fa04ac 100755 --- a/onefs/isilon_create_users.sh +++ b/onefs/isilon_create_users.sh @@ -206,8 +206,8 @@ for group in $REQUIRED_GROUPS; do group=$(getGroupFromGid $gid $ZONE) addError "GID $gid already in use by group $group in zone $ZONE" else - isi auth groups create $group --gid $gid --zone $ZONE - [ $? -ne 0 ] && addError "Could not create group $group with gid $gid in zone $ZONE" + isi auth groups create $group$CLUSTERNAME --gid $gid --zone $ZONE + [ $? -ne 0 ] && addError "Could not create group $group$CLUSTERNAME with gid $gid in zone $ZONE" fi gid=$(( $gid + 1 )) done @@ -218,36 +218,36 @@ for user in $REQUIRED_USERS; do # echo "DEBUG: UID=$uid" if userExists $user $ZONE ; then uid=$(getUidFromUser $user $ZONE) - addError "User $user already exists at uid $uid in zone $ZONE" + addError "User $user$CLUSTERNAME already exists at uid $uid in zone $ZONE" elif uidInUse $uid $ZONE ; then user=$(getUserFromUid $uid $ZONE) - addError "UID $uid already in use by user $user in zone $ZONE" + addError "UID $uid already in use by user $user$CLUSTERNAME in zone $ZONE" else - isi auth users create $user$CLUSTERNAME --uid $uid --primary-group $user --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user - [ $? -ne 0 ] && addError "Could not create user $user with uid $uid in zone $ZONE" + isi auth users create $user$CLUSTERNAME --uid $uid --primary-group $user$CLUSTERNAME --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user + [ $? -ne 0 ] && addError "Could not create user $user$CLUSTERNAME with uid $uid in zone $ZONE" fi uid=$(( $uid + 1 )) done for user in $SUPER_USERS; do for group in $SUPER_GROUPS; do - isi auth groups modify $group --add-user $user$CLUSTERNAME --zone $ZONE - [ $? -ne 0 ] && addError "Could not add user $user$CLUSTERNAME to $group group in zone $ZONE" + isi auth groups modify $group$CLUSTERNAME --add-user $user$CLUSTERNAME --zone $ZONE + [ $? -ne 0 ] && addError "Could not add user $user$CLUSTERNAME to $group$CLUSTERNAME group in zone $ZONE" done done # Special cases case "$DIST" in "cdh") - isi auth groups modify sqoop --add-user sqoop2$CLUSTERNAME --zone $ZONE + isi auth groups modify sqoop$CLUSTERNAME --add-user sqoop2$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user sqoop2 to sqoop group in zone $ZONE" ;; "bi") - isi auth groups modify users$ --add-user hive$CLUSTERNAME --zone $ZONE + isi auth groups modify users$CLUSTERNAME --add-user hive$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user hive to users group in zone $ZONE" - isi auth groups modify hcat --add-user hive$CLUSTERNAME --zone $ZONE + isi auth groups modify hcat$CLUSTERNAME --add-user hive$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user hive to hcat group in zone $ZONE" - isi auth groups modify knox --add-user kafka$CLUSTERNAME --zone $ZONE + isi auth groups modify knox$CLUSTERNAME --add-user kafka$CLUSTERNAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user kafka to knox group in zone $ZONE" ;; esac From 357bb952d98d676ea65837799469ee8f8f6c83da Mon Sep 17 00:00:00 2001 From: Matt Robertson Date: Tue, 14 Jun 2016 16:08:43 -0500 Subject: [PATCH 6/7] fixed groups --- onefs/isilon_create_users.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onefs/isilon_create_users.sh b/onefs/isilon_create_users.sh index 8fa04ac..664a14d 100755 --- a/onefs/isilon_create_users.sh +++ b/onefs/isilon_create_users.sh @@ -223,7 +223,7 @@ for user in $REQUIRED_USERS; do user=$(getUserFromUid $uid $ZONE) addError "UID $uid already in use by user $user$CLUSTERNAME in zone $ZONE" else - isi auth users create $user$CLUSTERNAME --uid $uid --primary-group $user$CLUSTERNAME --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user + isi auth users create $user$CLUSTERNAME --uid $uid --primary-group $user$CLUSTERNAME --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user$CLUSTERNAME [ $? -ne 0 ] && addError "Could not create user $user$CLUSTERNAME with uid $uid in zone $ZONE" fi uid=$(( $uid + 1 )) From 01aaa978ca9d16b8e657eba65d766c11eea0ed66 Mon Sep 17 00:00:00 2001 From: Matt Robertson Date: Tue, 14 Jun 2016 17:35:04 -0500 Subject: [PATCH 7/7] simplified the cluster_name append, applied to folder paths that begin with /user/ --- onefs/isilon_create_directories.sh | 32 ++++++++++------------ onefs/isilon_create_users.sh | 44 ++++++++++++++++-------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/onefs/isilon_create_directories.sh b/onefs/isilon_create_directories.sh index a17a456..c877f86 100644 --- a/onefs/isilon_create_directories.sh +++ b/onefs/isilon_create_directories.sh @@ -16,7 +16,7 @@ declare -a ERRORLIST=() DIST="" FIXPERM="n" ZONE="System" -CLUSTERNAME="" +CLUSTER_NAME="" #set -x @@ -67,10 +67,6 @@ function fixperm() { chown $uid $1 chown :$gid $1 chmod $4 $1 - - #isi_run -z $ZONEIDchown $2 $1 - #isi_run -z $ZONEID chown :$3 $1 - #isi_run -z $ZONEID chmod $4 $1 fi } @@ -85,23 +81,19 @@ function getHdfsRoot() { echo $hdfsroot } -function getAccessZoneId() { - local zoneid - zoneid=$(isi zone zones view $1 | grep "Zone ID:" | cut -f2 -d :) - echo $zoneid -} - #Params: Username +#returns: UID function getUserUid() { local uid - uid=$(isi auth users view --zone $ZONE $1$CLUSTERNAME | grep " UID" | cut -f2 -d :) + uid=$(isi auth users view --zone $ZONE $1 | grep " UID" | cut -f2 -d :) echo $uid } #Params: GroupName +#returns: GID function getGroupGid() { local gid - gid=$(isi auth groups view --zone $ZONE $1$CLUSTERNAME | grep " GID:" | cut -f2 -d :) + gid=$(isi auth groups view --zone $ZONE $1 | grep " GID:" | cut -f2 -d :) echo $gid } @@ -135,8 +127,8 @@ while [ "z$1" != "z" ] ; do ;; "--append-cluster-name") shift - CLUSTERNAME="-$1" - echo "Info: will add clustername to end of usernames: $CLUSTERNAME" + CLUSTER_NAME="-$1" + echo "Info: will add clustername to end of usernames: $CLUSTER_NAME" ;; *) echo "ERROR -- unknown arg $1" usage @@ -306,9 +298,6 @@ case "$DIST" in ;; esac -ZONEID=$(getAccessZoneId $ZONE) -echo "Info: Access Zone ID is $ZONEID" - HDFSROOT=$(getHdfsRoot $ZONE) echo "Info: HDFS root dir is $HDFSROOT" @@ -327,6 +316,13 @@ prefix=0 for direntry in ${dirList[*]}; do read -a specs <<<"$(echo $direntry | sed 's/#/ /g')" + + if [[ ${specs[0]} == /user/* ]] ; then + specs[0]="${specs[0]}$CLUSTER_NAME" + fi + specs[2]="${specs[2]}$CLUSTER_NAME" + specs[3]="${specs[3]}$CLUSTER_NAME" + echo "DEBUG: specs dirname ${specs[0]}; perm ${specs[1]}; owner ${specs[2]}; group ${specs[3]}" ifspath=$HDFSROOT${specs[0]} # echo "DEBUG: ifspath = $ifspath" diff --git a/onefs/isilon_create_users.sh b/onefs/isilon_create_users.sh index 664a14d..4f576df 100755 --- a/onefs/isilon_create_users.sh +++ b/onefs/isilon_create_users.sh @@ -17,7 +17,7 @@ DIST="" STARTUID=1000 STARTGID=1000 ZONE="System" -CLUSTERNAME="" +CLUSTER_NAME="" #set -x @@ -51,7 +51,7 @@ function yesno() { [ -n "$1" ] || myPrompt=">>> Please enter yes/no: " read -rp "$myPrompt" yn [ "z${yn:0:1}" = "zy" -o "z${yn:0:1}" = "zY" ] && return 0 -# exit "DEBUG: returning false from function yesno" +# exit ": returning false from function yesno" return 1 } @@ -60,11 +60,11 @@ function uidInUse() { } function userExists() { - isi auth users view $1$CLUSTERNAME --zone $2 > /dev/null 2>&1 + isi auth users view $1 --zone $2 > /dev/null 2>&1 } function groupExists() { - isi auth groups view $1$CLUSTERNAME --zone $2 > /dev/null 2>&1 + isi auth groups view $1 --zone $2 > /dev/null 2>&1 } function gidInUse() { @@ -73,7 +73,7 @@ function gidInUse() { function getUidFromUser() { local uid - uid=$(isi auth users view $1$CLUSTERNAME --zone $2 | awk '/^ *UID:/ {print $2}') + uid=$(isi auth users view $1 --zone $2 | awk '/^ *UID:/ {print $2}') echo $uid } @@ -85,7 +85,7 @@ function getUserFromUid() { function getGidFromGroup() { local gid - gid=$(isi auth groups view $1$CLUSTERNAME --zone $2 | awk '/^ *GID:/ {print $2}') + gid=$(isi auth groups view $1 --zone $2 | awk '/^ *GID:/ {print $2}') echo $gid } @@ -143,8 +143,8 @@ while [ "z$1" != "z" ] ; do ;; "--append-cluster-name") shift - CLUSTERNAME="-$1" - echo "Info: will add clustername to end of usernames: $CLUSTERNAME" + CLUSTER_NAME="-$1" + echo "Info: will add clustername to end of usernames: $CLUSTER_NAME" ;; *) echo "ERROR -- unknown arg $1" @@ -199,6 +199,7 @@ echo "Info: HDFS root: $HDFSROOT" gid=$STARTGID for group in $REQUIRED_GROUPS; do # echo "DEBUG: GID=$gid" + group="$group$CLUSTER_NAME" if groupExists $group $ZONE ; then gid=$(getGidFromGroup $group $ZONE) addError "Group $group already exists at gid $gid in zone $ZONE" @@ -206,8 +207,8 @@ for group in $REQUIRED_GROUPS; do group=$(getGroupFromGid $gid $ZONE) addError "GID $gid already in use by group $group in zone $ZONE" else - isi auth groups create $group$CLUSTERNAME --gid $gid --zone $ZONE - [ $? -ne 0 ] && addError "Could not create group $group$CLUSTERNAME with gid $gid in zone $ZONE" + isi auth groups create $group --gid $gid --zone $ZONE + [ $? -ne 0 ] && addError "Could not create group $group with gid $gid in zone $ZONE" fi gid=$(( $gid + 1 )) done @@ -216,38 +217,41 @@ done uid=$STARTUID for user in $REQUIRED_USERS; do # echo "DEBUG: UID=$uid" + user="$user$CLUSTER_NAME" if userExists $user $ZONE ; then uid=$(getUidFromUser $user $ZONE) - addError "User $user$CLUSTERNAME already exists at uid $uid in zone $ZONE" + addError "User $user already exists at uid $uid in zone $ZONE" elif uidInUse $uid $ZONE ; then user=$(getUserFromUid $uid $ZONE) - addError "UID $uid already in use by user $user$CLUSTERNAME in zone $ZONE" + addError "UID $uid already in use by user $user in zone $ZONE" else - isi auth users create $user$CLUSTERNAME --uid $uid --primary-group $user$CLUSTERNAME --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user$CLUSTERNAME - [ $? -ne 0 ] && addError "Could not create user $user$CLUSTERNAME with uid $uid in zone $ZONE" + isi auth users create $user --uid $uid --primary-group $user --zone $ZONE --provider local --home-directory $HDFSROOT/user/$user + [ $? -ne 0 ] && addError "Could not create user $user with uid $uid in zone $ZONE" fi uid=$(( $uid + 1 )) done for user in $SUPER_USERS; do + user="$user$CLUSTER_NAME" for group in $SUPER_GROUPS; do - isi auth groups modify $group$CLUSTERNAME --add-user $user$CLUSTERNAME --zone $ZONE - [ $? -ne 0 ] && addError "Could not add user $user$CLUSTERNAME to $group$CLUSTERNAME group in zone $ZONE" + group="$group$CLUSTER_NAME" + isi auth groups modify $group --add-user $user --zone $ZONE + [ $? -ne 0 ] && addError "Could not add user $user to $group group in zone $ZONE" done done # Special cases case "$DIST" in "cdh") - isi auth groups modify sqoop$CLUSTERNAME --add-user sqoop2$CLUSTERNAME --zone $ZONE + isi auth groups modify sqoop$CLUSTER_NAME --add-user sqoop2$CLUSTER_NAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user sqoop2 to sqoop group in zone $ZONE" ;; "bi") - isi auth groups modify users$CLUSTERNAME --add-user hive$CLUSTERNAME --zone $ZONE + isi auth groups modify users$CLUSTER_NAME --add-user hive$CLUSTER_NAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user hive to users group in zone $ZONE" - isi auth groups modify hcat$CLUSTERNAME --add-user hive$CLUSTERNAME --zone $ZONE + isi auth groups modify hcat$CLUSTER_NAME --add-user hive$CLUSTER_NAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user hive to hcat group in zone $ZONE" - isi auth groups modify knox$CLUSTERNAME --add-user kafka$CLUSTERNAME --zone $ZONE + isi auth groups modify knox$CLUSTER_NAME --add-user kafka$CLUSTER_NAME --zone $ZONE [ $? -ne 0 ] && addError "Could not add user kafka to knox group in zone $ZONE" ;; esac