-
unknown authored
Treat the management server specially. It should always be the server in a transporter as we then have a known port to connect to on node restart. allows a mgm connection (i.e. to the management server port, our known port) to be transformed into a transporter connection. Also, clean up the struct TransporterConfiguration (used to be a struct for each transporter type. now there's just one) ndb/include/transporter/TransporterDefinitions.hpp: Clean up XXX_TransporterConfiguration and create one TransporterConfiguration structure. Makes things easier to read (especially in IPCConfig.cpp) ndb/include/transporter/TransporterRegistry.hpp: add get_mgm_handle (to compliment the set_mgm_handle function) clean up createTransporter to use just one TransporterConfiguration struct ndb/include/util/SocketClient.hpp: Introduce connect_without_auth() to ignore any authentication method that may have been set. ndb/src/common/mgmcommon/IPCConfig.cpp: Remove dead IPCConfig::configureTransporters(TransporterRegistry*) Fixup IPCConfig::configureTransporters(Uint32 nodeId...) - use the 'one struct TransporterConfiguration to rule them all' - make MGM node the server - fix switch statement for transporter types - close } in strange place - possible inadvertent fall through ndb/src/common/transporter/OSE_Transporter.cpp: a partial fix for the introduction of new parameters. OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime. ndb/src/common/transporter/OSE_Transporter.hpp: a partial fix for the introduction of new parameters. OSE shouldn't build how it is now. Better to keep the build broken than have it build and fail strangely at runtime. ndb/src/common/transporter/SCI_Transporter.cpp: should be correct for SCI transporter. ndb/src/common/transporter/SCI_Transporter.hpp: should be correct for SCI transporter ndb/src/common/transporter/SHM_Transporter.cpp: add new parameters for Transporter constructor ndb/src/common/transporter/SHM_Transporter.hpp: add new parameters for Transporter constructor ndb/src/common/transporter/TCP_Transporter.cpp: add new parameters for Transporter constructor ndb/src/common/transporter/TCP_Transporter.hpp: add new parameters for Transporter constructor ndb/src/common/transporter/Transporter.cpp: Add new parameters - isMgmConnection requires transforming from mgm to transporter - serverNodeId node id that will serve as the server Treat connection differently if isMgmConnection (send a special mgm command first) ndb/src/common/transporter/Transporter.hpp: add fields to constructor add isMgmConnection member (if true, have to transform a mgm connection) ndb/src/common/transporter/TransporterRegistry.cpp: createTransporter -> createTCPTransporter (etc) add extra transporter constructor parameters (from config) modify to use changes to TransporterConfiguration ndb/src/common/util/SocketClient.cpp: SocketClient::connect_without_auth() Temporarily disables authentication and connects. This is useful if you're trying to change what this SocketClient object is for (e.g. from mgm to ndb) ndb/src/common/util/SocketServer.cpp: Don't runSession or close socket when entering sessionThread if m_stopped ndb/src/mgmsrv/ConfigInfo.cpp: fixPortNumber - Get port number from the MGM node as it will always be the server ndb/src/mgmsrv/MgmtSrvr.cpp: transporter_connect(sockfd) - transform this mgm connection into a transporter connection ndb/src/mgmsrv/MgmtSrvr.hpp: prototype for transporter_connect ndb/src/mgmsrv/Services.cpp: add command: "transporter connect" stops the MgmApiSession and replaces it with a transporter connection ndb/src/mgmsrv/Services.hpp: prototype for transporter_connect
8207d5ce