You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2018/06/16 17:09:47 UTC
[17/50] [abbrv] trafodion git commit: Fixes to SQ_NAMESERVER_ENABLED
token in scripts.
Fixes to SQ_NAMESERVER_ENABLED token in scripts.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/5d982b8a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/5d982b8a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/5d982b8a
Branch: refs/heads/master
Commit: 5d982b8a954e2afe323a75e750c41d828e9d8ec4
Parents: 9467a47
Author: Zalo Correa <za...@esgyn.com>
Authored: Thu Apr 5 08:44:40 2018 -0700
Committer: Zalo Correa <za...@esgyn.com>
Committed: Thu Apr 5 08:44:40 2018 -0700
----------------------------------------------------------------------
core/sqf/monitor/linux/reqopen.cxx | 4 ++--
core/sqf/monitor/test/monitor.env | 6 ++++--
core/sqf/sqenvcom.sh | 2 +-
core/sqf/src/trafconf/tcdbsqlite.cpp | 10 ++++++++++
4 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/5d982b8a/core/sqf/monitor/linux/reqopen.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/reqopen.cxx b/core/sqf/monitor/linux/reqopen.cxx
index 88022b9..a84e55f 100644
--- a/core/sqf/monitor/linux/reqopen.cxx
+++ b/core/sqf/monitor/linux/reqopen.cxx
@@ -287,7 +287,7 @@ bool CExtOpenReq::prepare()
, true, false, false );
}
else
- { // find by nid (check node state, don't check process state, backup is Ok)
+ { // find by pid (check node state, don't check process state, backup is Ok)
openerProcess = Nodes->GetProcess( msg_->u.request.u.open.nid
, msg_->u.request.u.open.pid
, msg_->u.request.u.open.verifier
@@ -315,7 +315,7 @@ bool CExtOpenReq::prepare()
, true, false, false );
}
else
- { // find by nid (check node state, don't check process state, backup is Ok)
+ { // find by pid (check node state, don't check process state, backup is Ok)
openedProcess = Nodes->GetProcess( msg_->u.request.u.open.target_nid
, msg_->u.request.u.open.target_pid
, msg_->u.request.u.open.target_verifier
http://git-wip-us.apache.org/repos/asf/trafodion/blob/5d982b8a/core/sqf/monitor/test/monitor.env
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/test/monitor.env b/core/sqf/monitor/test/monitor.env
index dd2cbb3..303dbf3 100644
--- a/core/sqf/monitor/test/monitor.env
+++ b/core/sqf/monitor/test/monitor.env
@@ -31,7 +31,7 @@ MONITOR_SYNC_PORT=23380
# NAME-SERVER - to disable process replication and enable name-server
#
# Uncomment the next six environment variables
-SQ_NAMESERVER_ENABLE=1
+SQ_NAMESERVER_ENABLED=1
NS_COMM_PORT=23370
NS_SYNC_PORT=23360
NS_M2N_COMM_PORT=23350
@@ -54,11 +54,12 @@ MON_TRACE_NS=1
#MON_TRACE_MLIO=1
#MON_TRACE_REQUEST_DETAIL=1
-MON_TRACE_PROCESS_DETAIL=1
+#MON_TRACE_PROCESS_DETAIL=1
#MON_TRACE_NOTICE_DETAIL=1
#MON_TRACE_SYNC_DETAIL=1
#MON_TRACE_MLIO_DETAIL=1
+MON_TRACE_MEAS
#MON_TRACE_TMSYNC=1
#MON_TRACE_STATS=1
#MON_TRACE_ENTRY_EXIT=1
@@ -77,3 +78,4 @@ MON_TRACE_PROCESS_DETAIL=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/5d982b8a/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index b8f425c..59d30cd 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -692,7 +692,7 @@ export SQ_STARTUP=r
# NAME-SERVER - to disable process replication and enable name-server
#
# Uncomment the next six environment variables
-#export SQ_NAMESERVER_ENABLE=1
+#export SQ_NAMESERVER_ENABLED=1
#export NS_COMM_PORT=23370
#export NS_SYNC_PORT=23360
#export NS_M2N_COMM_PORT=23350
http://git-wip-us.apache.org/repos/asf/trafodion/blob/5d982b8a/core/sqf/src/trafconf/tcdbsqlite.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/trafconf/tcdbsqlite.cpp b/core/sqf/src/trafconf/tcdbsqlite.cpp
index 4c1865a..9976c7a 100644
--- a/core/sqf/src/trafconf/tcdbsqlite.cpp
+++ b/core/sqf/src/trafconf/tcdbsqlite.cpp
@@ -1372,6 +1372,11 @@ int CTcdbSqlite::Initialize( void )
snprintf( dbase, sizeof(dbase)
, "%s/sql/scripts/sqconfig.db", getenv("TRAF_HOME"));
}
+ if (TcTraceSettings & (TC_TRACE_REGISTRY | TC_TRACE_REQUEST | TC_TRACE_INIT))
+ {
+ trace_printf( "%s@%d Opening SQLite database file %s\n"
+ , method_name, __LINE__, dbase );
+ }
int rc = sqlite3_open_v2( dbase, &db_
, SQLITE_OPEN_READWRITE | SQLITE_OPEN_FULLMUTEX
, NULL);
@@ -1379,6 +1384,11 @@ int CTcdbSqlite::Initialize( void )
{
db_ = NULL;
+ if (TcTraceSettings & (TC_TRACE_REGISTRY | TC_TRACE_REQUEST | TC_TRACE_INIT))
+ {
+ trace_printf( "%s@%d Opening SQLite database file sqconfig.db in current directory\n"
+ , method_name, __LINE__ );
+ }
// See if database is in current directory
int rc2 = sqlite3_open_v2( "sqconfig.db", &db_
, SQLITE_OPEN_READWRITE | SQLITE_OPEN_FULLMUTEX