Skip to content

Commit 4d987f3

Browse files
HanTang1det101
authored andcommitted
Optimize shell scripts for one click account function
1 parent a7bc483 commit 4d987f3

File tree

6 files changed

+30
-14
lines changed

6 files changed

+30
-14
lines changed

dss-server/src/main/resources/linkis.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ wds.linkis.kerberos.kdc.user.name=
6767
wds.linkis.kerberos.kdc.user.password=
6868
wds.linkis.kerberos.ssh.port=22
6969
wds.dss.deploy.path=/usr/local/dss_linkis
70-
wds.dss.user.account.command.class=com.webank.wedatasphpere.dss.user.service.impl.LinuxUserCommand,com.webank.wedatasphpere.dss.user.service.impl.LdapCommand,com.webank.wedatasphpere.dss.user.service.impl.WorkspaceCommand,com.webank.wedatasphpere.dss.user.service.impl.KerberosCommand,com.webank.wedatasphpere.dss.user.service.impl.MetastoreCommand,com.webank.wedatasphpere.dss.user.service.impl.AzkabanCommand
70+
wds.dss.user.account.command.class=com.webank.wedatasphpere.dss.user.service.impl.LinuxUserCommand,com.webank.wedatasphpere.dss.user.service.impl.KerberosCommand,com.webank.wedatasphpere.dss.user.service.impl.LdapCommand,com.webank.wedatasphpere.dss.user.service.impl.WorkspaceCommand,com.webank.wedatasphpere.dss.user.service.impl.MetastoreCommand,com.webank.wedatasphpere.dss.user.service.impl.AzkabanCommand
7171

dss-user-manager/src/main/resources/default/AddschedulerUser.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ if grep -i "^${user}=" $installDir/token.properties;
1515
fi
1616
else
1717
echo "$user=$password" >> $installDir/token.properties
18-
fi
18+
fi
Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
#!/bin/bash
2-
2+
source /etc/profile
33
user=$1
44
dir=$2
55
echo $1 $2
6-
hdfs dfs -mkdir $dir
7-
hdfs dfs -chown $user:$user $dir
6+
id $user
7+
if [ $? -ne 0 ]; then
8+
sudo useradd $user -s /sbin/nologin
9+
echo "create user successfully"
10+
fi
11+
12+
hdfs dfs -mkdir -p $dir
13+
hdfs dfs -chown $user:$user $dir

dss-user-manager/src/main/resources/default/Kerberos.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
2+
source /etc/profile
33
#需要将当前登录用户,如dss加入到sudoers
44

55
#函数
@@ -62,7 +62,8 @@ gen_keytab(){
6262
generate_user $user
6363
sudo chown $user $CENTER_KEYTAB_PATH/$user.keytab
6464
sudo su - $user -c "kinit -kt $CENTER_KEYTAB_PATH/$user.keytab $principal"
65-
sudo su - op -c "crontab -l > conf && echo '* */12 * * * sudo -u $user kinit -kt $CENTER_KEYTAB_PATH/$user.keytab $principal' >> conf && crontab conf && rm -f conf"
65+
deployUser=`whoami`
66+
sudo su - $deployUser -c "crontab -l > conf && echo '* */12 * * * sudo -u $user kinit -kt $CENTER_KEYTAB_PATH/$user.keytab $principal' >> conf && crontab conf && rm -f conf"
6667
fi
6768
else
6869
echo "the $user.keytab does not exist, please check your previous steps!"
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/bash
2-
2+
source /etc/profile
33
user=$1
44
dir=$2
55
echo $1 $2;
6-
sudo mkdir $dir
7-
sudo chown $user:$user $dir
6+
id $user
7+
if [ $? -ne 0 ]; then
8+
useradd $user -s /sbin/nologin
9+
echo "create user successfully"
10+
fi
11+
sudo mkdir -p $dir
12+
sudo chown $user:$user $dir

dss-user-manager/src/main/resources/default/Metastore.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
2+
source /etc/profile
33
user_name=$1
44
db_name=$2
55
path=$3
@@ -22,16 +22,20 @@ if [[ $? -ne 0 ]]; then
2222
echo "create database failed!"
2323
else
2424
#修改数据库所属,将principal用户添加到metastore侧hive-site.xml hive.users.in.admin.role中
25-
hive -e "set role admin ; grant all on database $db_name to user $user_name"
26-
echo "grant database $db_name successfully!"
25+
if [ $kerberos_enable = "0" ]; then
26+
hive -e "grant all on database $db_name to user $user_name"
27+
else
28+
hive -e "set role admin; grant all on database $db_name to user $user_name"
29+
fi
2730
fi
2831

2932
#三、hdfs操作
3033
if [[ $? -ne 0 ]]; then
3134
#回滚
3235
hive -e "drop database $db_name"
33-
echo "rollback finished!"
36+
echo "grant database failed,rollback finished!"
3437
else
38+
echo "grant database $db_name successfully!"
3539
#修改hdfs路径所属
3640
hdfs dfs -chown $user_name:$user_name $path
3741
#修改hdfs路径权限

0 commit comments

Comments
 (0)