Fixes after merge to latest in shared fork.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f3daa45e Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f3daa45e Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f3daa45e Branch: refs/heads/master Commit: f3daa45e4bad66ebff326d34610c73a04c0cda0b Parents: b565fb7 Author: Zalo Correa <[email protected]> Authored: Wed Mar 28 18:51:44 2018 -0700 Committer: Zalo Correa <[email protected]> Committed: Wed Mar 28 18:51:44 2018 -0700 ---------------------------------------------------------------------- core/sqf/export/include/seabed/ms.h | 1 + core/sqf/monitor/test/monitor.env | 79 +++++++++++++++++++++ core/sqf/monitor/test/runtest | 28 ++++---- core/sqf/monitor/test/sqconfig.monitor.cluster | 39 ---------- core/sqf/sql/scripts/monitor.env | 20 +++--- core/sqf/src/seabed/src/labelmaps.cpp | 4 ++ 6 files changed, 108 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/f3daa45e/core/sqf/export/include/seabed/ms.h ---------------------------------------------------------------------- diff --git a/core/sqf/export/include/seabed/ms.h b/core/sqf/export/include/seabed/ms.h index b82bace..d1c095b 100644 --- a/core/sqf/export/include/seabed/ms.h +++ b/core/sqf/export/include/seabed/ms.h @@ -427,6 +427,7 @@ typedef enum { MS_ReqType_PNodeInfo, MS_ReqType_ProcessInfo, MS_ReqType_ProcessInfoCont, + MS_ReqType_ProcessInfoNs, MS_ReqType_Set, MS_ReqType_Shutdown, MS_ReqType_ShutdownNs, http://git-wip-us.apache.org/repos/asf/trafodion/blob/f3daa45e/core/sqf/monitor/test/monitor.env ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/test/monitor.env b/core/sqf/monitor/test/monitor.env new file mode 100644 index 0000000..bc50bfc --- /dev/null +++ b/core/sqf/monitor/test/monitor.env @@ -0,0 +1,79 @@ +# @@@ START COPYRIGHT @@@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# @@@ END COPYRIGHT @@@ + +# Monitor process run mode: +# +# AGENT - monitor process runs in agent mode versus MPI collective +# +# Uncomment the next three environment variables +#export SQ_MON_RUN_MODE=AGENT +#export MONITOR_COMM_PORT=23390 +#export 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 + +# Uncomment MON_TRACE_ENABLE and specific tracing level to enable +# Trafodion monitor process tracing +#MON_TRACE_ENABLE=1 +#MON_TRACE_EVLOG_MSG=1 +#MON_TRACE_INIT=1 +#MON_TRACE_RECOVERY=1 +#MON_TRACE_REQUEST=1 +#MON_TRACE_PROCESS=1 +#MON_TRACE_NOTICE=1 +#MON_TRACE_NS=1 +#MON_TRACE_SYNC=1 +# Enable TC_TRACE_* along with MON_TRACE_TRAFCONFIG for more detail +#MON_TRACE_TRAFCONFIG=1 +#MON_TRACE_MLIO=1 + +#MON_TRACE_REQUEST_DETAIL=1 +#MON_TRACE_PROCESS_DETAIL=1 +#MON_TRACE_NOTICE_DETAIL=1 +#MON_TRACE_SYNC_DETAIL=1 +#MON_TRACE_MLIO_DETAIL=1 + +#MON_TRACE_TMSYNC=1 +#MON_TRACE_STATS=1 +#MON_TRACE_ENTRY_EXIT=1 +#MON_TRACE_REDIRECTION=1 +#MON_TRACE_HEALTH=1 +#MON_TRACE_SIG_HANDLER=1 + +# Uncomment TC_TRACE_ENABLE and specific tracing level to enable +# Trafodion Configuration library tracing +# TC_TRACE_ENABLE requires MON_TRACE_TRAFCONFIG above +#TC_TRACE_ENABLE=1 +#TC_TRACE_REQUEST=1 +#TC_TRACE_NODE=1 +#TC_TRACE_PERSIST=1 +#TC_TRACE_REGISTRY=1 +#TC_TRACE_INIT=1 +#TC_TRACE_LOG_MSG=1 +#TC_TRACE_ENTRY_EXIT=1 http://git-wip-us.apache.org/repos/asf/trafodion/blob/f3daa45e/core/sqf/monitor/test/runtest ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/test/runtest b/core/sqf/monitor/test/runtest index 1d7929e..a31e7a0 100755 --- a/core/sqf/monitor/test/runtest +++ b/core/sqf/monitor/test/runtest @@ -174,7 +174,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -213,7 +213,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -244,7 +244,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -286,7 +286,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -321,7 +321,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -345,7 +345,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -375,7 +375,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -411,7 +411,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -442,7 +442,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -475,7 +475,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -510,7 +510,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -534,7 +534,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -560,7 +560,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof @@ -585,7 +585,7 @@ shell <<eof exit eof if ( [ $test '==' -1 ] ); then -shell <<eof +shell -a<<eof shutdown exit eof http://git-wip-us.apache.org/repos/asf/trafodion/blob/f3daa45e/core/sqf/monitor/test/sqconfig.monitor.cluster ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/test/sqconfig.monitor.cluster b/core/sqf/monitor/test/sqconfig.monitor.cluster index 00a361e..8cd3b75 100644 --- a/core/sqf/monitor/test/sqconfig.monitor.cluster +++ b/core/sqf/monitor/test/sqconfig.monitor.cluster @@ -44,42 +44,3 @@ begin overflow hdd $TRAF_VAR #sdd /sdd/directory end overflow - -#============================ -# Audit configuration -#============================ - -# Extents are for data audit volumes only, not $TLOG -# Minimum is 1550 -begin at_extent_size -15500 -end at_extent_size - -# Files per volume are for data audit volumes only, not $TLOG -# Minimum is 10 -begin at_files_per_volume -10 -end at_files_per_volume - -# Percentage of audit allowed before TX is DOOMED -# Maximum is 40 -begin tx_capacity_threshold -10 -end tx_capacity_threshold - -#============================ -# Volume Configuration -#============================ - -begin tmase -$TLOG 0 /database/sqft2 /databasem/sqft2 -end tmase - -begin ase -$AUD000 1 /database/sqft2 /databasem/sqft2 -end ase - -begin tse -$SYSTEM 2 /database/sqft2 /databasem/sqft2 -$DB0000 3 /database/sqft2 /databasem/sqft2 -end tse http://git-wip-us.apache.org/repos/asf/trafodion/blob/f3daa45e/core/sqf/sql/scripts/monitor.env ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/monitor.env b/core/sqf/sql/scripts/monitor.env index fc10c1f..a9172b8 100644 --- a/core/sqf/sql/scripts/monitor.env +++ b/core/sqf/sql/scripts/monitor.env @@ -21,21 +21,21 @@ # Uncomment MON_TRACE_ENABLE and specific tracing level to enable # Trafodion monitor process tracing -MON_TRACE_ENABLE=1 -MON_TRACE_EVLOG_MSG=1 -MON_TRACE_INIT=1 -MON_TRACE_RECOVERY=1 -MON_TRACE_REQUEST=1 -MON_TRACE_PROCESS=1 -MON_TRACE_NOTICE=1 -MON_TRACE_NS=1 +#MON_TRACE_ENABLE=1 +#MON_TRACE_EVLOG_MSG=1 +#MON_TRACE_INIT=1 +#MON_TRACE_RECOVERY=1 +#MON_TRACE_REQUEST=1 +#MON_TRACE_PROCESS=1 +#MON_TRACE_NOTICE=1 +#MON_TRACE_NS=1 #MON_TRACE_SYNC=1 # Enable TC_TRACE_* along with MON_TRACE_TRAFCONFIG for more detail #MON_TRACE_TRAFCONFIG=1 #MON_TRACE_MLIO=1 -MON_TRACE_REQUEST_DETAIL=1 -MON_TRACE_PROCESS_DETAIL=1 +#MON_TRACE_REQUEST_DETAIL=1 +#MON_TRACE_PROCESS_DETAIL=1 #MON_TRACE_NOTICE_DETAIL=1 #MON_TRACE_SYNC_DETAIL=1 #MON_TRACE_MLIO_DETAIL=1 http://git-wip-us.apache.org/repos/asf/trafodion/blob/f3daa45e/core/sqf/src/seabed/src/labelmaps.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/seabed/src/labelmaps.cpp b/core/sqf/src/seabed/src/labelmaps.cpp index 6d044e4..4e1dfdd 100644 --- a/core/sqf/src/seabed/src/labelmaps.cpp +++ b/core/sqf/src/seabed/src/labelmaps.cpp @@ -373,6 +373,7 @@ static const char *ga_ms_mon_req_type_labels[] = { "MS_ReqType_PNodeInfo", "MS_ReqType_ProcessInfo", "MS_ReqType_ProcessInfoCont", + "MS_ReqType_ProcessInfoNs", "MS_ReqType_Set", "MS_ReqType_Shutdown", "MS_ReqType_ShutdownNs", @@ -417,6 +418,7 @@ static const char *ga_ms_mon_req_type_short_labels[] = { "PNodeInfo", "ProcessInfo", "ProcessInfoCont", + "ProcessInfoNs", "Set", "Shutdown", "ShutdownNs", @@ -486,6 +488,7 @@ static const char *ga_sb_msmon_reply_type_labels[] = { "OpenInfo", "PNodeInfo", "ProcessInfo", + "ProcessInfoNs", "Stfsd", "Startup", "TmSync", @@ -610,6 +613,7 @@ static const char *ga_sb_utrace_api_mon_reqtype_labels[] = { "ReqType_PNodeInfo", "ReqType_ProcessInfo", "ReqType_ProcessInfoCont", + "ReqType_ProcessInfoNs", "ReqType_Set", "ReqType_Shutdown", "ReqType_ShutdownNs",
