mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
BUG#4511 Made Discless deprecated
mysql-test/mysql-test-run.sh: Change to diskless mysql-test/ndb/ndb_config_2_node.ini: Change to diskless mysql-test/ndb/ndbcluster.sh: Change to diskless ndb/src/common/mgmcommon/ConfigInfo.cpp: Making Discless deprecated, so it still can be used but a warning will be printed if used. Adde possibilty to transform a value of type ConfigInfo::BOOL, neede for depicated Discless
This commit is contained in:
@ -1449,7 +1449,7 @@ then
|
||||
if [ -z "$USE_RUNNING_NDBCLUSTER" ]
|
||||
then
|
||||
echo "Starting ndbcluster"
|
||||
./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --discless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1
|
||||
./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1
|
||||
export NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"
|
||||
else
|
||||
export NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"
|
||||
|
@ -3,7 +3,7 @@ NoOfReplicas: 2
|
||||
MaxNoOfConcurrentOperations: CHOOSE_MaxNoOfConcurrentOperations
|
||||
DataMemory: CHOOSE_DataMemory
|
||||
IndexMemory: CHOOSE_IndexMemory
|
||||
Discless: CHOOSE_Discless
|
||||
Diskless: CHOOSE_Diskless
|
||||
|
||||
[COMPUTER]
|
||||
Id: 1
|
||||
|
@ -42,7 +42,7 @@ cfgfile=Ndb.cfg
|
||||
stop_ndb=
|
||||
initial_ndb=
|
||||
status_ndb=
|
||||
ndb_discless=0
|
||||
ndb_diskless=0
|
||||
|
||||
ndb_con_op=100000
|
||||
ndb_dmem=80M
|
||||
@ -65,8 +65,8 @@ while test $# -gt 0; do
|
||||
ndb_dmem=40M
|
||||
ndb_imem=12M
|
||||
;;
|
||||
--discless)
|
||||
ndb_discless=1
|
||||
--diskless)
|
||||
ndb_diskless=1
|
||||
;;
|
||||
--data-dir=*)
|
||||
fsdir=`echo "$1" | sed -e "s;--data-dir=;;"`
|
||||
@ -131,7 +131,7 @@ sed \
|
||||
-e s,"CHOOSE_MaxNoOfConcurrentOperations",$ndb_con_op,g \
|
||||
-e s,"CHOOSE_DataMemory",$ndb_dmem,g \
|
||||
-e s,"CHOOSE_IndexMemory",$ndb_imem,g \
|
||||
-e s,"CHOOSE_Discless",$ndb_discless,g \
|
||||
-e s,"CHOOSE_Diskless",$ndb_diskless,g \
|
||||
-e s,"CHOOSE_HOSTNAME_".*,"$ndb_host",g \
|
||||
-e s,"CHOOSE_FILESYSTEM_NODE_1","$fs_name_1",g \
|
||||
-e s,"CHOOSE_FILESYSTEM_NODE_2","$fs_name_2",g \
|
||||
|
@ -177,6 +177,7 @@ const DepricationTransform f_deprication[] = {
|
||||
,{ "DB", "MemorySpaceTuples", "DataMemory", 0, 8192 }
|
||||
,{ "DB", "TransactionInactiveTimeBeforeAbort", "TransactionInactiveTimeout",
|
||||
0, 1 }
|
||||
,{ "DB", "Discless", "Diskless", 0, 1 }
|
||||
,{ "TCP", "ProcessId1", "NodeId1", 0, 1}
|
||||
,{ "TCP", "ProcessId2", "NodeId2", 0, 1}
|
||||
,{ "TCP", "SendBufferSize", "SendBufferMemory", 0, 16384 }
|
||||
@ -930,6 +931,20 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
|
||||
0,
|
||||
0,
|
||||
1},
|
||||
|
||||
{
|
||||
CFG_DB_DISCLESS,
|
||||
"Discless",
|
||||
"DB",
|
||||
"Diskless",
|
||||
ConfigInfo::DEPRICATED,
|
||||
true,
|
||||
ConfigInfo::BOOL,
|
||||
0,
|
||||
0,
|
||||
1},
|
||||
|
||||
|
||||
|
||||
{
|
||||
CFG_DB_ARBIT_TIMEOUT,
|
||||
@ -3098,7 +3113,8 @@ transform(InitConfigFileParser::Context & ctx,
|
||||
require(ctx.m_currentSection->getTypeOf(oldName, &oldType));
|
||||
ConfigInfo::Type newType = ctx.m_info->getType(ctx.m_currentInfo, newName);
|
||||
if(!((oldType == PropertiesType_Uint32 || oldType == PropertiesType_Uint64)
|
||||
&& (newType == ConfigInfo::INT || newType == ConfigInfo::INT64))){
|
||||
&& (newType == ConfigInfo::INT || newType == ConfigInfo::INT64 || newType == ConfigInfo::BOOL))){
|
||||
ndbout << "oldType: " << (int)oldType << ", newType: " << (int)newType << endl;
|
||||
ctx.reportError("Unable to handle type conversion w.r.t deprication %s %s"
|
||||
"- [%s] starting at line: %d",
|
||||
oldName, newName,
|
||||
|
Reference in New Issue
Block a user