Commit 6d5f665c authored by unknown's avatar unknown

Jamming


storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Added signal names to signal logging
parent e3a68d8d
...@@ -621,6 +621,14 @@ const GsnName SignalNames [] = { ...@@ -621,6 +621,14 @@ const GsnName SignalNames [] = {
,{ GSN_LCP_PREPARE_REF, "LCP_PREPARE_REF" } ,{ GSN_LCP_PREPARE_REF, "LCP_PREPARE_REF" }
,{ GSN_LCP_PREPARE_CONF, "LCP_PREPARE_CONF" } ,{ GSN_LCP_PREPARE_CONF, "LCP_PREPARE_CONF" }
,{ GSN_DICT_ABORT_REQ, "DICT_ABORT_REQ" }
,{ GSN_DICT_ABORT_REF, "DICT_ABORT_REF" }
,{ GSN_DICT_ABORT_CONF, "DICT_ABORT_CONF" }
,{ GSN_DICT_COMMIT_REQ, "DICT_COMMIT_REQ" }
,{ GSN_DICT_COMMIT_REF, "DICT_COMMIT_REF" }
,{ GSN_DICT_COMMIT_CONF, "DICT_COMMIT_CONF" }
/* DICT LOCK */ /* DICT LOCK */
,{ GSN_DICT_LOCK_REQ, "DICT_LOCK_REQ" } ,{ GSN_DICT_LOCK_REQ, "DICT_LOCK_REQ" }
,{ GSN_DICT_LOCK_CONF, "DICT_LOCK_CONF" } ,{ GSN_DICT_LOCK_CONF, "DICT_LOCK_CONF" }
......
...@@ -462,7 +462,8 @@ Lgman::drop_filegroup_drop_files(Signal* signal, ...@@ -462,7 +462,8 @@ Lgman::drop_filegroup_drop_files(Signal* signal,
} }
void void
Lgman::execCREATE_FILE_REQ(Signal* signal){ Lgman::execCREATE_FILE_REQ(Signal* signal)
{
jamEntry(); jamEntry();
CreateFileImplReq* req= (CreateFileImplReq*)signal->getDataPtr(); CreateFileImplReq* req= (CreateFileImplReq*)signal->getDataPtr();
...@@ -491,6 +492,7 @@ Lgman::execCREATE_FILE_REQ(Signal* signal){ ...@@ -491,6 +492,7 @@ Lgman::execCREATE_FILE_REQ(Signal* signal){
switch(requestInfo){ switch(requestInfo){
case CreateFileImplReq::Commit: case CreateFileImplReq::Commit:
{ {
jam();
ndbrequire(find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id)); ndbrequire(find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id));
file_ptr.p->m_create.m_senderRef = req->senderRef; file_ptr.p->m_create.m_senderRef = req->senderRef;
file_ptr.p->m_create.m_senderData = req->senderData; file_ptr.p->m_create.m_senderData = req->senderData;
...@@ -503,6 +505,7 @@ Lgman::execCREATE_FILE_REQ(Signal* signal){ ...@@ -503,6 +505,7 @@ Lgman::execCREATE_FILE_REQ(Signal* signal){
Uint32 senderData = req->senderData; Uint32 senderData = req->senderData;
if (find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id)) if (find_file_by_id(file_ptr, ptr.p->m_meta_files, req->file_id))
{ {
jam();
file_ptr.p->m_create.m_senderRef = senderRef; file_ptr.p->m_create.m_senderRef = senderRef;
file_ptr.p->m_create.m_senderData = senderData; file_ptr.p->m_create.m_senderData = senderData;
create_file_abort(signal, ptr, file_ptr); create_file_abort(signal, ptr, file_ptr);
...@@ -510,11 +513,11 @@ Lgman::execCREATE_FILE_REQ(Signal* signal){ ...@@ -510,11 +513,11 @@ Lgman::execCREATE_FILE_REQ(Signal* signal){
else else
{ {
CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr(); CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr();
jam();
conf->senderData = senderData; conf->senderData = senderData;
conf->senderRef = reference(); conf->senderRef = reference();
sendSignal(senderRef, GSN_CREATE_FILE_CONF, signal, sendSignal(senderRef, GSN_CREATE_FILE_CONF, signal,
CreateFileImplConf::SignalLength, JBB); CreateFileImplConf::SignalLength, JBB);
return;
} }
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment