Commit a964b182 authored by unknown's avatar unknown
Browse files

change to using public enum for log events 


ndb/include/Makefile.am:
  added ndb_logevent to source dist
parent 0f44ad64

ndb/include/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ mgmapiinclude_HEADERS = \ 
mgmapi/mgmapi.h \

mgmapi/mgmapi_debug.h \

mgmapi/mgmapi_config_parameters.h \

mgmapi/mgmapi_config_parameters_debug.h

mgmapi/mgmapi_config_parameters_debug.h \

mgmapi/ndb_logevent.h



noinst_HEADERS = \

ndb_global.h \

ndb/include/debugger/EventLogger.hpp

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public: 
   * severity  - DEBUG to ALERT (Type of log message)

   */  

  struct EventRepLogLevelMatrix {

    EventReport::EventType        eventType;

    Ndb_logevent_type        eventType;

    LogLevel::EventCategory   eventCategory;

    Uint32                        threshold;

    Logger::LoggerLevel            severity;

ndb/include/kernel/signaldata/EventReport.hpp

+6 −82
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#ifndef SD_EVENT_REPORT_H

#define SD_EVENT_REPORT_H



#include <ndb_logevent.h>

#include "SignalData.hpp"



/**
@@ -67,98 +68,21 @@ public: 
     4) Add SentHeartbeat in EventLogger::getText()



   */

  enum EventType {

    // CONNECTION

    Connected = 0,

    Disconnected = 1,

    CommunicationClosed = 2,

    CommunicationOpened = 3,

    ConnectedApiVersion = 51,

    // CHECKPOINT

    GlobalCheckpointStarted = 4,

    GlobalCheckpointCompleted = 5,

    LocalCheckpointStarted = 6,

    LocalCheckpointCompleted = 7,

    LCPStoppedInCalcKeepGci = 8,

    LCPFragmentCompleted = 9,

    // STARTUP

    NDBStartStarted = 10,

    NDBStartCompleted = 11,

    STTORRYRecieved = 12,

    StartPhaseCompleted = 13,

    CM_REGCONF = 14,

    CM_REGREF = 15,

    FIND_NEIGHBOURS = 16,

    NDBStopStarted = 17,

    NDBStopAborted = 18,

    StartREDOLog = 19,

    StartLog = 20,

    UNDORecordsExecuted = 21,



    // NODERESTART

    NR_CopyDict = 22,

    NR_CopyDistr = 23,

    NR_CopyFragsStarted = 24,

    NR_CopyFragDone = 25,

    NR_CopyFragsCompleted = 26,

    

    // NODEFAIL

    NodeFailCompleted = 27,

    NODE_FAILREP = 28,

    ArbitState = 29,

    ArbitResult = 30,

    GCP_TakeoverStarted = 31,

    GCP_TakeoverCompleted = 32,

    LCP_TakeoverStarted = 33,

    LCP_TakeoverCompleted = 34,

    

    // STATISTIC

    TransReportCounters = 35,

    OperationReportCounters = 36,

    TableCreated = 37,

    UndoLogBlocked = 38,

    JobStatistic = 39,

    SendBytesStatistic = 40,

    ReceiveBytesStatistic = 41,

    MemoryUsage = 50,



    // ERROR

    TransporterError = 42,

    TransporterWarning = 43,

    MissedHeartbeat = 44,

    DeadDueToHeartbeat = 45,

    WarningEvent = 46,

    // INFO

    SentHeartbeat = 47,

    CreateLogBytes = 48,

    InfoEvent = 49,



    //GREP

    GrepSubscriptionInfo = 52,

    GrepSubscriptionAlert = 53,



    //BACKUP

    BackupStarted = 54,

    BackupFailedToStart = 55,

    BackupCompleted = 56,

    BackupAborted = 57

  };

  

  void setEventType(EventType type);

  EventType getEventType() const;

  void setEventType(Ndb_logevent_type type);

  Ndb_logevent_type getEventType() const;

  UintR eventType;    // DATA 0

};



inline

void

EventReport::setEventType(EventType type){

EventReport::setEventType(Ndb_logevent_type type){

  eventType = (UintR) type;

}



inline

EventReport::EventType

Ndb_logevent_type

EventReport::getEventType() const {

  return (EventType)eventType;

  return (Ndb_logevent_type)eventType;

}



#endif

ndb/src/common/debugger/EventLogger.cpp

+115 −115

File changed.

Preview size limit exceeded, changes collapsed.

ndb/src/kernel/blocks/backup/Backup.cpp

+4 −4
Original line number Diff line number Diff line
@@ -954,7 +954,7 @@ Backup::sendBackupRef(BlockReference senderRef, Signal *signal, 
  sendSignal(senderRef, GSN_BACKUP_REF, signal, BackupRef::SignalLength, JBB);



  if(errorCode != BackupRef::IAmNotMaster){

    signal->theData[0] = EventReport::BackupFailedToStart;

    signal->theData[0] = NDB_LE_BackupFailedToStart;

    signal->theData[1] = senderRef;

    signal->theData[2] = errorCode;

    sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 3, JBB);
@@ -1242,7 +1242,7 @@ Backup::defineBackupReply(Signal* signal, BackupRecordPtr ptr, Uint32 nodeId) 
  sendSignal(ptr.p->clientRef, GSN_BACKUP_CONF, signal, 

	     BackupConf::SignalLength, JBB);

  

  signal->theData[0] = EventReport::BackupStarted;

  signal->theData[0] = NDB_LE_BackupStarted;

  signal->theData[1] = ptr.p->clientRef;

  signal->theData[2] = ptr.p->backupId;

  ptr.p->nodes.copyto(NdbNodeBitmask::Size, signal->theData+3);
@@ -2087,7 +2087,7 @@ Backup::stopBackupReply(Signal* signal, BackupRecordPtr ptr, Uint32 nodeId) 
  sendSignal(ptr.p->clientRef, GSN_BACKUP_COMPLETE_REP, signal,

	     BackupCompleteRep::SignalLength, JBB);



  signal->theData[0] = EventReport::BackupCompleted;

  signal->theData[0] = NDB_LE_BackupCompleted;

  signal->theData[1] = ptr.p->clientRef;

  signal->theData[2] = ptr.p->backupId;

  signal->theData[3] = ptr.p->startGCP;
@@ -2289,7 +2289,7 @@ Backup::masterSendAbortBackup(Signal* signal, BackupRecordPtr ptr) 
    sendSignal(ptr.p->clientRef, GSN_BACKUP_ABORT_REP, signal, 

	       BackupAbortRep::SignalLength, JBB);



    signal->theData[0] = EventReport::BackupAborted;

    signal->theData[0] = NDB_LE_BackupAborted;

    signal->theData[1] = ptr.p->clientRef;

    signal->theData[2] = ptr.p->backupId;

    signal->theData[3] = ptr.p->errorCode;