Commit 54ccf5d1 authored by unknown's avatar unknown
Browse files

added som signal printout functions 

    search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
    not necessarily the same starts and stops...
    +error corrected in ref signal
    added print of error codes + more correct error handling of event errors
    + added goto instead of erroneous break to fix bug#7627


ndb/include/kernel/signaldata/SignalData.hpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  added som signal printout functions
ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  added som signal printout functions
ndb/src/kernel/blocks/suma/Suma.cpp:
  search for subscriber should be done on nodeid basis and not reference, only one subscriber per event per nodeid allowed
  not necessarily the same starts and stops...
  +error corrected in ref signal
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  indentation
  event error handling
  debug printouts
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  debug printouts
  + added goto instead of erroneous break to fix bug#7627
ndb/test/src/HugoTransactions.cpp:
  added print of error codes + more correct error handling of event errors
parent 1454564f

ndb/include/kernel/signaldata/SignalData.hpp

+7 −0
Original line number Diff line number Diff line
@@ -177,9 +177,16 @@ GSN_PRINT_SIGNATURE(printFAIL_REP); 
GSN_PRINT_SIGNATURE(printDISCONNECT_REP);

GSN_PRINT_SIGNATURE(printSUB_CREATE_REQ);

GSN_PRINT_SIGNATURE(printSUB_CREATE_CONF);

GSN_PRINT_SIGNATURE(printSUB_CREATE_REF);

GSN_PRINT_SIGNATURE(printSUB_REMOVE_REQ);

GSN_PRINT_SIGNATURE(printSUB_REMOVE_CONF);

GSN_PRINT_SIGNATURE(printSUB_REMOVE_REF);

GSN_PRINT_SIGNATURE(printSUB_START_REQ);

GSN_PRINT_SIGNATURE(printSUB_START_REF);

GSN_PRINT_SIGNATURE(printSUB_START_CONF);

GSN_PRINT_SIGNATURE(printSUB_STOP_REQ);

GSN_PRINT_SIGNATURE(printSUB_STOP_REF);

GSN_PRINT_SIGNATURE(printSUB_STOP_CONF);

GSN_PRINT_SIGNATURE(printSUB_SYNC_REQ);

GSN_PRINT_SIGNATURE(printSUB_SYNC_REF);

GSN_PRINT_SIGNATURE(printSUB_SYNC_CONF);

ndb/src/common/debugger/signaldata/SignalDataPrint.cpp

