Repository: incubator-trafodion Updated Branches: refs/heads/master f347e24fa -> f8856ebd2
Changes to a few script related sql message file and to lob startup. Includes change from Narendra for starting lob process when a node is intergrated. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fd560fbd Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fd560fbd Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fd560fbd Branch: refs/heads/master Commit: fd560fbd6eb58e30cefa212a33ed05be17a44800 Parents: 38fff5b Author: Sandhya Sundaresan <sand...@apache.org> Authored: Wed Nov 18 18:37:26 2015 +0000 Committer: Sandhya Sundaresan <sand...@apache.org> Committed: Wed Nov 18 18:37:26 2015 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/gensq.pl | 20 +++++++++++++++++++- core/sqf/sql/scripts/lobstart | 4 ++-- core/sqf/sql/scripts/makemsg.ksh | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fd560fbd/core/sqf/sql/scripts/gensq.pl ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/gensq.pl b/core/sqf/sql/scripts/gensq.pl index 73ee573..e826c99 100755 --- a/core/sqf/sql/scripts/gensq.pl +++ b/core/sqf/sql/scripts/gensq.pl @@ -479,6 +479,24 @@ sub genComponentWait { printScript(1, "fi\n"); } +sub genLOBConfig { + + # Generate sqconfig.db config for LOB. + # This allows the process startup daemon (pstartd) + # to start it up after a node failure. + for ($i=0; $i < $gdNumNodes; $i++) { + my $l_progname="mxlobsrvr"; + my $l_procargs=""; + my $l_procname="\$ZLOBSRV$i"; + my $l_procname_config = sprintf('$ZLOBSRV%d', $i); + my $l_stdout="stdout_\$ZLOBSRV_$i"; + addDbProcData($l_procname_config, "PERSIST_RETRIES", "10,60"); + addDbProcData($l_procname_config, "PERSIST_ZONES", $i); + addDbPersistProc($l_procname_config, $i, 1); + addDbProcDef( $ProcessType_Generic, $l_procname_config, $i, $l_progname, $l_stdout, $l_procargs); + } + +} sub genIdTmSrv { if ($SQ_IDTMSRV > 0) { @@ -1419,7 +1437,7 @@ while (<SRC>) { genIdTmSrv(); - + genLOBConfig(); genDTM(); generateRMS(); http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fd560fbd/core/sqf/sql/scripts/lobstart ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/lobstart b/core/sqf/sql/scripts/lobstart index a313673..8b8f4d4 100755 --- a/core/sqf/sql/scripts/lobstart +++ b/core/sqf/sql/scripts/lobstart @@ -30,8 +30,8 @@ let totalNodes=`grep 'Up' $tmp_node_status | wc -l` while [ ${count} -lt $totalNodes ] do sqshell -a > /dev/null << eof -set {process \zlobsrv${count} } PERSIST_RETRIES=10,60 -set {process \zlobsrv${count} } PERSIST_ZONES=0,1 +set {process \$zlobsrv${count} } PERSIST_RETRIES=10,60 +set {process \$zlobsrv${count} } PERSIST_ZONES=${count} exec {name \$zlobsrv${count}, nowait, nid ${count}, out stdout_\$ZLOBSRV${count} } mxlobsrvr eof echo Successfully started \$zlobsrv${count} http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fd560fbd/core/sqf/sql/scripts/makemsg.ksh ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/makemsg.ksh b/core/sqf/sql/scripts/makemsg.ksh index 85aae37..cdf6cb0 100755 --- a/core/sqf/sql/scripts/makemsg.ksh +++ b/core/sqf/sql/scripts/makemsg.ksh @@ -51,7 +51,7 @@ function GetSQcnfg { } -if [ -f $SQ_PDCP ]; then +if [ -n "$MY_NODES" -a -e $SQ_PDCP ]; then GetSQcnfg
