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 2018/05/15 02:37:02 UTC
[1/3] trafodion git commit: [TRAFODION-2821] Trafodion core code base
needs to be thread safe
Repository: trafodion
Updated Branches:
refs/heads/master 38033e1bc -> 609d7a422
[TRAFODION-2821] Trafodion core code base needs to be thread safe
TMLIB JNI interaction was not thread safe causing T2 driver application
to dump core at times.
Cleaned up TMLIB JNI interaction and added lock mechanism such that JNI
methods are initialized by one thread in a thread safe manner.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d940a4a1
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d940a4a1
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d940a4a1
Branch: refs/heads/master
Commit: d940a4a183e5b29ccdba320eca7cc0e03e6c7c29
Parents: a5b67c9
Author: selvaganesang <se...@esgyn.com>
Authored: Fri May 11 22:51:31 2018 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Fri May 11 22:51:31 2018 +0000
----------------------------------------------------------------------
.../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 3 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.h | 1 +
core/sqf/src/tm/tmlib.cpp | 188 ++++++++++---------
core/sqf/src/tm/tmlib.h | 27 +--
core/sqf/src/tm/tmtransaction.cpp | 22 +--
5 files changed, 125 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d940a4a1/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.cpp b/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.cpp
index 9768b50..822c85d 100755
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.cpp
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.cpp
@@ -29,7 +29,7 @@
// ===========================================================================
JavaVM* JavaObjectInterfaceTM::jvm_ = NULL;
-jint jniHandleCapacity_ = 0;
+int JavaObjectInterfaceTM::jniHandleCapacity_ = 0;
#define DEFAULT_MAX_TM_HEAP_SIZE "2048"
#define USE_JVM_DEFAULT_MAX_HEAP_SIZE 0
@@ -413,7 +413,6 @@ JOI_RetCode JavaObjectInterfaceTM::initJNIEnv()
return retcode;
}
if (_tlp_jenv->PushLocalFrame(jniHandleCapacity_) != 0) {
- getExceptionDetails(NULL);
return JOI_ERROR_INIT_JNI;
}
return JOI_OK;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d940a4a1/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.h
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.h b/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.h
index a8d4135..f6c3377 100755
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.h
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/javaobjectinterfacetm.h
@@ -160,6 +160,7 @@ protected:
static jmethodID gStackFrameToStringMethodID;
static jmethodID gGetCauseMethodID;
static jmethodID gGetErrorCodeMethodID;
+ static jint jniHandleCapacity_;
};
void set_error_msg(std::string &error_msg);
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d940a4a1/core/sqf/src/tm/tmlib.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tmlib.cpp b/core/sqf/src/tm/tmlib.cpp
index 4df9b14..3d35c6c 100644
--- a/core/sqf/src/tm/tmlib.cpp
+++ b/core/sqf/src/tm/tmlib.cpp
@@ -46,8 +46,20 @@
#include <iostream>
#include "jni.h"
-jclass TMLIB::javaClass_ = 0;
+//
+// ===========================================================================
+// ===== Class TMLIB
+// ===========================================================================
+const char *TMLIB::hbasetxclient_classname = "org/trafodion/dtm/HBaseTxClient";
+const char *TMLIB::rminterface_classname = "org/apache/hadoop/hbase/client/transactional/RMInterface";
+
+jclass TMLIB::hbasetxclient_class = NULL;
+jclass TMLIB::RMInterface_class = NULL;
+JavaMethodInit* TMLIB::TMLibJavaMethods_ = NULL;
+bool TMLIB::javaMethodsInitialized_ = false;
+TM_Mutex *TMLIB::initMutex_ = NULL;
+bool TMLIB::enableCleanupRMInterface_ = false;
// ==============================================================
// === HBaseTM return codes
@@ -243,7 +255,7 @@ void tmlib_set_ms_from_transid_startid(TM_Transid_Type pp_transid, MS_Mon_Transi
// ------------------------------------------------------------
short tmlib_check_active_tx ( )
{
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
if (gp_trans_thr->get_current() == NULL)
@@ -261,7 +273,7 @@ short tmlib_check_active_tx ( )
// ----------------------------------------------------------
short tmlib_check_miss_param( void * pp_param)
{
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// make sure there is space for pp_status
@@ -279,7 +291,7 @@ short tmlib_check_miss_param( void * pp_param)
// -----------------------------------------------------------
short tmlib_check_outstanding_ios()
{
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// make sure there is space for pp_status
@@ -300,7 +312,7 @@ short tmlib_send_suspend(TM_Transid pv_transid, bool pv_coord_role, int pv_pid)
TMlibTrace(("TMLIB_TRACE : tmlib_send_suspend ENTRY\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
{
gv_tmlib.initialize();
}
@@ -340,7 +352,7 @@ int tmlib_callback (MS_Mon_Tmlib_Fun_Type pv_fun,
TMlibTrace(("TMLIB_TRACE : tmlib_callback ENTRY with function %d \n",
pv_fun), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -494,7 +506,7 @@ int tmlib_callback2 (MS_Mon_Tmlib_Fun_Type pv_fun,
TMlibTrace(("TMLIB_TRACE : tmlib_callback2 ENTRY with function %d \n",
pv_fun), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -807,7 +819,7 @@ short HBASETM_REQUESTREGIONINFO(TM_HBASEREGIONINFO pa_trans[], short *pp_count)
Tm_Rsp_Msg_Type lv_rsp;
TMlibTrace(("TMLIB_TRACE : REQUESTREGIONINFO entry\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
if (gp_trans_thr == NULL)
@@ -1268,7 +1280,7 @@ short STATUSTRANSACTION(short *pp_status, int64 pv_transid)
if (gp_trans_thr == NULL)
gp_trans_thr = new TMLIB_ThreadTxn_Object();
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// we don't know about this tx, which is ok, just send it on to the DTM
@@ -1312,7 +1324,7 @@ short LISTTRANSACTION(TM_LIST_TRANS pa_trans[], short *pp_count, int pv_node)
Tm_Rsp_Msg_Type lv_rsp;
TMlibTrace(("TMLIB_TRACE : LISTTRANSACTION ENTRY\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1354,7 +1366,7 @@ short TMSTATS(int pv_node, TM_TMSTATS *pp_tmstats, bool pv_reset)
Tm_Req_Msg_Type lv_req;
Tm_Rsp_Msg_Type lv_rsp;
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1388,7 +1400,7 @@ short DTM_GETNEXTSEQNUMBLOCK(unsigned int &pp_seqNum_start, unsigned int &pp_seq
Tm_Req_Msg_Type lv_req;
Tm_Rsp_Msg_Type lv_rsp;
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1579,7 +1591,7 @@ short DTM_STATUSSYSTEM(TM_STATUSSYS *pp_status)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_STATUSSYS ENTRY"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1620,7 +1632,7 @@ short DTM_ATTACHRM(short pv_node, char *pp_rmname)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_ATTACHRM ENTRY, node %d\n", pv_node), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1661,7 +1673,7 @@ short DTM_STATUSTM(short pv_node, TMSTATUS *pp_tmstatus)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_STATUSTM ENTRY, node %d\n", pv_node), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1707,7 +1719,7 @@ short DTM_STATUSTRANSACTION(int64 pv_transid, TM_STATUS_TRANS *pp_trans)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_STATUSTRANSACTION ENTRY, transid " PFLL "\n", pv_transid), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1763,7 +1775,7 @@ short DTM_STATUSALLTRANS(TM_STATUS_ALL_TRANS pa_trans[], short *pp_count, int pv
Tm_Rsp_Msg_Type lv_rsp;
TMlibTrace(("TMLIB_TRACE : DTM_STATUSALLTRANS ENTRY\n"),2);
- if(!gv_tmlib.is_initialized())
+ if(!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1817,7 +1829,7 @@ short DTM_GETTRANSINFO(int64 pv_transid,
short lv_error = FEOK;
TMlibTrace(("TMLIB_TRACE : DTM_GETTRANSINFO ENTRY, transid " PFLL "\n", pv_transid), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -1879,7 +1891,7 @@ short DTM_GETTRANSINFO_EXT(TM_Transid_Type pv_transid,
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_GETTRANSINFO_EXT ENTRY\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -2030,7 +2042,7 @@ short DTM_ENABLETRANSACTIONS()
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_ENABLETRANSACTIONS ENTRY.\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -2082,7 +2094,7 @@ short DTM_DISABLETRANSACTIONS(int32 pv_shutdown_level)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_DISABLETRANSACTIONS ENTRY shutdown level %d\n", pv_shutdown_level), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -2143,7 +2155,7 @@ short DTM_DRAINTRANSACTIONS(int32 pv_node, bool pv_immediate=false)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_DRAINTRANSACTIONS ENTRY node %d, immediate=%d.\n", pv_node, pv_immediate), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -2182,7 +2194,7 @@ short DTM_QUIESCE(int32 pv_node)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_QUIESCE ENTRY node %d.\n", pv_node), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -2221,7 +2233,7 @@ short DTM_UNQUIESCE(int32 pv_node)
memset(&lv_rsp, 0, sizeof(lv_rsp));
TMlibTrace(("TMLIB_TRACE : DTM_QUIESCE ENTRY node %d.\n", pv_node), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// instantiate a gp_trans_thr object for this thread if needed.
@@ -2434,7 +2446,7 @@ short TEST_TX_COUNT()
TMlibTrace(("TMLIB_TRACE : TEST_TC_COUNT ENTRY \n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
{
gv_tmlib.initialize();
}
@@ -2470,7 +2482,7 @@ int16 TMWAIT()
TMlibTrace(("TMLIB_TRACE : TMWAIT ENTRY\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
if (!gv_tmlib.open_tm(gv_tmlib.iv_my_nid))
@@ -2518,6 +2530,7 @@ TMLIB::TMLIB() : JavaObjectInterfaceTM()
{
tm_rtsigblock_proc();
iv_initialized = false;
+ initMutex_ = new TM_Mutex(true, false);
// msg_mon_trans_register_tmlib (tmlib_callback);
msg_mon_trans_register_tmlib2 (tmlib_callback2);
@@ -2543,11 +2556,9 @@ TMLIB::TMLIB() : JavaObjectInterfaceTM()
ms_getenv_int("DTM_LOCAL_BLOCKSIZE", &iv_seqNum_blockSize);
enableCleanupRMInterface(true);
- ms_getenv_bool("TMLIB_ENABLE_CLEANUP", &iv_enableCleanupRMInterface);
+ ms_getenv_bool("TMLIB_ENABLE_CLEANUP", &enableCleanupRMInterface_);
ip_seqNum = new CtmSeqNum();
- strcpy(rminterface_classname,"org/apache/hadoop/hbase/client/transactional/RMInterface");
- strcpy(hbasetxclient_classname,"org/trafodion/dtm/HBaseTxClient");
} //TMLIB::TMLIB
@@ -2805,6 +2816,11 @@ void TMLIB::phandle_set (TPT_PTR(pp_phandle), int pv_node)
void TMLIB::initialize()
{
+ initMutex_->lock();
+ if (iv_initialized) {
+ initMutex_->unlock();
+ return;
+ }
msg_mon_get_process_info(NULL, &iv_my_nid,
&iv_my_pid);
@@ -2817,35 +2833,44 @@ void TMLIB::initialize()
// This call has been changed so that the node count includes spare nodes, so
// will give the wrong value for iv_node_count.
msg_mon_get_node_info(&iv_node_count, MAX_NODES, NULL);
- is_initialized(true);
+ iv_initialized = true;
// We don't use gv_tmlib_initialized but set it here just to keep things aligned.
gv_tmlib_initialized = true;
+ initMutex_->unlock();
}
-
-
// -------------------------------------------------------------------
// TMLIB::initJNI
// Initialize JNI interface
// Only used on demand - if you do this in TMLIB::initialize
// it gets called when it may not be used and conflicts with udrserv.
// -------------------------------------------------------------------
-void TMLIB::initJNI()
+int TMLIB::initJNI()
{
- int lv_err = 0;
- static bool ls_initialized = false;
+ int lv_err = 0;
- //sleep(30);
- if (ls_initialized)
- return;
-
- short lv_result = setupJNI();
- if (lv_result) {
- fprintf(stderr, "setupJNI returned error %d in TMLIB::initJNI. Exiting.\n", lv_result);
- fflush(stderr);
- abort();
+ if ((lv_err = initJNIEnv()) != 0)
+ return lv_err;
+ if (isInitialized())
+ return 0;
+ _tlp_jenv->PopLocalFrame(NULL);
+ if (javaMethodsInitialized_)
+ return JavaObjectInterfaceTM::init((char *)hbasetxclient_classname, hbasetxclient_class, TMLibJavaMethods_, JM_LAST_HBASETXCLIENT, javaMethodsInitialized_);
+ else
+ {
+ initMutex_->lock();
+ if (javaMethodsInitialized_) {
+ initMutex_->unlock();
+ return JavaObjectInterfaceTM::init((char *)hbasetxclient_classname, hbasetxclient_class, TMLibJavaMethods_, JM_LAST_HBASETXCLIENT, javaMethodsInitialized_);
+ }
+ short lv_result = setupJNI();
+ if (lv_result) {
+ fprintf(stderr, "setupJNI returned error %d in TMLIB::initJNI. Exiting.\n", lv_result);
+ fflush(stderr);
+ abort();
+ }
}
-
+ initMutex_->unlock();
if (localBegin()) {
lv_err = initConnection(iv_my_nid);
if (lv_err)
@@ -2858,7 +2883,7 @@ void TMLIB::initJNI()
else
TMlibTrace(("TMLIB_TRACE : TMLIB::initJNI: initConnection succeeded.\n"), 1);
}
- ls_initialized = true;
+ return 0;
} //initJNI
@@ -2880,7 +2905,7 @@ bool TMLIB::open_tm(int pv_node, bool pv_startup)
// open the tm. This will stay locked and hang all transactional
// threads up until the tm is open.
// strategy, we may need to redo this part a bit
- if (!is_initialized() && !pv_startup)
+ if (!iv_initialized && !pv_startup)
initialize();
// get the phandle
@@ -3146,7 +3171,8 @@ unsigned int TMLIB::new_tag()
short TMLIB::setupJNI()
{
- //printf("setupJNI.\n");
+ jclass lv_javaClass;
+ TMLibJavaMethods_ = new JavaMethodInit[JM_LAST];
TMLibJavaMethods_[JM_CTOR ].jm_name = "<init>";
TMLibJavaMethods_[JM_CTOR ].jm_signature = "()V";
TMLibJavaMethods_[JM_INIT1 ].jm_name = "init";
@@ -3157,17 +3183,20 @@ short TMLIB::setupJNI()
TMLibJavaMethods_[JM_TRYCOMMIT ].jm_signature = "(J)S";
TMLibJavaMethods_[JM_CLEARTRANSACTIONSTATES].jm_name = "clearTransactionStates";
TMLibJavaMethods_[JM_CLEARTRANSACTIONSTATES].jm_signature = "(J)V";
+
+ for (int i = 0 ; i < JM_LAST ; i++)
+ TMLibJavaMethods_[i].methodID = NULL;
- //sleep(30);
- short ret = JavaObjectInterfaceTM::init(hbasetxclient_classname, javaClass_,
- (JavaMethodInit*)&TMLibJavaMethods_, JM_LAST_HBASETXCLIENT, false);
+ short ret = JavaObjectInterfaceTM::init((char *)hbasetxclient_classname, hbasetxclient_class,
+ TMLibJavaMethods_, JM_LAST_HBASETXCLIENT, false);
if (ret == JOI_OK) {
if (enableCleanupRMInterface()) {
// Setup call to RMInterface.clearTransactionStates
- iv_RMInterface_class = _tlp_jenv->FindClass(rminterface_classname);
- if (iv_RMInterface_class != NULL) {
+ lv_javaClass = _tlp_jenv->FindClass(rminterface_classname);
+ if (lv_javaClass != NULL) {
+ RMInterface_class = (jclass)_tlp_jenv->NewGlobalRef(lv_javaClass);
TMLibJavaMethods_[JM_CLEARTRANSACTIONSTATES].methodID =
- _tlp_jenv->GetStaticMethodID(iv_RMInterface_class,
+ _tlp_jenv->GetStaticMethodID(RMInterface_class,
TMLibJavaMethods_[JM_CLEARTRANSACTIONSTATES].jm_name.data(),
TMLibJavaMethods_[JM_CLEARTRANSACTIONSTATES].jm_signature.data());
}
@@ -3206,26 +3235,16 @@ short TMLIB::initConnection(short pv_nid)
void TMLIB::cleanupTransactionLocal(long transactionID)
{
- initJNI();
-
if (enableCleanupRMInterface() == false)
- return;
+ return;
+ initJNI();
jlong jlv_transid = transactionID;
- JOI_RetCode lv_joi_retcode = JOI_OK;
- lv_joi_retcode = JavaObjectInterfaceTM::initJVM();
- if (lv_joi_retcode != JOI_OK) {
- fprintf(stderr, "JavaObjectInterfaceTM::initJVM returned: %d\n", lv_joi_retcode);
- fflush(stderr);
- abort();
- }
-
- _tlp_jenv->CallStaticVoidMethod(iv_RMInterface_class, TMLibJavaMethods_[JM_CLEARTRANSACTIONSTATES].methodID, jlv_transid);
+ _tlp_jenv->CallStaticVoidMethod(RMInterface_class, TMLibJavaMethods_[JM_CLEARTRANSACTIONSTATES].methodID, jlv_transid);
if (getExceptionDetails(NULL)) {
tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"TMLIB::cleanupTransactionLocal()", (char *)_tlp_error_msg->c_str(), -1);
- fprintf(stderr, "clearTransactionStates raised an exception!\n");
- fflush(stderr);
- abort();
+ _tlp_jenv->PopLocalFrame(NULL);
}
+ _tlp_jenv->PopLocalFrame(NULL);
return;
} //cleanupTransactionLocal
@@ -3233,20 +3252,14 @@ void TMLIB::cleanupTransactionLocal(long transactionID)
short TMLIB::endTransactionLocal(long transactionID)
{
jlong jlv_transid = transactionID;
- JOI_RetCode lv_joi_retcode = JOI_OK;
- lv_joi_retcode = JavaObjectInterfaceTM::initJVM();
- if (lv_joi_retcode != JOI_OK) {
- fprintf(stderr,"Local commit failed. JavaObjectInterfaceTM::initJVM returned: %d\n", lv_joi_retcode);
- fflush(stderr);
- abort();
- }
-
+ initJNI();
jshort jresult = _tlp_jenv->CallShortMethod(javaObj_, TMLibJavaMethods_[JM_TRYCOMMIT].methodID, jlv_transid);
if (getExceptionDetails(NULL)) {
tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"TMLIB::endTransaction()", (char *)_tlp_error_msg->c_str(), -1);
+ _tlp_jenv->PopLocalFrame(NULL);
return RET_EXCEPTION;
}
-
+ _tlp_jenv->PopLocalFrame(NULL);
// RET_NOTX means the transaction wasn't found by the HBase client code (trx). This is ok here, it
// simply means the transaction hasn't been seen by the HBase client code, so no work was done on it.
if (jresult == RET_NOTX)
@@ -3254,7 +3267,6 @@ short TMLIB::endTransactionLocal(long transactionID)
// printf("TMLIB::endTransactionLocal returning RET_NOTX(1) - empty txn.\n");
return RET_OK;
}
-
return jresult;
} //endTransactionLocal
@@ -3262,20 +3274,14 @@ short TMLIB::endTransactionLocal(long transactionID)
short TMLIB::abortTransactionLocal(long transactionID)
{
jlong jlv_transid = transactionID;
- JOI_RetCode lv_joi_retcode = JOI_OK;
- lv_joi_retcode = JavaObjectInterfaceTM::initJVM();
- if (lv_joi_retcode != JOI_OK) {
- fprintf(stderr,"Local abort failed. JavaObjectInterfaceTM::initJVM returned: %d\n", lv_joi_retcode);
- fflush(stderr);
- abort();
- }
-
+ initJNI();
jshort jresult = _tlp_jenv->CallShortMethod(javaObj_, TMLibJavaMethods_[JM_ABORT].methodID, jlv_transid);
if (getExceptionDetails(NULL)) {
tm_log_write(DTM_TM_JNI_ERROR, SQ_LOG_ERR, (char *)"TMLIB::abortTransaction()", (char *)_tlp_error_msg->c_str(), -1);
+ _tlp_jenv->PopLocalFrame(NULL);
return RET_EXCEPTION;
}
-
+ _tlp_jenv->PopLocalFrame(NULL);
// RET_NOTX means the transaction wasn't found by the HBase client code (trx). This is ok here, it
// simply means the transaction hasn't been seen by the HBase client code, so no work was done on it.
if (jresult == RET_NOTX)
@@ -3289,7 +3295,7 @@ short TMLIB::abortTransactionLocal(long transactionID)
bool TMLIB::close_tm()
{
TPT_DECL (lv_phandle);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
return true;
for (int i = 0; i < iv_node_count; i++) {
if (phandle_get(&lv_phandle, i) == true)
@@ -3311,7 +3317,7 @@ bool DTM_LOCALTRANSACTION(int32 *pp_node, int32 *pp_seqnum)
if (gp_trans_thr == NULL)
gp_trans_thr = new TMLIB_ThreadTxn_Object();
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
bool lv_local = gv_tmlib.localBegin();
@@ -3338,3 +3344,5 @@ bool DTM_LOCALTRANSACTION(int32 *pp_node, int32 *pp_seqnum)
*pp_seqnum = lp_transid->get_seq_num();
return lv_local;
}
+
+
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d940a4a1/core/sqf/src/tm/tmlib.h
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tmlib.h b/core/sqf/src/tm/tmlib.h
index b1f2969..0d0e90a 100644
--- a/core/sqf/src/tm/tmlib.h
+++ b/core/sqf/src/tm/tmlib.h
@@ -65,9 +65,6 @@ class TMLIB : public JavaObjectInterfaceTM
bool iv_localBegin;
// JNI interface
- char rminterface_classname[1024];
- char hbasetxclient_classname[1024];
-
enum JAVA_METHODS {
//
JM_CTOR= 0,
@@ -80,13 +77,19 @@ class TMLIB : public JavaObjectInterfaceTM
JM_LAST
};
- JavaMethodInit TMLibJavaMethods_[JM_LAST];
- static jclass javaClass_;
- jclass iv_RMInterface_class;
- bool iv_enableCleanupRMInterface;
+ static const char *hbasetxclient_classname;
+ static const char *rminterface_classname;
- short setupJNI();
+ static jclass hbasetxclient_class;
+ static jclass RMInterface_class;
+ static JavaMethodInit *TMLibJavaMethods_;
+
+ static bool javaMethodsInitialized_;
+ static bool enableCleanupRMInterface_;
+ // this mutex protects this class and JaveMethods_ initialization
+ static TM_Mutex *initMutex_;
+ short setupJNI();
public:
TMLIB();
~TMLIB(){}
@@ -110,18 +113,16 @@ class TMLIB : public JavaObjectInterfaceTM
bool reinstate_tx(TM_Transid *pv_transid, bool pv_settx = false);
void initialize();
- bool is_initialized() {return iv_initialized;}
- void is_initialized(bool pv_init) {iv_initialized = pv_init;}
- void initJNI(); // Used only when a JNI connection is needed
+ int initJNI(); // Used only when a JNI connection is needed
CtmSeqNum *seqNum() {return ip_seqNum;}
bool localBegin() {return iv_localBegin;}
void localBegin(bool pv_localBegin) {iv_localBegin=pv_localBegin;}
int32 seqNum_blockSize() {return iv_seqNum_blockSize;}
void seqNum_blockSize(int32 pv_blockSize) {iv_seqNum_blockSize=pv_blockSize;}
- bool enableCleanupRMInterface() {return iv_enableCleanupRMInterface;}
- void enableCleanupRMInterface(bool pv_bool) {iv_enableCleanupRMInterface=pv_bool;}
+ bool enableCleanupRMInterface() {return enableCleanupRMInterface_;}
+ void enableCleanupRMInterface(bool pv_bool) {enableCleanupRMInterface_=pv_bool;}
bool open_tm(int pv_node, bool pv_startup = false);
short send_tm(Tm_Req_Msg_Type *pp_req, Tm_Rsp_Msg_Type *pp_rsp,
http://git-wip-us.apache.org/repos/asf/trafodion/blob/d940a4a1/core/sqf/src/tm/tmtransaction.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tmtransaction.cpp b/core/sqf/src/tm/tmtransaction.cpp
index 56e853d..aca58a5 100644
--- a/core/sqf/src/tm/tmtransaction.cpp
+++ b/core/sqf/src/tm/tmtransaction.cpp
@@ -101,7 +101,7 @@ short TM_Transaction::register_region(long startid, int port, char *hostName, i
TMlibTrace(("TMLIB_TRACE : TM_Transaction::register_region ENTRY\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
tmlib_init_req_hdr(TM_MSG_TYPE_REGISTERREGION, &lv_req);
@@ -150,7 +150,7 @@ short TM_Transaction::create_table(char* pa_tbldesc, int pv_tbldesc_len,
TMlibTrace(("TMLIB_TRACE : TM_Transaction::create_table ENTRY tablename: %s\n", pa_tblname), 1);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
tmlib_init_req_hdr(TM_MSG_TYPE_DDLREQUEST, &lv_req);
@@ -204,7 +204,7 @@ short TM_Transaction::alter_table(char * pa_tblname, int pv_tblname_len,
int total_buffer = len_aligned + buffer_size;
char *buffer = new char[total_buffer];
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
tmlib_init_req_hdr(TM_MSG_TYPE_DDLREQUEST, &lv_req);
@@ -251,7 +251,7 @@ short TM_Transaction::reg_truncateonabort(char* pa_tblname, int pv_tblname_len,
TMlibTrace(("TMLIB_TRACE : TM_Transaction::reg_truncateonabort ENTRY tablename: %s\n", pa_tblname), 1);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
tmlib_init_req_hdr(TM_MSG_TYPE_DDLREQUEST, &lv_req);
@@ -285,7 +285,7 @@ short TM_Transaction::drop_table(char* pa_tblname, int pv_tblname_len,
TMlibTrace(("TMLIB_TRACE : TM_Transaction::drop_table ENTRY tablename: %s\n", pa_tblname), 1);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
tmlib_init_req_hdr(TM_MSG_TYPE_DDLREQUEST, &lv_req);
@@ -333,7 +333,7 @@ short TM_Transaction::begin(int abort_timeout, int64 transactiontype_bits)
// We don't validate transactiontype flags
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// if there is already an active tx, switch it out
@@ -410,7 +410,7 @@ short TM_Transaction::end(char* &pv_err_str, int &pv_err_len)
return iv_last_error;
}
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
if (gv_tmlib.localBegin()) {
@@ -496,7 +496,7 @@ short TM_Transaction::abort(bool pv_doom)
return iv_last_error;
*/
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
if (gv_tmlib.localBegin()) {
@@ -563,7 +563,7 @@ short TM_Transaction::join(bool pv_coordinator_role)
TMlibTrace(("TMLIB_TRACE : TM_Transaction::join ENTRY\n"), 2);
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
gv_tmlib.initialize();
// if there is already an active tx, switch it out
@@ -673,7 +673,7 @@ short TM_Transaction::suspend(TM_Transid *pp_transid, bool pv_coordinator_role)
//return iv_last_error;
}
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
{
gv_tmlib.initialize();
}
@@ -797,7 +797,7 @@ short TM_Transaction::status(short *pp_status)
return iv_last_error;
}
- if (!gv_tmlib.is_initialized())
+ if (!gv_tmlib_initialized)
{
gv_tmlib.initialize();
}
[2/3] trafodion git commit: [TRAFODION-2821] Trafodion core code base
needs to be thread safe
Posted by se...@apache.org.
[TRAFODION-2821] Trafodion core code base needs to be thread safe
Changes as per review comments in commit d940a4a183
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f85e7ddc
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f85e7ddc
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f85e7ddc
Branch: refs/heads/master
Commit: f85e7ddcffa162c431050acd2ed9b38a0f720224
Parents: d940a4a
Author: selvaganesang <se...@esgyn.com>
Authored: Mon May 14 17:08:27 2018 +0000
Committer: selvaganesang <se...@esgyn.com>
Committed: Mon May 14 17:08:27 2018 +0000
----------------------------------------------------------------------
core/sqf/src/tm/tmlib.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/f85e7ddc/core/sqf/src/tm/tmlib.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/tmlib.cpp b/core/sqf/src/tm/tmlib.cpp
index 3d35c6c..f7b9a7d 100644
--- a/core/sqf/src/tm/tmlib.cpp
+++ b/core/sqf/src/tm/tmlib.cpp
@@ -2869,8 +2869,8 @@ int TMLIB::initJNI()
fflush(stderr);
abort();
}
+ initMutex_->unlock();
}
- initMutex_->unlock();
if (localBegin()) {
lv_err = initConnection(iv_my_nid);
if (lv_err)
[3/3] trafodion git commit: Merge PR 1562 [TRAFODION-2821] Trafodion
core code base needs to be thread safe
Posted by se...@apache.org.
Merge PR 1562 [TRAFODION-2821] Trafodion core code base needs to be thread safe
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/609d7a42
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/609d7a42
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/609d7a42
Branch: refs/heads/master
Commit: 609d7a422832a1b9b691ebc8f83501bb9a539994
Parents: 38033e1 f85e7dd
Author: selvaganesang <se...@apache.org>
Authored: Tue May 15 02:34:51 2018 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Tue May 15 02:34:51 2018 +0000
----------------------------------------------------------------------
.../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 3 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.h | 1 +
core/sqf/src/tm/tmlib.cpp | 188 ++++++++++---------
core/sqf/src/tm/tmlib.h | 27 +--
core/sqf/src/tm/tmtransaction.cpp | 22 +--
5 files changed, 125 insertions(+), 116 deletions(-)
----------------------------------------------------------------------