- ensure in ndb_mgmd that the stop command is not issued if a node is restarting
- added some new error messages
- in ndbcntr on master check so that node does not shutdown id shutdoen in progress
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes
configure.in:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
ndb/include/kernel/signaldata/SystemError.hpp:
+ removed some unused codes
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
+ removed all progError(..0..) to make sure all error invocations have an error code
ndb/src/kernel/main.cpp:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
- added 2 new error codes for out of data and index memory during SR
+ removed c++ style comments from c file
ndb/include/mgmapi/ndbd_exit_codes.h:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
Delete: ndb/src/kernel/error/ErrorMessages.hpp
config/ac-macros/ha_ndbcluster.m4:
add ndb mgmapi to ndbcluster_includes
extra/perror.c:
perror to print also ndbd exit codes
ndb/include/Makefile.am:
added new ndbd exit code include file to src distribution
ndb/include/kernel/signaldata/EventReport.hpp:
backported from 5.1, included node id in event report signal
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
backported from 5.1, included node id in event report signal
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Fix LCP during SR parameters
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Fix LCP during SR parameters
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Fix LCP during SR parameters
ndb/src/mgmsrv/ConfigInfo.cpp:
Fix LCP during SR parameters
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/tools/Makefile.am:
merge
ndb/include/mgmapi/mgmapi.h:
Add feature to redirect error printouts
ndb/src/mgmapi/mgmapi.cpp:
Add feature to redirect error printouts
ndb/src/mgmsrv/ConfigInfo.hpp:
Make param info public
ndb/tools/Makefile.am:
Add ndb_config
ndb/tools/config.cpp:
New BitKeeper file ``ndb/tools/config.cpp''
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/include/mgmapi/mgmapi_config_parameters.h:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
ndb/src/mgmsrv/ConfigInfo.cpp:
Reenable MAX_OPEN_FILES to enable LCP in some situations
move internal mgmapi functions into it.
should also fix AIX build problem.
ndb/include/mgmapi/mgmapi.h:
Move ndb_mgm_convert_to_transporter to mgmapi_internal.h
Should fix AIX build problem
ndb/include/mgmapi/mgmapi_debug.h:
Move ndb_mgm_(get|set)_connection_int_parameter to mgmapi_internal.h
ndb/src/common/transporter/Makefile.am:
Add ndb/src/mgmapi to include for common/transporter (TransporterRegistry requires the use of mgmapi_internal.h)
ndb/src/common/transporter/TransporterRegistry.cpp:
Use mgmapi_internal.h
ndb/src/mgmapi/mgmapi.cpp:
some functions defined in mgmapi_internal.h
ndb/src/ndbapi/ndb_cluster_connection.cpp:
use functions from mgmapi_internal.h
ndb/include/mgmapi/mgmapi.h:
ndb_mgm_convert_to_transporter may destroy the handle, now takes a pointer.
ndb/include/mgmcommon/ConfigRetriever.hpp:
If outside code is going to manipulate the NdbMgmHandle, allow it to do it
via a get_mgmHandlePtr() call
ndb/include/transporter/TransporterRegistry.hpp:
connect_client and connect_ndb_mgmd may destroy the handle, now they take a pointer.
ndb/src/common/transporter/TransporterRegistry.cpp:
When start_service is binding to ports, report back the port numbers.
We need this here now, as we re-use the initial mgm connection as a transporter, which
is connected *before* start_service has allocated the dynamic port numbers. So the creation
of this early transporter cannot be used to send the dynamic ports to the mgmd.
We connect to the mgm server (using the handle that will be used in the client_Connect thread)
if needed. This is thread safe as start_service is only ever called once, before
the client connect thread starts.
connect_client,connect_ndb_mgmd may destroy the NdbMgmHandle. It now accepts a pointer to it.
ndb/src/kernel/vm/Configuration.cpp:
Copy the m_mgmd_host string from the config_retreiver as the NdbMgmHandle in the
ConfigRetreiver will be destroyed later (along with the host string).
globalTransporterRegistry.connect_client will destroy the mgm handle, use a pointer to the handle.
ndb/src/kernel/vm/Configuration.hpp:
allow the dynamic allocation of m_mgmd_host.
ndb/src/mgmapi/mgmapi.cpp:
accept a pointer for ndb_mgm_convert_to_transporter as we destroy the handle.
ndb/include/mgmapi/mgmapi.h:
Add mgmapi call: ndb_mgm_get_mgmd_nodeid()
- returns the node id that the handle is connected to.
- returns 0 on error.
ndb/include/transporter/TransporterRegistry.hpp:
Add TransporterRegistry::connect_client(NdbMgmHandle h)
- uses a connected NdbMgmHandle to connect to the mgm server as a client.
- sets up a transporter connection
- used to transform the initial mgm connection (used for fetching configuration)
into a transporter connection
Added connect_ndb_mgmd(NdbMgmHandle h)
- turn the supplied mgm connection into a transporter connection
- return the socket
Improve comments on connect_ndb_mgmd(SocketClient)
ndb/src/common/transporter/Transporter.cpp:
Add Transporter::connect_client(NDB_SOCKET_TYPE)
- use an existing socket to make a transporter connection
ndb/src/common/transporter/Transporter.hpp:
Add connect_client(NDB_SOCKET_TYPE)
ndb/src/common/transporter/TransporterRegistry.cpp:
Add TransporterRegistry::connect_client(NdbMgmHandle)
- use an existing mgm connection to connect a transporter
- used to change the mgm connection used for fetching configuration into a transporter
Add connect_ndb_mgmd(NdbMgmHandle)
- use existing NdbMgmHandle
- convert to transporter
- return socket
ndb/src/kernel/vm/Configuration.cpp:
After fetching configuration, use the mgm connection as a transporter.
Fail fatally if this fails.
ndb/src/mgmapi/mgmapi.cpp:
Add ndb_mgm_get_mgmd_nodeid(h)
- returns the node id of the mgm server you're connected to.
ndb/src/mgmsrv/Services.cpp:
Add "get mgmd nodeid" mgmd call
returns 'nodeid' - the node id of the mgm server your connected to
ndb/src/mgmsrv/Services.hpp:
add prototype for get_mgmd_nodeid
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/include/mgmapi/mgmapi.h:
merge
Reconnect to mgm server in connect_clients thread if m_mgm_handle is disconnected.
ndb/include/mgmapi/mgmapi.h:
Add prototype for ndb_mgm_is_connected
ndb/src/common/transporter/TransporterRegistry.cpp:
start_clients_thread:
- don't get port if we don't have to
- Reconnect to mgm server if m_mgm_handle is disconnected
ndb/src/mgmapi/mgmapi.cpp:
add ndb_mgm_is_connected
- when connecting to a mgm server as a transporter, create a NdbMgmHandle
- over this mgm handle, report the dynamic ports
- then turn it into a transporter
- this will re-report dynamic ports to mgmds when they restart (as we'll have to
set up our transporter again). This will also report it to all mgmds (as we'll
have transporters to all of them).
ndb/include/mgmapi/mgmapi.h:
Add ndb_mgm_convert_to_transporter
- converts to a transporter connect
- destroys the handle (without disconnecting)
- returns socket
ndb/include/transporter/TransporterRegistry.hpp:
Add prototype for connect_ndb_mgmd
ndb/include/util/SocketClient.hpp:
Remove connect_without_auth
Add get_port() and get_server_name()
ndb/src/common/transporter/Transporter.cpp:
use TransporterRegistry::connect_ndb_mgmd() to make the connection if isMgmConnection
ndb/src/common/transporter/TransporterRegistry.cpp:
Impliment TransporterRegistry::connect_ndb_mgmd
- takes a SocketClient and constructs a connectstring.
- uses this connect string to make a NdbMgmHandle
- send dynamic ports to this mgm server
- transform into a transporter connect
- return socket
ndb/src/common/util/SocketClient.cpp:
Remove connect_without_auth
ndb/src/kernel/main.cpp:
Don't relay dynamic ports. We now do this on transporter connect
ndb/src/mgmapi/mgmapi.cpp:
Impliment ndb_mgm_convert_to_transporter
- converts the mgm connection into a transporter connection
- destroys the handle
- returns the socket that should now be used as a transporter
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/cw/cpcd/main.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/drop_tab.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
SCCS merged
ndb/src/mgmsrv/main.cpp:
resolved merge conflict
added shared memory config parameter, signum for use in signalling
added global variable for holdign signum to be used for shared memory connection
only fiddle with signals if it is set
simplified common ndb client option handling
ndb/include/Makefile.am:
added common defaults file
ndb/include/mgmapi/mgmapi_config_parameters.h:
added shared memory config parameter, signum for use in signalling
ndb/include/transporter/TransporterDefinitions.hpp:
added shared memory config parameter, signum for use in signalling
ndb/include/util/ndb_opts.h:
simplified common ndb client option handling
ndb/src/common/mgmcommon/IPCConfig.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/common/portlib/NdbThread.c:
added global variable for holdign signum to be used for shared memory connection
only block signals if shared memory is used
ndb/src/common/transporter/SHM_Transporter.cpp:
use signum in new global variable for shared memory signalling
ndb/src/common/transporter/TransporterRegistry.cpp:
use signum in new global variable for shared memory signalling
only fiddle with signals if it is set
ndb/src/cw/cpcd/main.cpp:
ndb_opts not really used
ndb/src/kernel/vm/Configuration.cpp:
simplified common ndb client option handling
ndb/src/mgmclient/main.cpp:
simplified common ndb client option handling
ndb/src/mgmsrv/ConfigInfo.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/mgmsrv/main.cpp:
simplified common ndb client option handling
ndb/tools/delete_all.cpp:
simplified common ndb client option handling
ndb/tools/desc.cpp:
simplified common ndb client option handling
ndb/tools/drop_index.cpp:
simplified common ndb client option handling
ndb/tools/drop_tab.cpp:
simplified common ndb client option handling
ndb/tools/listTables.cpp:
simplified common ndb client option handling
ndb/tools/restore/restore_main.cpp:
simplified common ndb client option handling
ndb/tools/select_all.cpp:
simplified common ndb client option handling
ndb/tools/select_count.cpp:
simplified common ndb client option handling
ndb/tools/waiter.cpp:
simplified common ndb client option handling
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl4
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
When a node restarts it starts over again with fetching the configuration
- It is not sure that it can use the "old dynamically allocated port number" again.
- It should however try to reuse the old one, if not possible it should
allocate a new one. One has to be able to distinguish between portnumbers
specified originally in the config, and ones that has been dynamically added
(the latter may be changed if "busy", but the first cannot be changed).
We use negative portnumbers for ports that are ok to change.
ndb/include/mgmapi/mgmapi_debug.h:
change prototype for:
ndb_mgm_set_connection_int_parameter
ndb_mgm_get_connection_int_parameter
Accept/set an int instead of an unsigned
ndb/include/transporter/TransporterRegistry.hpp:
Use an int (signed) to represent a port number.
Zero means dynamic (but unassigned)
>0 means static (defined in configuration)
<0 means dynamic (and should be converted to positive before use)
ndb/src/common/mgmcommon/IPCConfig.cpp:
Set up the Transporter with a port number of the correct sign.
ndb/src/common/transporter/TransporterRegistry.cpp:
start_clients_thread:
- handle negative port numbers
add_transporter_interface:
- accept signed integer as port number
start_service:
- If port is dynamic (<0), try to bind to it.
if that fails (e.g. some other process has taken that port),
then get a new dynamic port number.
ndb/src/mgmapi/mgmapi.cpp:
Use a signed integer for value in:
ndb_mgm_set_connection_int_parameter
ndb_mgm_get_connection_int_parameter
Cast to a Uint32 for storage/retrieval to/from Properties
ndb/src/mgmsrv/MgmtSrvr.cpp:
getConnectionDbParameter
- return value as integer (signed)
- cast as Uint32 for iter.get
ndb/src/mgmsrv/MgmtSrvr.hpp:
Update prototype of getConnectionDbParameter
int value (not unsigned anymore)
ndb/src/mgmsrv/Services.cpp:
MgmApiSession::getConnectionParameter
- value is now signed
removed grep event and added congestion event
more docs
changed some naming, expecially regarding severities
added config param for logevel for congestion
mysql-test/ndb/basic.result:
updated ndb_mgm test
mysql-test/ndb/restart.test:
updated ndb_mgm test
ndb/include/kernel/LogLevel.hpp:
removed grep event and added congestion event
ndb/include/mgmapi/mgmapi.h:
more docs
changed some naming, expecially regarding severities
ndb/include/mgmapi/mgmapi_config_parameters.h:
removed grep event and added congestion event
ndb/src/common/debugger/EventLogger.cpp:
removed grep event and added congestion event
ndb/src/mgmapi/mgmapi.cpp:
changed some naming, expecially regarding severities
ndb/src/mgmsrv/ConfigInfo.cpp:
added config param for logevel for congestion
ndb/src/mgmsrv/Services.cpp:
just som variable name changes
BitKeeper/etc/logging_ok:
auto-union
ndb/docs/wl2077.txt:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/common/debugger/EventLogger.cpp:
Auto merged
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
Auto merged
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
ndb/src/common/util/Makefile.am:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/mgmsrv/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/Services.hpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/Ndbif.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
ndb/src/ndbapi/Ndblist.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/Makefile.am:
Auto merged
ndb/test/ndbapi/testDict.cpp:
Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
ndb/test/tools/Makefile.am:
Auto merged
ndb/tools/Makefile.am:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
and ndbapi.hpp as they look like crap when converted
to PDF.
ndb/include/mgmapi/mgmapi.h:
Got rid of <code> tags in doxycomments.
ndb/include/ndbapi/Ndb.hpp:
Got rid of <code> tags in doxycomments.