Loading ndb/include/mgmapi/mgmapi_config_parameters.h +2 −4 Original line number Diff line number Diff line Loading @@ -125,10 +125,8 @@ #define CFG_SCI_HOST1_ID_1 551 #define CFG_SCI_HOST2_ID_0 552 #define CFG_SCI_HOST2_ID_1 553 #define CFG_SCI_HOSTNAME_1 554 #define CFG_SCI_HOSTNAME_2 555 #define CFG_SCI_SEND_LIMIT 556 #define CFG_SCI_BUFFER_MEM 557 #define CFG_SCI_SEND_LIMIT 554 #define CFG_SCI_BUFFER_MEM 555 #define CFG_OSE_PRIO_A_SIZE 602 #define CFG_OSE_PRIO_B_SIZE 603 Loading ndb/src/common/mgmcommon/IPCConfig.cpp +2 −6 Original line number Diff line number Diff line Loading @@ -398,18 +398,14 @@ IPCConfig::configureTransporters(Uint32 nodeId, } case CONNECTION_TYPE_SCI:{ SCI_TransporterConfiguration conf; const char * host1, * host2; conf.localNodeId = nodeId; conf.remoteNodeId = remoteNodeId; conf.checksum = checksum; conf.signalId = sendSignalId; conf.port= server_port; if(iter.get(CFG_SCI_HOSTNAME_1, &host1)) break; if(iter.get(CFG_SCI_HOSTNAME_2, &host2)) break; conf.localHostName = (nodeId == nodeId1 ? host1 : host2); conf.remoteHostName = (nodeId == nodeId1 ? host2 : host1); conf.localHostName = localHostName; conf.remoteHostName = remoteHostName; if(iter.get(CFG_SCI_SEND_LIMIT, &conf.sendLimit)) break; if(iter.get(CFG_SCI_BUFFER_MEM, &conf.bufferSize)) break; Loading ndb/src/mgmsrv/ConfigInfo.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -1831,7 +1831,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { STR_VALUE(MAX_INT_RNIL) }, { CFG_SCI_HOSTNAME_1, CFG_CONNECTION_HOSTNAME_1, "HostName1", "SCI", "Name/IP of computer on one side of the connection", Loading @@ -1842,7 +1842,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 0, 0 }, { CFG_SCI_HOSTNAME_2, CFG_CONNECTION_HOSTNAME_2, "HostName2", "SCI", "Name/IP of computer on one side of the connection", Loading Loading
ndb/include/mgmapi/mgmapi_config_parameters.h +2 −4 Original line number Diff line number Diff line Loading @@ -125,10 +125,8 @@ #define CFG_SCI_HOST1_ID_1 551 #define CFG_SCI_HOST2_ID_0 552 #define CFG_SCI_HOST2_ID_1 553 #define CFG_SCI_HOSTNAME_1 554 #define CFG_SCI_HOSTNAME_2 555 #define CFG_SCI_SEND_LIMIT 556 #define CFG_SCI_BUFFER_MEM 557 #define CFG_SCI_SEND_LIMIT 554 #define CFG_SCI_BUFFER_MEM 555 #define CFG_OSE_PRIO_A_SIZE 602 #define CFG_OSE_PRIO_B_SIZE 603 Loading
ndb/src/common/mgmcommon/IPCConfig.cpp +2 −6 Original line number Diff line number Diff line Loading @@ -398,18 +398,14 @@ IPCConfig::configureTransporters(Uint32 nodeId, } case CONNECTION_TYPE_SCI:{ SCI_TransporterConfiguration conf; const char * host1, * host2; conf.localNodeId = nodeId; conf.remoteNodeId = remoteNodeId; conf.checksum = checksum; conf.signalId = sendSignalId; conf.port= server_port; if(iter.get(CFG_SCI_HOSTNAME_1, &host1)) break; if(iter.get(CFG_SCI_HOSTNAME_2, &host2)) break; conf.localHostName = (nodeId == nodeId1 ? host1 : host2); conf.remoteHostName = (nodeId == nodeId1 ? host2 : host1); conf.localHostName = localHostName; conf.remoteHostName = remoteHostName; if(iter.get(CFG_SCI_SEND_LIMIT, &conf.sendLimit)) break; if(iter.get(CFG_SCI_BUFFER_MEM, &conf.bufferSize)) break; Loading
ndb/src/mgmsrv/ConfigInfo.cpp +2 −2 Original line number Diff line number Diff line Loading @@ -1831,7 +1831,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { STR_VALUE(MAX_INT_RNIL) }, { CFG_SCI_HOSTNAME_1, CFG_CONNECTION_HOSTNAME_1, "HostName1", "SCI", "Name/IP of computer on one side of the connection", Loading @@ -1842,7 +1842,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 0, 0 }, { CFG_SCI_HOSTNAME_2, CFG_CONNECTION_HOSTNAME_2, "HostName2", "SCI", "Name/IP of computer on one side of the connection", Loading