diff options
author | unknown <stewart@mysql.com> | 2005-09-22 00:41:46 +1000 |
---|---|---|
committer | unknown <stewart@mysql.com> | 2005-09-22 00:41:46 +1000 |
commit | 90b102daa644cf26de29ca88a82ae1a0fd45fff6 (patch) | |
tree | 7215d6a637ea1ade3e9fa832be4dc9b95c304704 /ndb/include | |
parent | 8c963d39679dd8eb6fa7d09158e84c0672763c98 (diff) | |
download | mariadb-git-90b102daa644cf26de29ca88a82ae1a0fd45fff6.tar.gz |
BUG#11595 ndb_mgm shows from IP for second mgmd
BUG#12037 ndb_mgmd IP address do not show in other ndb_mgmd processes
Extend ApiVersionConf to include address.
ndb/include/kernel/signaldata/ApiVersion.hpp:
Extend ApiVersionConf to include inet_addr. the address used for communication to this node.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
include connect address in ApiVersionConf
ndb/src/mgmsrv/MgmtSrvr.cpp:
::status() now also returns char* address of the node.
For API or MGM, this is in ApiVersionConf.
For NDB, this is the standard get_connect_address.
When sending ApiVersionReq, try to send to a STARTED node (as these have
properly joined the cluster and know the connect addresses).
If versionNode is called for getOwnNodeId()==nodeId, try to get the address
via ApiVersionConf. If that fails, look it up in the configuration.
ndb/src/mgmsrv/MgmtSrvr.hpp:
Add char **address to prototypes.
ndb/src/mgmsrv/Services.cpp:
Get the connect address from mgmsrv.status()
Diffstat (limited to 'ndb/include')
-rw-r--r-- | ndb/include/kernel/signaldata/ApiVersion.hpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ndb/include/kernel/signaldata/ApiVersion.hpp b/ndb/include/kernel/signaldata/ApiVersion.hpp index 28281e7d186..a3774c9fba6 100644 --- a/ndb/include/kernel/signaldata/ApiVersion.hpp +++ b/ndb/include/kernel/signaldata/ApiVersion.hpp @@ -49,12 +49,11 @@ class ApiVersionConf { */ friend class MgmtSrv; public: - STATIC_CONST( SignalLength = 3 ); + STATIC_CONST( SignalLength = 4 ); Uint32 senderRef; Uint32 nodeId; //api node id Uint32 version; // Version of API node - - + Uint32 inet_addr; }; #endif |