Applied review comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d5e3e843 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d5e3e843 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d5e3e843 Branch: refs/heads/master Commit: d5e3e843e010443f530c9010658c957f2b554fd3 Parents: 1cde250 Author: Anuradha Hegde <[email protected]> Authored: Tue Jan 5 21:35:28 2016 +0000 Committer: Anuradha Hegde <[email protected]> Committed: Tue Jan 5 21:35:28 2016 +0000 ---------------------------------------------------------------------- dcs/src/main/asciidoc/_chapters/configuration.adoc | 16 ++++++++-------- dcs/src/main/asciidoc/_chapters/ops_mgt.adoc | 8 ++++---- install/installer/cloud_cli_setup | 2 +- install/installer/dcs_installer | 10 +++++++++- install/installer/traf_config_setup | 17 ++++++++++------- install/installer/trafodion_config_default | 15 +++++++++++++++ install/installer/trafodion_install | 6 +++--- 7 files changed, 50 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d5e3e843/dcs/src/main/asciidoc/_chapters/configuration.adoc ---------------------------------------------------------------------- diff --git a/dcs/src/main/asciidoc/_chapters/configuration.adoc b/dcs/src/main/asciidoc/_chapters/configuration.adoc index b577c16..0eed4a5 100644 --- a/dcs/src/main/asciidoc/_chapters/configuration.adoc +++ b/dcs/src/main/asciidoc/_chapters/configuration.adoc @@ -127,13 +127,13 @@ All servers listed in this file will be started and stopped when DCS start or st The _backup-masters_ file lists all hosts that you would have running backup DcsMaster processes, one host per line. All servers listed in this file will be started -and stopped during DCS start or stop is run. +and stopped when DCS start or stop is run. ==== _master_ The _master_ file lists the host of the primary DcsMaster process. Only one host is allowed to be the primary master. The server listed in this file will be started -and stopped during DCS start or stop is run. +and stopped when DCS start or stop is run. ==== ZooKeeper and DCS See section <<zookeeper,Zookeeper>> for ZooKeeper setup for DCS. @@ -158,9 +158,9 @@ found in the _logs_ subdirectory. Check them out especially if DCS had trouble starting. DCS also puts up a UI listing vital attributes and metrics. By default its deployed on the DcsMaster -host at port 40010 (DcsServers put up an informational http server at 40030+their instance number). +host at port 24410 (DcsServers put up an informational http server at 24430+their instance number). If the DcsMaster were running on a host named `master.example.org` on the default port, to see the -DcsMaster's homepage you'd point your browser at _http://master.example.org:40010_. +DcsMaster's homepage you'd point your browser at _http://master.example.org:24410_. To stop DCS after exiting the DCS shell enter ---- @@ -304,7 +304,7 @@ include::../../../../target/asciidoc/dcs-default.adoc[] === _dcs-env.sh_ Set DCS environment variables in this file. Examples include options to pass the JVM on start of -an DCS daemon such as heap size and garbarge collector configs. You can also set configurations for DCS configuration, log directories, +an DCS daemon such as heap size and garbage collector configs. You can also set configurations for DCS configuration, log directories, niceness, ssh options, where to locate process pid files, etc. Open the file at _conf/dcs-env.sh_ and peruse its content. Each option is fairly well documented. Add your own environment variables here if you want them read by DCS daemons on startup. @@ -430,15 +430,15 @@ Use _rsync_ to copy the content of the _conf_ directory to all nodes of the clu == High Availability(HA) Configuration The master configuration file for DcsMaster may be configured by adding the host name to the _conf/master_ file. If the master is configured to start on the remote node then, during start of dcs the primary master will be started on the remote -node. If the _conf/master_ file is empty then the primary master will be the host where the dcs start script was run. +node. If the _conf/master_ file is empty then the primary master will be started on the host where the dcs start script was run. Similarly, DcsMaster backup servers may be configured by adding host names to the _conf/backup-masters_ file. They are started and stopped automatically by the _bin/master-backup.sh_ script whenever DCS is started or stopped. Every backup -DcsMaster follows the current leader DcsMaster watching for it to fail. If failure of the leader occurs the first +DcsMaster follows the current leader DcsMaster watching for it to fail. If failure of the leader occurs, first backup DcsMaster in line for succession checks to see if floating IP is enabled. If enabled it executes the _bin/scripts/dcsbind.sh_ script to add a floating IP address to an interface on its node. It then continues with normal initialization and eventually starts listening for new client connections. It may take several seconds for the take over to complete. When a failed node is restored a new DcsMaster backup may -be started manually by executing the _bin/dcs-daemon.sh_ script on the restored node +be started manually by executing the _bin/dcs-daemon.sh_ script on the restored node. ---- >bin/dcs-daemon.sh start master http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d5e3e843/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc ---------------------------------------------------------------------- diff --git a/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc b/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc index cd5ff50..250dd46 100644 --- a/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc +++ b/dcs/src/main/asciidoc/_chapters/ops_mgt.adoc @@ -38,13 +38,13 @@ Here we list tools for administration, analysis, and debugging. [[client-server-connectivity]] === DcsMaster and mxosrvr unable to communicate via the interface specified in _conf/_dcs_site.xml_ -Symptoms are: When connection are viewed using DCS webUI, the server state will be in "CONNECTING" and the state does not change to "CONNECTED". +Symptoms are: When connection are viewed using DCS webUI, the server will be in "CONNECTING" state and the state does not change to "CONNECTED". -When such issues are seen, validate network communication works by using the linux utility 'netstat(nc)'command. +When such issues are seen, validate network communication works by using the linux utility 'netcat(nc)'command. ---- -From the first node, type 'nc -l <any port number>'. This tells that the node (server) is listening on the specified port +From the first node, type 'nc -l <any port number>'. This utility is now running in server mode listening for incoming connections on the specified port. -From the second node, type ânc <external IP of the first node> <the listening port specified on the first node>â. Now the second node (client) trying to connect to the port. +From the second node, type ânc <external IP of the first node> <the listening port specified on the first node>â. Start entering some text on the client node and hit enter. The message you typed should reach the server on the first node. To exit , Press Ctrl-D , both the client and server will exit. http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d5e3e843/install/installer/cloud_cli_setup ---------------------------------------------------------------------- diff --git a/install/installer/cloud_cli_setup b/install/installer/cloud_cli_setup index a7a0d44..b58788c 100755 --- a/install/installer/cloud_cli_setup +++ b/install/installer/cloud_cli_setup @@ -50,7 +50,7 @@ if [[ ! -z $AWS_CLOUD ]]; then $HOME/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws fi - $TRAF_PDSH sudo rm -f $HOME/awscli-bundle + $TRAF_PDSH sudo rm -rf $HOME/awscli-bundle rm -f $HOME/awscli-bundle.zip ###### Execute 'aws configure' command as a Trafodion Id http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d5e3e843/install/installer/dcs_installer ---------------------------------------------------------------------- diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer index 4ebe06b..67cc72c 100755 --- a/install/installer/dcs_installer +++ b/install/installer/dcs_installer @@ -228,8 +228,16 @@ if [[ "$ENABLE_HA" == "true" ]]; then if [[ $node_count -gt 1 ]]; then $TRAF_PDCP $DCS_DIR/conf/dcs-site.xml $DCS_DIR/conf/dcs-site.xml $TRAF_PDCP $DCS_DIR/conf/backup-masters $DCS_DIR/conf/backup-masters - $TRAF_PDCP $SQ_ROOT/trafci/bin/trafci $SQ_ROOT/trafci/bin/trafci fi +else + ######Configure trafci wrapper script + sed -i -e "s/HNAME=localhost:23400/$DCS_PRIMARY_MASTER_NODE:23400/g" $SQ_ROOT/trafci/bin/trafci + +fi + +###### Copy trafci to all nodes in the cluster +if [[ $node_count -gt 1 ]]; then + $TRAF_PDCP $SQ_ROOT/trafci/bin/trafci $SQ_ROOT/trafci/bin/trafci fi http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d5e3e843/install/installer/traf_config_setup ---------------------------------------------------------------------- diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup index 4adb9b7..209e6bb 100755 --- a/install/installer/traf_config_setup +++ b/install/installer/traf_config_setup @@ -63,7 +63,12 @@ FLOATING_IP="" BACKUP_DCS_NODES="" LDAP_SECURITY="N" SCANNER_MODE="N" -DCS_PRIMARY_MASTER_NODE=`hostname` +DCS_PRIMARY_MASTER_NODE=`hostname -f` +CLOUD_CONFIG="N" +CLOUD_TYPE="" +AWS_CLOUD="" +OPEN_STACK="" +OTHER_CLOUD="" LDAP_LEVEL="0" #============================================== @@ -160,15 +165,13 @@ echo "export SQCONFIG=\"$SQCONFIG\"" >> $LOCAL_TRAF_CONFIG #============================================== #Check if customer is using cloud environment and get the type of cloud being used #Get the CLOUD_CONFIG and CLOUD_TYPE -echo -n "Is this a cloud environment (Y/N), default is N: " +echo -n "Is this a cloud environment (Y/N), default is [$CLOUD_CONFIG]: " read answer if [ ! -z $answer ]; then if [[ "${answer}" =~ ^[Yy]$ ]]; then CLOUD_CONFIG="Y" - fi - else - CLOUD_CONFIG="N" + fi fi echo "export CLOUD_CONFIG=\"$CLOUD_CONFIG\"" >> $LOCAL_TRAF_CONFIG @@ -177,7 +180,7 @@ if [[ "$CLOUD_CONFIG" == "Y" ]]; then echo -n "Specify the type of cloud being used (1: AWS(Amazon cloud), 2: OpenStack, 3: Other): " read answer1 if [[ -z "$answer1" ]]; then - echo "***ERROR: Must specify the type of Cloud being used." + echo "***ERROR: User must specify the type of Cloud being used." exit -1 else CLOUD_TYPE=$answer1 @@ -513,7 +516,7 @@ echo "export DCS_SERVERS_PARM=\"$DCS_SERVERS_PARM\"" >> $LOCAL_TRAF_CONFIG #============================================== #Get the node name where the customer would like to start DcsMaster process -echo -n "Specify the node of DcsMaster process, default [$DCS_PRIMARY_MASTER_NODE]: " +echo -n "Enter the node of primary DcsMaster, default [$DCS_PRIMARY_MASTER_NODE]: " read answer if [ ! -z $answer ]; then http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d5e3e843/install/installer/trafodion_config_default ---------------------------------------------------------------------- diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default index 6dd2b52..8e32879 100755 --- a/install/installer/trafodion_config_default +++ b/install/installer/trafodion_config_default @@ -154,3 +154,18 @@ export BACKUP_DCS_NODES="" #If HA enabled then set INTERFACE to match the interface of the floating ip export INTERFACE="" + +#Define if cloud environment is being used, if specified "Y" for CLOUD_CONFIG +#the please define the type of cloud (CLOUD_TYPE) being used +export CLOUD_CONFIG="N" + +#Define the type of cloud being used(1: AWS(Amazon cloud), 2: OpenStack, 3: Other) +export CLOUD_TYPE="" +#Based of cloud type, then set any of set one of following to true +export AWS_CLOUD="" +export OPEN_STACK="" +export CLOUD_OTHER="" + +#Specify the node name of primary DcsMaster node, Default is the host where +#dcs start script is run +export DCS_PRIMARY_MASTER_NODE=`hostname -f` http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d5e3e843/install/installer/trafodion_install ---------------------------------------------------------------------- diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install index 5ddb791..3567a5e 100755 --- a/install/installer/trafodion_install +++ b/install/installer/trafodion_install @@ -782,9 +782,9 @@ if [ ${PIPESTATUS[0]} != "0" ]; then exit -1 fi -# Installing and configuring CLI for Cloud environments -if [[ $CLOUD_CONFIG == "Y" ]]; then - echo "Installing and configure CLI for Cloud ($CLOUD_TYPE)" +# Install and configure CLI for Cloud environments +if [ "$ENABLE_HA" == "true" ] && [ $CLOUD_CONFIG == "Y" ]; then + echo "Install and configure CLI for Cloud ($CLOUD_TYPE)" $TRAF_WORKDIR/installer/cloud_cli_setup fi
