Commit 6f334b55 authored by unknown's avatar unknown
Browse files

BUG#26358 remove unused and non-working SET_VAR_REQ/CONF signals 

remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing

Remove the dead SET_VAR_REQ,REF,CONF signals.

They:
a) don't currently work
b) will cause confusion with future mgmd updates for
   signal interface to configuration things (e.g. port numbers)


ndb/include/kernel/GlobalSignalNumbers.h:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing
  
  Remove the dead SET_VAR_REQ,REF,CONF signals.
  
  They:
  a) don't currently work
  b) will cause confusion with future mgmd updates for
     signal interface to configuration things (e.g. port numbers)
parent f8a679e9

ndb/include/kernel/GlobalSignalNumbers.h

+3 −3
Original line number Diff line number Diff line
@@ -543,9 +543,9 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
/* 448 unused - formerly GSN_STATISTICS_REQ */

#define GSN_STOP_ORD                    449

#define GSN_TAMPER_ORD                  450

#define GSN_SET_VAR_REQ                 451

#define GSN_SET_VAR_CONF                452

#define GSN_SET_VAR_REF                 453

/* 451 unused - formerly GSN_SET_VAR_REQ  */

/* 452 unused - formerly GSN_SET_VAR_CONF */

/* 453 unused - formerly GSN_SET_VAR_REF  */

/* 454 unused - formerly GSN_STATISTICS_CONF */



#define GSN_START_ORD                   455

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

+0 −3
Original line number Diff line number Diff line
@@ -383,9 +383,6 @@ const GsnName SignalNames [] = { 
  ,{ GSN_START_ORD,              "START_ORD" }

  ,{ GSN_STOP_ORD,               "STOP_ORD" }

  ,{ GSN_TAMPER_ORD,             "TAMPER_ORD" }

  ,{ GSN_SET_VAR_REQ,            "SET_VAR_REQ" }

  ,{ GSN_SET_VAR_CONF,           "SET_VAR_CONF" }

  ,{ GSN_SET_VAR_REF,            "SET_VAR_REF" }



  ,{ GSN_EVENT_SUBSCRIBE_REQ,    "EVENT_SUBSCRIBE_REQ" }

  ,{ GSN_EVENT_SUBSCRIBE_CONF,   "EVENT_SUBSCRIBE_CONF" }

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+0 −157
Original line number Diff line number Diff line
@@ -78,9 +78,6 @@ Cmvmi::Cmvmi(const Configuration & conf) : 
  addRecSignal(GSN_TEST_ORD,  &Cmvmi::execTEST_ORD);



  addRecSignal(GSN_TAMPER_ORD,  &Cmvmi::execTAMPER_ORD);

  addRecSignal(GSN_SET_VAR_REQ,  &Cmvmi::execSET_VAR_REQ);

  addRecSignal(GSN_SET_VAR_CONF,  &Cmvmi::execSET_VAR_CONF);

  addRecSignal(GSN_SET_VAR_REF,  &Cmvmi::execSET_VAR_REF);

  addRecSignal(GSN_STOP_ORD,  &Cmvmi::execSTOP_ORD);

  addRecSignal(GSN_START_ORD,  &Cmvmi::execSTART_ORD);

  addRecSignal(GSN_EVENT_SUBSCRIBE_REQ,
@@ -828,160 +825,6 @@ void Cmvmi::execTAMPER_ORD(Signal* signal) 


}//execTAMPER_ORD()







void Cmvmi::execSET_VAR_REQ(Signal* signal) 

{

#if 0



  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];

  ConfigParamId var = setVarReq->variable();

  jamEntry();

  switch (var) {

    

    // NDBCNTR_REF

    

    // DBTC

  case TransactionDeadlockDetectionTimeout:

  case TransactionInactiveTime:

  case NoOfConcurrentProcessesHandleTakeover:

    sendSignal(DBTC_REF, GSN_SET_VAR_REQ, signal, 3, JBB);

    break;

    

    // DBDIH

  case TimeBetweenLocalCheckpoints:

  case TimeBetweenGlobalCheckpoints:

    sendSignal(DBDIH_REF, GSN_SET_VAR_REQ, signal, 3, JBB);

    break;



    // DBLQH

  case NoOfConcurrentCheckpointsDuringRestart:

  case NoOfConcurrentCheckpointsAfterRestart:

    sendSignal(DBLQH_REF, GSN_SET_VAR_REQ, signal, 3, JBB);

    break;



    // DBACC

  case NoOfDiskPagesToDiskDuringRestartACC:

  case NoOfDiskPagesToDiskAfterRestartACC:

    sendSignal(DBACC_REF, GSN_SET_VAR_REQ, signal, 3, JBB);

    break;



    // DBTUP

  case NoOfDiskPagesToDiskDuringRestartTUP:

  case NoOfDiskPagesToDiskAfterRestartTUP:

    sendSignal(DBTUP_REF, GSN_SET_VAR_REQ, signal, 3, JBB);

    break;



    // DBDICT



    // NDBCNTR

  case TimeToWaitAlive:



    // QMGR

  case HeartbeatIntervalDbDb: // TODO ev till Ndbcnt ocks

  case HeartbeatIntervalDbApi:

  case ArbitTimeout:

    sendSignal(QMGR_REF, GSN_SET_VAR_REQ, signal, 3, JBB);

    break;



    // NDBFS



    // CMVMI

  case MaxNoOfSavedMessages:

  case LockPagesInMainMemory:

  case TimeBetweenWatchDogCheck:

  case StopOnError:

    handleSET_VAR_REQ(signal);

    break;





    // Not possible to update (this could of course be handled by each block

    // instead but I havn't investigated where they belong)

  case Id:

  case ExecuteOnComputer:

  case ShmKey:

  case MaxNoOfConcurrentOperations:

  case MaxNoOfConcurrentTransactions:

  case MemorySpaceIndexes:

  case MemorySpaceTuples:

  case MemoryDiskPages:

  case NoOfFreeDiskClusters:

  case NoOfDiskClusters:

  case NoOfFragmentLogFiles:

  case NoOfDiskClustersPerDiskFile:

  case NoOfDiskFiles:

  case MaxNoOfSavedEvents:

  default:



    int mgmtSrvr = setVarReq->mgmtSrvrBlockRef();

    sendSignal(mgmtSrvr, GSN_SET_VAR_REF, signal, 0, JBB);

  } // switch



#endif

}//execSET_VAR_REQ()





