into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/transporter/Transporter.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
ndb_mgmd limited no of api nodes, by restricting no of mgmsessions
(these are used for dynamic port allocation)
ndb/include/util/SocketServer.hpp:
Increase default max session to ~0
ndb/src/common/util/SocketServer.cpp:
Increase default max session to ~0
WL#2703 restart for ndb_mgmd
Solving two problems with one stone.
Allows the stopping and restarting of mgm nodes other than the one the mgmclient
is connected to.
ndb/include/mgmapi/mgmapi.h:
Add the internal ndb_mgm_end_session command.
This will unreserve the nodeid we have allocated synchronously.
Otherwise we can't do a restart of a node really quickly as the nodeids are cleaned
up after the connection to mgmd is closed.
ndb/include/mgmcommon/ConfigRetriever.hpp:
Allow configuration on if end_session is going to be called on object destruction.
We need to set this to false for ndbd as we fork()
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
When destroying ConfigRetreiver, ndb_mgm_end_session - i.e. deallocate the nodeid
ndb/src/common/util/SocketServer.cpp:
When destroying a SocketServer, close the server socket.
ndb/src/kernel/main.cpp:
don't purge allocated resources when cleaning up in parent process (nodeid)
ndb/src/kernel/vm/Configuration.cpp:
have option end_session to closeConfiguration
ndb/src/kernel/vm/Configuration.hpp:
have option end_session to closeConfiguration
ndb/src/mgmapi/mgmapi.cpp:
Implement ndb_mgm_end_session
ndb/src/mgmclient/CommandInterpreter.cpp:
Correct output of STOP as we can now stop mgmd as well as ndbd
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add code into start for connecting to our own mgmd.
Create sendStopMgmd() which does the same job as sendSTOP_REQ, but for ndb_mgmd
Allow stopping of other ndb_mgmd processes by creating a connection to them
and issuing the stop command
When stopping all nodes, stop other ndb_mgmd processes as well.
Remove set_connect_string. Replace with connect_to_self. This is a much better
way of doing things.
ndb/src/mgmsrv/MgmtSrvr.hpp:
add connect_to_self and remove set_connect_string.
ndb/src/mgmsrv/Services.cpp:
Add endSession.
- delete Allocated_resources for this connection
- create new Allocated_resources for this connection
conceivably you could keep the socket open across node restarts (and even
possibly get a different node id). But I wouldn't try it and expect happiness.
ndb/src/mgmsrv/Services.hpp:
Add endSession
ndb/src/mgmsrv/main.cpp:
allow mgmd to be restarted.
- add g_RestartServer flag
- move connecting to our own mgmd into MgmtSrvr (where it belongs)
- output correct Shutdown/Restart message on shutdown/restart
ndb/include/util/SocketServer.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/SocketClient.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmclient/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
merge
ndb/src/common/mgmcommon/IPCConfig.cpp:
merge
ndb/src/common/transporter/TransporterRegistry.cpp:
merge
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/src/mgmclient/CommandInterpreter.cpp:
merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
merge
ndb/src/mgmsrv/Services.cpp:
merge
ndb/src/mgmsrv/main.cpp:
merge
ndb/src/ndbapi/TransporterFacade.cpp:
merge
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
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
ndb/src/common/util/SocketServer.cpp:
Check for errors from getsockname (and error display).
use SOCKET_SIZE_TYPE (as discovered by configure) instead of socklen_t
- Change configuration handling so that no default ports are given, but instead 0 is set (port to be dynamic)
- TransporterRegistry::start_service now only tries to connect when fetched port number > 0
ndb/include/util/SocketServer.hpp:
Update prototype of setup() to take a pointer to the port (so we can return the port we bound to)
ndb/src/common/transporter/TransporterRegistry.cpp:
Only try to connect_client when we have a valid port number (i.e. > 0)
ndb/src/common/util/SocketServer.cpp:
::setup(): Return the port we bound to
ndb/src/cw/cpcd/main.cpp:
Use new SocketServer::setup() api - returns port we bound to.
ndb/src/mgmsrv/main.cpp:
Conform to new SocketServer::setup() API (port is a pointer, returning the port we bound to)
ndb/src/mgmsrv/ConfigInfo.cpp:
fixPortNumber:
Don't create port numbers when none are specified, just set 0 (dynamic)
ndb/src/mgmsrv/MgmtSrvr.cpp:
use DBUG_RETURN correctly in setConnectionDbParameter
ndb/include/util/Bitmask.hpp:
added bitXORC
ndb/include/util/SocketServer.hpp:
added method to apply function on each session
ndb/src/common/util/SocketServer.cpp:
added method to apply function on each session
using tryBind instead to determine if we're "config host" is "local"
ndb/include/util/SocketServer.hpp:
made tryBind static
ndb/src/common/util/SocketServer.cpp:
made tryBind static
ndb/src/mgmsrv/MgmtSrvr.cpp:
using tryBind instead to determine if we're "config host" is "local"
added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat
ndb/include/mgmapi/mgmapi_config_parameters.h:
removed different CFG_ defined for connection host names
ndb/include/transporter/TransporterRegistry.hpp:
added support for setting up multiple interfaces
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
removed different CFG_ defined for connection host names
ndb/src/common/mgmcommon/IPCConfig.cpp:
added support for setting up multiple interfaces
ndb/src/common/portlib/NdbTCP.cpp:
added debug printouts
ndb/src/common/transporter/TransporterRegistry.cpp:
added support for setting up multiple interfaces
ndb/src/common/util/SocketServer.cpp:
added my_thread init to enable debug printouts
ndb/src/mgmclient/CommandInterpreter.cpp:
shortened lines
ndb/src/mgmsrv/ConfigInfo.cpp:
removed different CFG_ defined for connection host names
changed automatic allocation of ports somewhat
ndb/src/mgmsrv/MgmtSrvr.cpp:
correct connect address for mgmt server
ndb/src/mgmsrv/Services.cpp:
shoretened lines
ndb/src/mgmsrv/main.cpp:
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
ndb/src/common/mgmcommon/ConfigInfo.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
ndb/include/kernel/NodeState.hpp:
Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
ndb/include/util/Bitmask.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/common/util/SocketServer.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CpcClient.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/test/include/NDBT_Table.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/test/run-test/main.cpp:
Auto merged
ndb/test/src/HugoOperations.cpp:
Auto merged
ndb/test/src/HugoTransactions.cpp:
Auto merged
ndb/test/src/NDBT_Tables.cpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
Added info about connected nodes to ApiRegConf
ndb/include/mgmapi/mgmapi.h:
New mgmapi command to get nodeid dynamically
ndb/include/mgmapi/mgmapi_config_parameters.h:
New config param to specify port on for transporter setup
ndb/include/mgmcommon/ConfigRetriever.hpp:
added notetype to getConfig
ndb/include/portlib/NdbTCP.h:
small detail
ndb/include/transporter/TransporterRegistry.hpp:
changed performstates and interface to connect/disconnect transporters
added TransporterService for transporter setup
changed model for setting up transporters
ndb/src/common/mgmcommon/ConfigInfo.cpp:
removed some config params as mandatory
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added dynamic alloc of nodeid
ndb/src/common/mgmcommon/LocalConfig.cpp:
added default localhost:2200 and dynamic id
ndb/src/common/transporter/TCP_Transporter.cpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TCP_Transporter.hpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.cpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/Transporter.hpp:
moved TCP hostname stuff from TCP_Transporter to parent class Transporter
changed TCP connection setup to use just one port for all transporters
ndb/src/common/transporter/TransporterRegistry.cpp:
changed performstates and interface to connect/disconnect transporters
added TransporterService for transporter setup
changed model for setting up transporters
ndb/src/common/util/Makefile.am:
New SocketAuthenticator
ndb/src/common/util/SocketServer.cpp:
small detail
ndb/src/kernel/Makefile.am:
small detail
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
new interface to performstates + cleanup
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
changed signal ApiRegConf
ndb/src/kernel/vm/ThreadConfig.cpp:
changed naming
ndb/src/mgmapi/mgmapi.cpp:
Use new Socket client
New methid for allocating dynamic id
ndb/src/mgmsrv/MgmtSrvr.cpp:
moved port setup from main.cpp to MgmtSrvr
new method getNextFreeNodeId
ndb/src/mgmsrv/MgmtSrvr.hpp:
..
ndb/src/mgmsrv/Services.cpp:
allocate new nodeid
ndb/src/mgmsrv/Services.hpp:
..
ndb/src/mgmsrv/main.cpp:
moved setup port to MgmtSrvr.cpp
Rearranged setup order
ndb/src/ndbapi/ClusterMgr.cpp:
new API_REGCONF
ndb/src/ndbapi/ClusterMgr.hpp:
bitmask to hold connected nodes
ndb/src/ndbapi/TransporterFacade.cpp:
New transporter connect
ndb/src/ndbapi/TransporterFacade.hpp:
removed function not used
ndb/src/kernel/main.cpp:
new transporter setup
