Enabled Name Server in monitor tests.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/38eb84e6 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/38eb84e6 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/38eb84e6 Branch: refs/heads/master Commit: 38eb84e69cb402746488b793d258b5bb798acd8d Parents: f3daa45 Author: Zalo Correa <[email protected]> Authored: Wed Mar 28 19:33:33 2018 -0700 Committer: Zalo Correa <[email protected]> Committed: Wed Mar 28 19:33:33 2018 -0700 ---------------------------------------------------------------------- core/sqf/monitor/linux/monitor.cxx | 5 +++-- core/sqf/monitor/test/monitor.env | 16 ++++++++-------- core/sqf/monitor/test/runtest | 28 ++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/38eb84e6/core/sqf/monitor/linux/monitor.cxx ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/linux/monitor.cxx b/core/sqf/monitor/linux/monitor.cxx index 4c67b15..77d7509 100755 --- a/core/sqf/monitor/linux/monitor.cxx +++ b/core/sqf/monitor/linux/monitor.cxx @@ -1622,12 +1622,13 @@ int main (int argc, char *argv[]) , CALL_COMP_GETVERS2(trafns), CommTypeString( CommType )); #else snprintf(buf, sizeof(buf), - "[CMonitor::main], %s, Started! CommType: %s (%s%s%s)\n" + "[CMonitor::main], %s, Started! CommType: %s (%s%s%s%s)\n" , CALL_COMP_GETVERS2(monitor) , CommTypeString( CommType ) , IsRealCluster?"RealCluster":"VirtualCluster" , IsAgentMode?"/AgentMode":"" - , IsMPIChild?"/MPIChild":"" ); + , IsMPIChild?"/MPIChild":"" + , NameServerEnabled?"/NameServerEnabled":"" ); #endif mon_log_write(MON_MONITOR_MAIN_3, SQ_LOG_INFO, buf); http://git-wip-us.apache.org/repos/asf/trafodion/blob/38eb84e6/core/sqf/monitor/test/monitor.env ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/test/monitor.env b/core/sqf/monitor/test/monitor.env index bc50bfc..b8cf913 100644 --- a/core/sqf/monitor/test/monitor.env +++ b/core/sqf/monitor/test/monitor.env @@ -25,18 +25,18 @@ # # Uncomment the next three environment variables #export SQ_MON_RUN_MODE=AGENT -#export MONITOR_COMM_PORT=23390 -#export MONITOR_SYNC_PORT=23380 +MONITOR_COMM_PORT=23390 +MONITOR_SYNC_PORT=23380 # # NAME-SERVER - to disable process replication and enable name-server # # Uncomment the next six environment variables -#export SQ_NAMESERVER_ENABLE=1 -#export NS_COMM_PORT=23370 -#export NS_SYNC_PORT=23360 -#export NS_M2N_COMM_PORT=23350 -#export MON2MON_COMM_PORT=23340 -#export MONITOR_COMM_PORT=23330 +SQ_NAMESERVER_ENABLE=1 +NS_COMM_PORT=23370 +NS_SYNC_PORT=23360 +NS_M2N_COMM_PORT=23350 +MON2MON_COMM_PORT=23340 +MONITOR_COMM_PORT=23330 # Uncomment MON_TRACE_ENABLE and specific tracing level to enable # Trafodion monitor process tracing http://git-wip-us.apache.org/repos/asf/trafodion/blob/38eb84e6/core/sqf/monitor/test/runtest ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/test/runtest b/core/sqf/monitor/test/runtest index a31e7a0..20c06a9 100755 --- a/core/sqf/monitor/test/runtest +++ b/core/sqf/monitor/test/runtest @@ -174,6 +174,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -213,6 +215,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -244,6 +248,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -286,6 +292,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -321,6 +329,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -345,6 +355,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -375,6 +387,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -411,6 +425,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -442,6 +458,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -475,6 +493,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -510,6 +530,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -534,6 +556,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -560,6 +584,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit @@ -585,6 +611,8 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then +shell -c ps +shell -c ps monitor shell -a<<eof shutdown exit
