mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
8207d5cefd
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
126 lines
3.3 KiB
C++
126 lines
3.3 KiB
C++
/* Copyright (C) 2003 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef TransporterDefinitions_H
|
|
#define TransporterDefinitions_H
|
|
|
|
#include <ndb_global.h>
|
|
#include <kernel_types.h>
|
|
#include <NdbOut.hpp>
|
|
|
|
/**
|
|
* The maximum number of transporters allowed
|
|
* A maximum is needed to be able to allocate the array of transporters
|
|
*/
|
|
const int MAX_NTRANSPORTERS = 128;
|
|
|
|
/**
|
|
* The sendbuffer limit after which the contents of the buffer is sent
|
|
*/
|
|
const int TCP_SEND_LIMIT = 64000;
|
|
|
|
enum SendStatus {
|
|
SEND_OK = 0,
|
|
SEND_BLOCKED = 1,
|
|
SEND_DISCONNECTED = 2,
|
|
SEND_BUFFER_FULL = 3,
|
|
SEND_MESSAGE_TOO_BIG = 4,
|
|
SEND_UNKNOWN_NODE = 5
|
|
};
|
|
|
|
/**
|
|
* Protocol6 Header +
|
|
* (optional signal id) + (optional checksum) + (signal data)
|
|
*/
|
|
//const Uint32 MAX_MESSAGE_SIZE = (12+4+4+(4*25));
|
|
const Uint32 MAX_MESSAGE_SIZE = (12+4+4+(4*25)+(3*4)+4*4096);
|
|
|
|
/**
|
|
* TransporterConfiguration
|
|
*
|
|
* used for setting up a transporter. the union member specific is for
|
|
* information specific to a transporter type.
|
|
*/
|
|
struct TransporterConfiguration {
|
|
Uint32 port;
|
|
const char *remoteHostName;
|
|
const char *localHostName;
|
|
NodeId remoteNodeId;
|
|
NodeId localNodeId;
|
|
NodeId serverNodeId;
|
|
bool checksum;
|
|
bool signalId;
|
|
bool isMgmConnection; // is a mgm connection, requires transforming
|
|
|
|
union { // Transporter specific configuration information
|
|
|
|
struct {
|
|
Uint32 sendBufferSize; // Size of SendBuffer of priority B
|
|
Uint32 maxReceiveSize; // Maximum no of bytes to receive
|
|
} tcp;
|
|
|
|
struct {
|
|
Uint32 shmKey;
|
|
Uint32 shmSize;
|
|
int signum;
|
|
} shm;
|
|
|
|
struct {
|
|
Uint32 prioASignalSize;
|
|
Uint32 prioBSignalSize;
|
|
} ose;
|
|
|
|
struct {
|
|
Uint32 sendLimit; // Packet size
|
|
Uint32 bufferSize; // Buffer size
|
|
|
|
Uint32 nLocalAdapters; // 1 or 2, the number of adapters on local host
|
|
|
|
Uint32 remoteSciNodeId0; // SCInodeId for adapter 1
|
|
Uint32 remoteSciNodeId1; // SCInodeId for adapter 2
|
|
} sci;
|
|
};
|
|
};
|
|
|
|
struct SignalHeader {
|
|
Uint32 theVerId_signalNumber; // 4 bit ver id - 16 bit gsn
|
|
Uint32 theReceiversBlockNumber; // Only 16 bit blocknum
|
|
Uint32 theSendersBlockRef;
|
|
Uint32 theLength;
|
|
Uint32 theSendersSignalId;
|
|
Uint32 theSignalId;
|
|
Uint16 theTrace;
|
|
Uint8 m_noOfSections;
|
|
Uint8 m_fragmentInfo;
|
|
}; /** 7x4 = 28 Bytes */
|
|
|
|
struct LinearSectionPtr {
|
|
Uint32 sz;
|
|
Uint32 * p;
|
|
};
|
|
|
|
struct SegmentedSectionPtr {
|
|
Uint32 sz;
|
|
Uint32 i;
|
|
struct SectionSegment * p;
|
|
|
|
void setNull() { p = 0;}
|
|
bool isNull() const { return p == 0;}
|
|
};
|
|
|
|
class NdbOut & operator <<(class NdbOut & out, SignalHeader & sh);
|
|
|
|
#endif // Define of TransporterDefinitions_H
|