You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2016/10/12 20:43:46 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2262] Mxosrvr or
java core with the stack trace pointing to log4Cxx functions
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 43b005f27 -> e77df8643
[TRAFODION-2262] Mxosrvr or java core with the stack trace pointing to log4Cxx functions
The Logger repository needs to be initialized. The method QRLogger::initLog4cxx
initialized the commonLogger infrastructure also.
PR #745 merged to fix this issue exposed a problem in SSMP. This
caused SSMP to dump core when a node is brought down.
SSMP should have create the connection to SSCP on that node.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8c9fce8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8c9fce8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8c9fce8c
Branch: refs/heads/master
Commit: 8c9fce8c13054fdd150d75cc79e2a20a38b3f47c
Parents: 12f602c
Author: selvaganesang <se...@esgyn.com>
Authored: Tue Oct 11 03:39:23 2016 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Tue Oct 11 03:39:23 2016 +0000
----------------------------------------------------------------------
core/sql/cli/CliExtern.cpp | 16 ++--------------
core/sql/qmscommon/QRLogger.cpp | 6 ++++++
core/sql/runtimestats/ssmpipc.cpp | 3 ---
core/sql/sqlmxevents/logmxevent_traf.cpp | 2 +-
4 files changed, 9 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8c9fce8c/core/sql/cli/CliExtern.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/CliExtern.cpp b/core/sql/cli/CliExtern.cpp
index d169a95..d2e2efd 100644
--- a/core/sql/cli/CliExtern.cpp
+++ b/core/sql/cli/CliExtern.cpp
@@ -89,7 +89,7 @@ CLISemaphore globalSemaphore ;
#include "SqlStats.h"
#include "ComExeTrace.h"
#include "Context.h"
-#include "CommonLogger.h"
+#include "QRLogger.h"
#ifndef CLI_PRIV_SRL
#pragma warning (disable : 4273) //warning elimination
@@ -892,19 +892,7 @@ short sqInit()
try
{
short retcode = my_mpi_setup(&largc, &largv);
- int myNid;
- pid_t myPid;
- MS_Mon_Process_Info_Type proc_info;
-
- if (! gv_commonLoggerInitialized) {
- retcode = msg_mon_get_process_info_detail(NULL, &proc_info);
- ex_assert(retcode == 0, "Error while calling msg_non_get_process in sqInit()");
- myNid = proc_info.nid;
- myPid = proc_info.pid;
- char logNameSuffix[32];
- sprintf( logNameSuffix, "_%d_%d.log", myNid, myPid );
- CommonLogger::instance().initLog4cxx("log4cxx.trafodion.masterexe.config", logNameSuffix);
- }
+ QRLogger::instance().initLog4cxx("log4cxx.trafodion.masterexe.config");
}
catch (...)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8c9fce8c/core/sql/qmscommon/QRLogger.cpp
----------------------------------------------------------------------
diff --git a/core/sql/qmscommon/QRLogger.cpp b/core/sql/qmscommon/QRLogger.cpp
index da6df42..7874c35 100644
--- a/core/sql/qmscommon/QRLogger.cpp
+++ b/core/sql/qmscommon/QRLogger.cpp
@@ -38,6 +38,8 @@
#include "seabed/ms.h"
#include "seabed/fserr.h"
+BOOL gv_QRLoggerInitialized_ = FALSE;
+
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -186,6 +188,9 @@ NABoolean QRLogger::initLog4cxx(const char* configFileName)
{
NAString logFileName;
+ if (gv_QRLoggerInitialized_)
+ return TRUE;
+
// get the log directory
logFileName = "";
@@ -214,6 +219,7 @@ NABoolean QRLogger::initLog4cxx(const char* configFileName)
if (CommonLogger::initLog4cxx(configFileName, logFileSuffix))
{
introduceSelf();
+ gv_QRLoggerInitialized_ = TRUE;
return TRUE;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8c9fce8c/core/sql/runtimestats/ssmpipc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/runtimestats/ssmpipc.cpp b/core/sql/runtimestats/ssmpipc.cpp
index f05543f..63b0d31 100755
--- a/core/sql/runtimestats/ssmpipc.cpp
+++ b/core/sql/runtimestats/ssmpipc.cpp
@@ -158,8 +158,6 @@ void ExSsmpManager::cleanupDeletedSsmpServers()
IpcServer *ssmp;
while (deletedSsmps_->getFirst(ssmp))
{
- IpcConnection *conn = ssmp->getControlConnection();
- NADELETE(conn, IpcConnection, conn->collHeap());
ssmpServerClass_->freeServerProcess(ssmp);
}
}
@@ -462,7 +460,6 @@ void SsmpGlobals::cleanupDeletedSscpServers()
}
else
{
- NADELETE(conn, IpcConnection, conn->collHeap());
sscpServerClass_->freeServerProcess(sscp);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8c9fce8c/core/sql/sqlmxevents/logmxevent_traf.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlmxevents/logmxevent_traf.cpp b/core/sql/sqlmxevents/logmxevent_traf.cpp
index 8d9faec..2287de7 100644
--- a/core/sql/sqlmxevents/logmxevent_traf.cpp
+++ b/core/sql/sqlmxevents/logmxevent_traf.cpp
@@ -86,7 +86,7 @@ bool SQLMXLoggingArea::lockMutex()
rc = pthread_mutex_lock(&loggingMutex_);
if (rc)
{
- sprintf(buffer, "SQLMXLoggingArea::lockMutex() pthread_mutex_trylock() rc=%d", rc);
+ sprintf(buffer, "SQLMXLoggingArea::lockMutex() pthread_mutex_lock() rc=%d", rc);
abort();
}
}
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2262] Mxosrvr
or java core with stack trace pointing to log4cxx
Posted by se...@apache.org.
Merge [TRAFODION-2262] Mxosrvr or java core with stack trace pointing to log4cxx
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e77df864
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e77df864
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e77df864
Branch: refs/heads/master
Commit: e77df8643eecba7f8c6c93eb926965327697b3f5
Parents: 43b005f 8c9fce8
Author: selvaganesang <se...@apache.org>
Authored: Wed Oct 12 20:41:39 2016 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Wed Oct 12 20:41:39 2016 +0000
----------------------------------------------------------------------
core/sql/cli/CliExtern.cpp | 16 ++--------------
core/sql/qmscommon/QRLogger.cpp | 6 ++++++
core/sql/runtimestats/ssmpipc.cpp | 3 ---
core/sql/sqlmxevents/logmxevent_traf.cpp | 2 +-
4 files changed, 9 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e77df864/core/sql/runtimestats/ssmpipc.cpp
----------------------------------------------------------------------