Commit 5c1f4b64 authored by unknown's avatar unknown
Browse files

ndb - bug#24544 

  fix so backup message is printed even in case of "ndb_mgm -e"


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  fix backup printer
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Fix so that backup message is printed even if "ndb_mgm -e"
storage/ndb/src/ndbapi/SignalSender.cpp:
  move method into TransporterFacade to enable API_TRACE
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  move method into TransporterFacade to enable API_TRACE
parent 94069b1d

storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp

+3 −2
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ 
bool 

printBACKUP_REQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 bno){

  BackupReq* sig = (BackupReq*)theData;

  fprintf(output, " senderData: %d DataLength: %d\n", 

  fprintf(output, " senderData: %d DataLength: %d flags: %d\n", 

	  sig->senderData,

	  sig->backupDataLen);

	  sig->backupDataLen,

	  sig->flags);

  return true;

}

storage/ndb/src/mgmclient/CommandInterpreter.cpp

+57 −50
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ class CommandInterpreter { 
  int  executeStatus(int processId, const char* parameters, bool all);

  int  executeEventReporting(int processId, const char* parameters, bool all);

  int  executeDumpState(int processId, const char* parameters, bool all);

  int  executeStartBackup(char * parameters);

  int  executeStartBackup(char * parameters, bool interactive);

  int  executeAbortBackup(char * parameters);

  int  executeStop(Vector<BaseString> &command_list, unsigned command_pos,

                   int *node_ids, int no_of_nodes);
@@ -991,7 +991,7 @@ CommandInterpreter::execute_impl(const char *_line, bool interactive) 
  else if(strcasecmp(firstToken, "START") == 0 &&

	  allAfterFirstToken != NULL &&

	  strncasecmp(allAfterFirstToken, "BACKUP", sizeof("BACKUP") - 1) == 0){

    m_error= executeStartBackup(allAfterFirstToken);

    m_error= executeStartBackup(allAfterFirstToken, interactive);

    DBUG_RETURN(true);

  }

  else if(strcasecmp(firstToken, "ABORT") == 0 &&
@@ -2442,24 +2442,17 @@ CommandInterpreter::executeEventReporting(int processId, 
  return retval;

}





/*****************************************************************************

 * Backup

 *****************************************************************************/

int

CommandInterpreter::executeStartBackup(char* parameters)

CommandInterpreter::executeStartBackup(char* parameters, bool interactive)

{

  struct ndb_mgm_reply reply;

  unsigned int backupId;

#if 0

  int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_BACKUP, 0 };

  int fd = ndb_mgm_listen_event(m_mgmsrv, filter);

  if (fd < 0)

  {

    ndbout << "Initializing start of backup failed" << endl;

    printError();

    return fd;

  }

#endif

  int fd = -1;

  

  Vector<BaseString> args;

  {

    BaseString(parameters).split(args);
@@ -2472,25 +2465,21 @@ CommandInterpreter::executeStartBackup(char* parameters) 
  int sz= args.size();



  int result;

  if (sz == 2 &&

      args[1] == "NOWAIT")

  int flags = 2;

  if (sz == 2 && args[1] == "NOWAIT")

  {

    flags = 0;

    result = ndb_mgm_start_backup(m_mgmsrv, 0, &backupId, &reply);

  }

  else if (sz == 1 ||

	   (sz == 3 &&

	    args[1] == "WAIT" &&

	    args[2] == "COMPLETED"))

  else if (sz == 1 || (sz == 3 && args[1] == "WAIT" && args[2] == "COMPLETED"))

  {

    flags = 2;

    ndbout_c("Waiting for completed, this may take several minutes");

    result = ndb_mgm_start_backup(m_mgmsrv, 2, &backupId, &reply);

  }

  else if (sz == 3 &&

	   args[1] == "WAIT" &&

	   args[2] == "STARTED")

  else if (sz == 3 && args[1] == "WAIT" && args[2] == "STARTED")

  {

    ndbout_c("Waiting for started, this may take several minutes");

    result = ndb_mgm_start_backup(m_mgmsrv, 1, &backupId, &reply);

    flags = 1;

  }

  else

  {
@@ -2498,16 +2487,33 @@ CommandInterpreter::executeStartBackup(char* parameters) 
    return -1;

  }



  /**

   * If interactive...event listner is already running

   */

  if (flags == 2 && !interactive)

  {

    int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_BACKUP, 0, 0 };

    fd = ndb_mgm_listen_event(m_mgmsrv, filter);

    if (fd < 0)

    {

      ndbout << "Initializing start of backup failed" << endl;

      printError();

      return fd;

    }

  }

  result = ndb_mgm_start_backup(m_mgmsrv, flags, &backupId, &reply);



  if (result != 0) {

    ndbout << "Backup failed" << endl;

    printError();

#if 0



    if (fd >= 0) 

      close(fd);

#endif

    return result;

  }

#if 0

  ndbout_c("Waiting for completed, this may take several minutes");



  if (fd >= 0)

  {

    char *tmp;

    char buf[1024];

    {
@@ -2536,7 +2542,8 @@ CommandInterpreter::executeStartBackup(char* parameters) 
    } while(tmp && tmp[0] != 0);

    

    close(fd);

#endif  

  }



  return 0;

}

storage/ndb/src/ndbapi/SignalSender.cpp

+0 −9
Original line number Diff line number Diff line
@@ -131,15 +131,6 @@ SignalSender::getNoOfConnectedNodes() const { 
  return theFacade->theClusterMgr->getNoOfConnectedNodes();

}



SendStatus

SignalSender::sendSignal(Uint16 nodeId, const SimpleSignal * s){

  return theFacade->theTransporterRegistry->prepareSend(&s->header,

							1, // JBB

							&s->theData[0],

							nodeId, 

							&s->ptr[0]);

}



template<class T>

SimpleSignal *

SignalSender::waitFor(Uint32 timeOutMillis, T & t)

storage/ndb/src/ndbapi/TransporterFacade.cpp

+25 −0
Original line number Diff line number Diff line
@@ -1512,3 +1512,28 @@ void PollGuard::unlock_and_signal() 


template class Vector<NodeStatusFunction>;

template class Vector<TransporterFacade::ThreadData::Object_Execute>;



#include "SignalSender.hpp"



SendStatus

SignalSender::sendSignal(Uint16 nodeId, const SimpleSignal * s){

#ifdef API_TRACE

  if(setSignalLog() && TRACE_GSN(s->header.theVerId_signalNumber)){

    SignalHeader tmp = s->header;

    tmp.theSendersBlockRef = getOwnRef();



    LinearSectionPtr ptr[3];

    signalLogger.sendSignal(tmp,

			    1,

			    s->theData,

			    nodeId, ptr, 0);

    signalLogger.flushSignalLog();

  }

#endif

  

  return theFacade->theTransporterRegistry->prepareSend(&s->header,

							1, // JBB

							&s->theData[0],

							nodeId, 

							&s->ptr[0]);

}