You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/03/01 21:08:02 UTC
[4/6] trafodion git commit: More code review fixes.
More code review fixes.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/717f9c3d
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/717f9c3d
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/717f9c3d
Branch: refs/heads/master
Commit: 717f9c3d25870c02d8a719f9fc15e55c0d4f1be8
Parents: 3d7855b
Author: Zalo Correa <za...@esgyn.com>
Authored: Wed Feb 28 15:52:37 2018 -0800
Committer: Zalo Correa <za...@esgyn.com>
Committed: Wed Feb 28 15:52:37 2018 -0800
----------------------------------------------------------------------
core/sqf/monitor/linux/mlio.cxx | 1 -
core/sqf/monitor/linux/zclient.cxx | 11 ++++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/717f9c3d/core/sqf/monitor/linux/mlio.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/mlio.cxx b/core/sqf/monitor/linux/mlio.cxx
index 7db35ec..b62cd46 100644
--- a/core/sqf/monitor/linux/mlio.cxx
+++ b/core/sqf/monitor/linux/mlio.cxx
@@ -1263,7 +1263,6 @@ SQ_LocalIOToClient::SQ_LocalIOToClient(int nid)
if (trace_settings & TRACE_INIT)
{
int err = errno;
- char la_buf[MON_STRING_BUF_SIZE];
trace_printf( "%s@%d" " failed shmget(%d), errno=%d (%s)\n"
, method_name, __LINE__
, (shsize), err, strerror(err) );
http://git-wip-us.apache.org/repos/asf/trafodion/blob/717f9c3d/core/sqf/monitor/linux/zclient.cxx
----------------------------------------------------------------------
diff --git a/core/sqf/monitor/linux/zclient.cxx b/core/sqf/monitor/linux/zclient.cxx
index 1c133ca..0ca03b1 100644
--- a/core/sqf/monitor/linux/zclient.cxx
+++ b/core/sqf/monitor/linux/zclient.cxx
@@ -580,6 +580,7 @@ const char* CZClient::WaitForAndReturnMaster( bool doWait )
trace_printf( "%s@%d (MasterMonitor) Master Monitor found (%s)\n"
, method_name, __LINE__, masterMonitor.c_str() );
}
+ TRACE_EXIT;
return nodes.data[0];
}
@@ -1811,7 +1812,7 @@ int CZClient::WatchNodeMasterDelete( const char *nodeName )
// This is fine since we call it indiscriminately
if (trace_settings & (TRACE_INIT | TRACE_RECOVERY))
{
- trace_printf( "%s@%d (MasterMonitor) WatchNodeMasterDelete deleted %s, with rc == ZNONODE (fine)\n"
+ trace_printf( "%s@%d (MasterMonitor) WatchNodeMasterDelete already deleted %s, with rc == ZNONODE (fine)\n"
, method_name, __LINE__
, nodeName );
}
@@ -1821,15 +1822,15 @@ int CZClient::WatchNodeMasterDelete( const char *nodeName )
{
if (trace_settings & (TRACE_INIT | TRACE_RECOVERY))
{
- trace_printf( "%s@%d (MasterMonitor) WatchNodeMasterDelete deleted %s, with rc == ZOK\n"
+ trace_printf( "%s@%d (MasterMonitor) znode (%s) already deleted or cannot be accessed, rc=%d (%s)\n"
, method_name, __LINE__
- , nodeName );
+ , nodeName, rc, zerror(rc) );
}
rc = ZOK;
char buf[MON_STRING_BUF_SIZE];
snprintf( buf, sizeof(buf)
- , "[%s], znode (%s) already deleted or cannot be accessed!\n"
- , method_name, nodeName );
+ , "[%s], znode (%s) already deleted or cannot be accessed, rc=%d (%s)\n"
+ , method_name, nodeName, rc, zerror(rc) );
mon_log_write(MON_ZCLIENT_WATCHMASTERNODEDELETE_2, SQ_LOG_INFO, buf);
}
else