Commit 90b34155 authored by unknown's avatar unknown

finish Impl 1 "report port" of WL2278

Dynamic port allocation of cluster nodes:
Impl 1 is reporting the port used back to the mgmd. No actual dynamic ports.


ndb/src/common/mgmcommon/IPCConfig.cpp:
  pass correct node id to add_transporter_interface.
  
  remoteNodeId is what we want, and is what we're now passing
ndb/src/mgmapi/mgmapi.cpp:
  Don't use a ': ' at the end of args.put calls.
ndb/src/mgmsrv/Services.cpp:
  Fix indenting
parent 82b5701b
...@@ -367,7 +367,7 @@ IPCConfig::configureTransporters(Uint32 nodeId, ...@@ -367,7 +367,7 @@ IPCConfig::configureTransporters(Uint32 nodeId,
Uint32 server_port= 0; Uint32 server_port= 0;
if(iter.get(CFG_CONNECTION_SERVER_PORT, &server_port)) break; if(iter.get(CFG_CONNECTION_SERVER_PORT, &server_port)) break;
if (nodeId <= nodeId1 && nodeId <= nodeId2) { if (nodeId <= nodeId1 && nodeId <= nodeId2) {
tr.add_transporter_interface(nodeId2, localHostName, server_port); tr.add_transporter_interface(remoteNodeId, localHostName, server_port);
} }
DBUG_PRINT("info", ("Transporter between this node %d and node %d using port %d, signalId %d, checksum %d", DBUG_PRINT("info", ("Transporter between this node %d and node %d using port %d, signalId %d, checksum %d",
nodeId, remoteNodeId, server_port, sendSignalId, checksum)); nodeId, remoteNodeId, server_port, sendSignalId, checksum));
......
...@@ -1991,10 +1991,10 @@ ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle, ...@@ -1991,10 +1991,10 @@ ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
CHECK_CONNECTED(handle, 0); CHECK_CONNECTED(handle, 0);
Properties args; Properties args;
args.put("node1: ", node1); args.put("node1", node1);
args.put("node2: ", node2); args.put("node2", node2);
args.put("param: ", param); args.put("param", param);
args.put("value: ", value); args.put("value", value);
const ParserRow<ParserDummy> reply[]= { const ParserRow<ParserDummy> reply[]= {
MGM_CMD("set connection parameter reply", NULL, ""), MGM_CMD("set connection parameter reply", NULL, ""),
......
...@@ -1356,7 +1356,7 @@ MgmApiSession::setParameter(Parser_t::Context &, ...@@ -1356,7 +1356,7 @@ MgmApiSession::setParameter(Parser_t::Context &,
void void
MgmApiSession::setConnectionParameter(Parser_t::Context &ctx, MgmApiSession::setConnectionParameter(Parser_t::Context &ctx,
Properties const &args) { Properties const &args) {
BaseString node1, node2, param, value; BaseString node1, node2, param, value;
args.get("node1", node1); args.get("node1", node1);
args.get("node2", node2); args.get("node2", node2);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment