You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by am...@apache.org on 2016/02/18 21:06:18 UTC
[1/4] incubator-trafodion git commit: [[ TRAFODION 1800 ]] Changes
for Backup/Restore
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 152367d1c -> 62d61d684
[[ TRAFODION 1800 ]] Changes for Backup/Restore
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/72318bc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/72318bc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/72318bc4
Branch: refs/heads/master
Commit: 72318bc45352ea53abc8d9ac7a6f888e029d6d82
Parents: 679efee
Author: Amanda Moran <am...@apache.com>
Authored: Tue Feb 2 17:56:54 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Tue Feb 2 17:56:54 2016 +0000
----------------------------------------------------------------------
install/installer/traf_add_sudoAccess | 42 ++++++++++++++++++++++++--
install/installer/traf_cloudera_mods98 | 15 +++++++++
install/installer/traf_config_check | 16 +++++++++-
install/installer/traf_config_setup | 14 ++++++++-
install/installer/traf_hortonworks_mods98 | 13 ++++++++
5 files changed, 96 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72318bc4/install/installer/traf_add_sudoAccess
----------------------------------------------------------------------
diff --git a/install/installer/traf_add_sudoAccess b/install/installer/traf_add_sudoAccess
index 303cc1e..9440977 100755
--- a/install/installer/traf_add_sudoAccess
+++ b/install/installer/traf_add_sudoAccess
@@ -24,17 +24,28 @@ TRAF_CONFIG=/etc/trafodion/trafodion_config
source $TRAF_CONFIG
sudoFile="trafodion"
-echo "***INFO: Creating $TRAF_USER sudo access file"
echo
+function haSudoAdd {
+
echo "## Trafodion Floating IP commands" > $sudoFile
echo "Cmnd_Alias IP = /sbin/ip" >> $sudoFile
echo "Cmnd_Alias ARP = /sbin/arping" >> $sudoFile
echo "## Allow Trafodion id to run commands needed to configure floating IP" >> $sudoFile
echo "%trafodion ALL = NOPASSWD: IP, ARP" >> $sudoFile
+}
+
+function backupRestore {
+
+echo "## Allow $BACKUP_USER id to run commands needed for backup and restore" >> $BACKUP_USER
+echo "%$BACKUP_USER ALL =(hbase) NOPASSWD: /usr/bin/hbase" >> $BACKUP_USER
+
+}
+function copyTrafFile {
+
if [[ $all_node_count -gt "1" ]]; then
$TRAF_PDCP $sudoFile $HOME
$TRAF_PDSH sudo cp $HOME/$sudoFile /etc/sudoers.d/
@@ -42,4 +53,31 @@ if [[ $all_node_count -gt "1" ]]; then
else
sudo cp $TRAF_USR /etc/sudoers.d
fi
-
+
+}
+
+function copyFile {
+
+if [[ $all_node_count -gt "1" ]]; then
+ $TRAF_PDCP $BACKUP_USER $HOME
+ $TRAF_PDSH sudo cp $HOME/$BACKUP_USER /etc/sudoers.d/
+ $TRAF_PDSH sudo rm -f $HOME/$BACKUP_USER
+else
+ sudo cp $BACKUP_USER /etc/sudoers.d
+fi
+
+}
+
+
+#Main
+echo "***INFO: Creating $TRAF_USER sudo access file"
+echo
+
+if [[ "$ENABLE_HA" == "Y" ]]; then
+ haSudoAdd
+ copyTrafFile
+fi
+
+backupRestore
+copyFile
+
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72318bc4/install/installer/traf_cloudera_mods98
----------------------------------------------------------------------
diff --git a/install/installer/traf_cloudera_mods98 b/install/installer/traf_cloudera_mods98
index ffb5354..b8da481 100755
--- a/install/installer/traf_cloudera_mods98
+++ b/install/installer/traf_cloudera_mods98
@@ -158,6 +158,21 @@ if [ $? != 0 ]; then
fi
sudo su $HDFS_USER --command "$HADOOP_BIN_PATH/hadoop fs -chown -R $TRAF_USER:trafodion /lobs"
+
+#Create Backup directory
+sudo su $HDFS_USER --command "$HADOOP_BIN_PATH/hadoop fs -mkdir /trafodion_backups" 2> $HOME/traf_temp_output
+if [ $? != 0 ]; then
+ # ok if directory already exists
+ dir_exists=$(grep "File exists" $HOME/traf_temp_output | wc -l)
+ if [ $dir_exists -eq 0 ]; then
+ echo "***ERROR: '$HADOOP_BIN_PATH/hadoop fs -mkdir /trafodion_backups' command failed"
+ echo "***ERROR: $(cat $LOCAL_WORKDIR/traf_temp_output)"
+ exit -1
+ fi
+fi
+sudo su $HDFS_USER --command "$HADOOP_BIN_PATH/hadoop fs -chown -R $TRAF_USER:trafodion /trafodion_backups"
+
+sudo su $HDFS_USER --command "$HADOOP_BIN_PATH/hadoop fs -chmod 777 /trafodion_backups"
#=====================================
# Modify hadoop settings as needed by Trafodion
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72318bc4/install/installer/traf_config_check
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_check b/install/installer/traf_config_check
index 9ef5fbe..95e3f4a 100755
--- a/install/installer/traf_config_check
+++ b/install/installer/traf_config_check
@@ -426,7 +426,7 @@ else
fi
done
fi
- export PATH="$PATH:$JAVA_HOME/bin"
+ export PATH=$PATH:$JAVA_HOME/bin
sudo chmod 777 $TRAF_CONFIG
sed -i '/PATH\=/d' $TRAF_CONFIG
echo "export PATH=\"$PATH\"" >>$TRAF_CONFIG
@@ -487,6 +487,18 @@ if [[ "$SUSE_LINUX" != "true" ]]; then
fi
}
+function checkBackupUser {
+
+if [ -z $BACKUP_USER ]; then
+ echo "***ERROR: BACKUP_USER variable not set in config file."
+ echo "***WARNING: BACKUP_USER will be set to trafodion."
+ sudo chmod 777 $TRAF_CONFIG
+ sudo "export BACKUP_USER=\"trafodion\"" >> $TRAF_CONFIG
+ sudo chmod 777 $TRAF_CONFIG
+fi
+
+}
+
function checkHadoopUserPass {
if [ -z $ADMIN ]; then
@@ -934,6 +946,8 @@ checkEPEL
checkHadoopSupport
+checkBackupUser
+
checkHadoopUserPass
checkHadoopURL
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72318bc4/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 6251c7b..1a9083a 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -394,6 +394,18 @@ echo "export REST_BUILD=\"$REST_BUILD\"" >> $LOCAL_TRAF_CONFIG
echo "export UTT_INSTALL=\"$UTT_INSTALL\"" >> $LOCAL_TRAF_CONFIG
#==============================================
+#Backup restore user
+
+echo -n "Enter Backup/Restore username (can be Trafodion), default is [$BACKUP_USER]: "
+read answer
+
+if [ -z $answer ]; then
+ echo "export BACKUP_USER=\"$BACKUP_USER\"" >> $LOCAL_TRAF_CONFIG
+else
+ echo "export BACKUP_USER=\"$answer\"" >> $LOCAL_TRAF_CONFIG
+fi
+
+#==============================================
#Hadoop user name
echo -n "Enter Hadoop admin username, default is [$ADMIN]: "
@@ -555,7 +567,7 @@ echo "export DCS_PRIMARY_MASTER_NODE=\"$DCS_PRIMARY_MASTER_NODE\"" >> $LOCAL_TRA
#==============================================
#Enable HA
-echo -n "Enable High Availability (Y/N), default is N: "
+echo -n "Enable High Avalability (Y/N), default is N: "
read answer
if [[ ! -z $answer ]]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/72318bc4/install/installer/traf_hortonworks_mods98
----------------------------------------------------------------------
diff --git a/install/installer/traf_hortonworks_mods98 b/install/installer/traf_hortonworks_mods98
index cc8a762..7d2be7e 100755
--- a/install/installer/traf_hortonworks_mods98
+++ b/install/installer/traf_hortonworks_mods98
@@ -174,6 +174,19 @@ if [ $? != 0 ]; then
fi
ssh -q -n $AMBARI_HOST 'sudo su hdfs --command "hadoop fs -chown -R' "$TRAF_USER"':trafodion /lobs"'
+ssh -q -n $AMBARI_HOST 'sudo su' "$HDFS_USER" '--command "hadoop fs -mkdir /trafodion_backups" 2> $HOME/traf_temp_output'
+if [ $? != 0 ]; then
+ # ok if directory already exists
+ dir_exists=$(ssh -q -n $AMBARI_HOST 'grep "File exists" $HOME/traf_temp_output | wc -l')
+ if [ $dir_exists -eq 0 ]; then
+ echo "***ERROR: 'hadoop fs -mkdir /trafodion_backups' command failed"
+ echo "***ERROR: $(ssh -q -n $AMBARI_HOST cat $HOME/traf_temp_output)"
+ exit -1
+ fi
+fi
+ssh -q -n $AMBARI_HOST 'sudo su' "$HDFS_USER" '--command "hadoop fs -chown -R' "$TRAF_USER"':trafodion /trafodion_backups"'
+
+
ssh -q -n $AMBARI_HOST 'rm -rf $HOME/traf_temp_output'
#=====================================
# change the hbase configuration using Ambari's script
[4/4] incubator-trafodion git commit: Merge PR-302
Posted by am...@apache.org.
Merge PR-302
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/62d61d68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/62d61d68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/62d61d68
Branch: refs/heads/master
Commit: 62d61d684b1bf5374870875129778f09b67b343d
Parents: 152367d 1969033
Author: Amanda Moran <am...@apache.org>
Authored: Thu Feb 18 19:56:25 2016 +0000
Committer: Amanda Moran <am...@apache.org>
Committed: Thu Feb 18 20:04:58 2016 +0000
----------------------------------------------------------------------
install/installer/traf_add_sudoAccess | 42 ++++++++++++++++++++++++--
install/installer/traf_cloudera_mods98 | 15 +++++++++
install/installer/traf_config_check | 16 +++++++++-
install/installer/traf_config_setup | 12 ++++++++
install/installer/traf_hortonworks_mods98 | 13 ++++++++
install/installer/trafodion_install | 4 +--
6 files changed, 96 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-trafodion git commit: Update traf_config_setup
Posted by am...@apache.org.
Update traf_config_setup
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/19690338
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/19690338
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/19690338
Branch: refs/heads/master
Commit: 196903388fb5d581b655d3c42014ef82ee7982c9
Parents: 71c9a72
Author: Amanda <am...@esgyn.com>
Authored: Tue Feb 2 11:55:11 2016 -0800
Committer: Amanda <am...@esgyn.com>
Committed: Tue Feb 2 11:55:11 2016 -0800
----------------------------------------------------------------------
install/installer/traf_config_setup | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/19690338/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 1a9083a..4837ca1 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -567,7 +567,7 @@ echo "export DCS_PRIMARY_MASTER_NODE=\"$DCS_PRIMARY_MASTER_NODE\"" >> $LOCAL_TRA
#==============================================
#Enable HA
-echo -n "Enable High Avalability (Y/N), default is N: "
+echo -n "Enable High Availability (Y/N), default is N: "
read answer
if [[ ! -z $answer ]]; then
[2/4] incubator-trafodion git commit: This script needs always run
with backup restore
Posted by am...@apache.org.
This script needs always run with backup restore
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/71c9a729
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/71c9a729
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/71c9a729
Branch: refs/heads/master
Commit: 71c9a729bdd1ec79d549aae7afe356ca9402777a
Parents: 72318bc
Author: Amanda Moran <am...@apache.com>
Authored: Tue Feb 2 19:50:25 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Tue Feb 2 19:50:25 2016 +0000
----------------------------------------------------------------------
install/installer/trafodion_install | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/71c9a729/install/installer/trafodion_install
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install
index 2ceaf36..4bb6649 100755
--- a/install/installer/trafodion_install
+++ b/install/installer/trafodion_install
@@ -710,9 +710,7 @@ sudo chmod 777 $TRAF_CONFIG
source $TRAF_CONFIG
copyConfig
-if [[ $ENABLE_HA == "true" ]]; then
- $LOCAL_WORKDIR/traf_add_sudoAccess
-fi
+$LOCAL_WORKDIR/traf_add_sudoAccess
#Set Max kernel pid