void Cmvmi::execSET_VAR_CONF(Signal* signal) 

{

  int mgmtSrvr = signal->theData[0];

  sendSignal(mgmtSrvr, GSN_SET_VAR_CONF, signal, 0, JBB);



}//execSET_VAR_CONF()





void Cmvmi::execSET_VAR_REF(Signal* signal) 

{

  int mgmtSrvr = signal->theData[0];

  sendSignal(mgmtSrvr, GSN_SET_VAR_REF, signal, 0, JBB);



}//execSET_VAR_REF()





void Cmvmi::handleSET_VAR_REQ(Signal* signal) {

#if 0

  SetVarReq* const setVarReq = (SetVarReq*)&signal->theData[0];

  ConfigParamId var = setVarReq->variable();

  int val = setVarReq->value();



  switch (var) {

  case MaxNoOfSavedMessages:

    theConfig.maxNoOfErrorLogs(val);

    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);

    break;

    

  case LockPagesInMainMemory:

    int result;

    if (val == 0) {

      result = NdbMem_MemUnlockAll();

    }

    else {

      result = NdbMem_MemLockAll();

    }

    if (result == 0) {

      sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);

    }

    else {

      sendSignal(CMVMI_REF, GSN_SET_VAR_REF, signal, 1, JBB);

    }

    break;



  case TimeBetweenWatchDogCheck:

    theConfig.timeBetweenWatchDogCheck(val);

    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);

    break;



  case StopOnError:

    theConfig.stopOnError(val);

    sendSignal(CMVMI_REF, GSN_SET_VAR_CONF, signal, 1, JBB);

    break;

    

  default:

    sendSignal(CMVMI_REF, GSN_SET_VAR_REF, signal, 1, JBB);

    return;

  } // switch

#endif

}



#ifdef VM_TRACE

class RefSignalTest {

public:

ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp

+0 −5
Original line number Diff line number Diff line
@@ -58,17 +58,12 @@ private: 
  void execSTOP_ORD(Signal* signal);

  void execSTART_ORD(Signal* signal);

  void execTAMPER_ORD(Signal* signal);

  void execSET_VAR_REQ(Signal* signal);

  void execSET_VAR_CONF(Signal* signal);

  void execSET_VAR_REF(Signal* signal);



  void execDUMP_STATE_ORD(Signal* signal);



  void execEVENT_SUBSCRIBE_REQ(Signal *);

  void cancelSubscription(NodeId nodeId);



  void handleSET_VAR_REQ(Signal* signal);



  void execTESTSIG(Signal* signal);

  void execNODE_START_REP(Signal* signal);

ndb/src/kernel/blocks/dbacc/Dbacc.hpp

+0 −1
Original line number Diff line number Diff line
@@ -911,7 +911,6 @@ private: 
  void execDROP_TAB_REQ(Signal* signal);

  void execFSREMOVECONF(Signal* signal);

  void execREAD_CONFIG_REQ(Signal* signal);

  void execSET_VAR_REQ(Signal* signal);

  void execDUMP_STATE_ORD(Signal* signal);



  // Statement blocks