+7 −1
Original line number Diff line number Diff line
@@ -151,11 +151,17 @@ SignalDataPrintFunctions[] = { 
  { GSN_DISCONNECT_REP,         printDISCONNECT_REP },

  

  { GSN_SUB_CREATE_REQ,         printSUB_CREATE_REQ },

  //{ GSN_SUB_CREATE_REF,         printSUB_CREATE_REF },

  { GSN_SUB_CREATE_REF,         printSUB_CREATE_REF },

  { GSN_SUB_CREATE_CONF,        printSUB_CREATE_CONF },

  { GSN_SUB_REMOVE_REQ,         printSUB_REMOVE_REQ },

  { GSN_SUB_REMOVE_REF,         printSUB_REMOVE_REF },

  { GSN_SUB_REMOVE_CONF,        printSUB_REMOVE_CONF },

  { GSN_SUB_START_REQ,          printSUB_START_REQ },

  { GSN_SUB_START_REF,          printSUB_START_REF },

  { GSN_SUB_START_CONF,         printSUB_START_CONF },

  { GSN_SUB_STOP_REQ,           printSUB_STOP_REQ },

  { GSN_SUB_STOP_REF,           printSUB_STOP_REF },

  { GSN_SUB_STOP_CONF,          printSUB_STOP_CONF },

  { GSN_SUB_SYNC_REQ,           printSUB_SYNC_REQ },

  { GSN_SUB_SYNC_REF,           printSUB_SYNC_REF },

  { GSN_SUB_SYNC_CONF,          printSUB_SYNC_CONF },

ndb/src/common/debugger/signaldata/SignalNames.cpp

+3 −0
Original line number Diff line number Diff line
@@ -578,6 +578,9 @@ const GsnName SignalNames [] = { 
  ,{ GSN_SUB_CREATE_REQ,         "SUB_CREATE_REQ" }

  ,{ GSN_SUB_CREATE_REF,         "SUB_CREATE_REF" }

  ,{ GSN_SUB_CREATE_CONF,        "SUB_CREATE_CONF" }

  ,{ GSN_SUB_REMOVE_REQ,         "SUB_REMOVE_REQ" }

  ,{ GSN_SUB_REMOVE_REF,         "SUB_REMOVE_REF" }

  ,{ GSN_SUB_REMOVE_CONF,        "SUB_REMOVE_CONF" }

  ,{ GSN_SUB_START_REQ,          "SUB_START_REQ" }

  ,{ GSN_SUB_START_REF,          "SUB_START_REF" }

  ,{ GSN_SUB_START_CONF,         "SUB_START_CONF" }

ndb/src/common/debugger/signaldata/SumaImpl.cpp

+75 −1
Original line number Diff line number Diff line
@@ -39,13 +39,56 @@ printSUB_CREATE_CONF(FILE * output, const Uint32 * theData, 
  return false;

}



bool

printSUB_CREATE_REF(FILE * output, const Uint32 * theData, 

		    Uint32 len, Uint16 receiverBlockNo) {

  const SubCreateRef * const sig = (SubCreateRef *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  fprintf(output, " subscriberData: %x\n", sig->subscriberData);

  return false;

}



bool

printSUB_REMOVE_REQ(FILE * output, const Uint32 * theData, 

		    Uint32 len, Uint16 receiverBlockNo)

{

  const SubRemoveReq * const sig = (SubRemoveReq *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  return false;

}



bool

printSUB_REMOVE_CONF(FILE * output, const Uint32 * theData, 

		     Uint32 len, Uint16 receiverBlockNo)

{

  const SubRemoveConf * const sig = (SubRemoveConf *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  fprintf(output, " subscriberData: %x\n", sig->subscriberData);

  return false;

}



bool

printSUB_REMOVE_REF(FILE * output, const Uint32 * theData, 

		    Uint32 len, Uint16 receiverBlockNo)

{

  const SubRemoveRef * const sig = (SubRemoveRef *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  fprintf(output, " subscriberData: %x\n", sig->subscriberData);

  fprintf(output, " err: %x\n", sig->err);

  return false;

}



bool

printSUB_START_REQ(FILE * output, const Uint32 * theData, 

		   Uint32 len, Uint16 receiverBlockNo) {

  const SubStartReq * const sig = (SubStartReq *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  fprintf(output, " startPart: %x\n", sig->part);

  fprintf(output, " subscriberData: %x\n", sig->subscriberData);

  return false;

}
@@ -72,6 +115,37 @@ printSUB_START_CONF(FILE * output, const Uint32 * theData, 
  return false;

}



bool

printSUB_STOP_REQ(FILE * output, const Uint32 * theData, 

		   Uint32 len, Uint16 receiverBlockNo) {

  const SubStopReq * const sig = (SubStopReq *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  fprintf(output, " subscriberData: %x\n", sig->subscriberData);

  return false;

}



bool

printSUB_STOP_REF(FILE * output, const Uint32 * theData, 

		   Uint32 len, Uint16 receiverBlockNo) {

  const SubStopRef * const sig = (SubStopRef *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  fprintf(output, " subscriberData: %x\n", sig->subscriberData);

  fprintf(output, " err: %x\n", sig->err);

  return false;

}



bool

printSUB_STOP_CONF(FILE * output, const Uint32 * theData, 

		    Uint32 len, Uint16 receiverBlockNo) {

  const SubStopConf * const sig = (SubStopConf *)theData;

  fprintf(output, " subscriptionId: %x\n", sig->subscriptionId);

  fprintf(output, " subscriptionKey: %x\n", sig->subscriptionKey);

  fprintf(output, " subscriberData: %x\n", sig->subscriberData);

  return false;

}



bool

printSUB_SYNC_REQ(FILE * output, const Uint32 * theData, 

		  Uint32 len, Uint16 receiverBlockNo) {

ndb/src/kernel/blocks/suma/Suma.cpp

+3 −1
Original line number Diff line number Diff line
@@ -3280,7 +3280,7 @@ SumaParticipant::execSUB_STOP_REQ(Signal* signal){ 
    for (;!subbPtr.isNull(); c_dataSubscribers.next(subbPtr)){

      jam();

      if (subbPtr.p->m_subPtrI == subPtr.i && 

	  subbPtr.p->m_subscriberRef == subscriberRef &&

	  refToNode(subbPtr.p->m_subscriberRef) == refToNode(subscriberRef) &&

	  subbPtr.p->m_subscriberData == subscriberData){

	//	ndbout_c("STOP_REQ: before c_dataSubscribers.release");

	jam();
@@ -3508,6 +3508,8 @@ SumaParticipant::sendSubRemoveRef(Signal* signal, const SubRemoveReq& req, 
  jam();

  SubRemoveRef  * ref = (SubRemoveRef *)signal->getDataPtrSend();

  ref->senderRef  = reference();

  ref->subscriptionId = req.subscriptionId;

  ref->subscriptionKey = req.subscriptionKey;

  ref->senderData = req.senderData;

  ref->err = errCode;

  if (temporary)