Commit 48feb973 authored by unknown's avatar unknown

Made discless a config parameter instead of a env. variable

parent e914e6c7
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
#define CFG_LOGLEVEL_GREP 146 #define CFG_LOGLEVEL_GREP 146
#define CFG_LOG_DESTINATION 147 #define CFG_LOG_DESTINATION 147
#define CFG_DB_DISCLESS 148
#define CFG_NODE_ARBIT_RANK 200 #define CFG_NODE_ARBIT_RANK 200
#define CFG_NODE_ARBIT_DELAY 201 #define CFG_NODE_ARBIT_DELAY 201
......
...@@ -888,6 +888,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { ...@@ -888,6 +888,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
1, 1,
0x7FFFFFFF }, 0x7FFFFFFF },
{
CFG_DB_DISCLESS,
"Discless",
"DB",
"Run wo/ disk",
ConfigInfo::USED,
true,
ConfigInfo::BOOL,
0,
0,
1},
{ {
CFG_DB_ARBIT_TIMEOUT, CFG_DB_ARBIT_TIMEOUT,
"ArbitrationTimeout", "ArbitrationTimeout",
......
...@@ -72,11 +72,12 @@ SimBlockList::load(const Configuration & conf){ ...@@ -72,11 +72,12 @@ SimBlockList::load(const Configuration & conf){
SimulatedBlock * fs = 0; SimulatedBlock * fs = 0;
{ {
char buf[100]; Uint32 dl;
if(NdbEnv_GetEnv("NDB_NOFS", buf, 100) == 0){ const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
fs = new (A_VALUE) Ndbfs(conf); if(p && !ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl){
} else {
fs = new (A_VALUE) VoidFs(conf); fs = new (A_VALUE) VoidFs(conf);
} else {
fs = new (A_VALUE) Ndbfs(conf);
} }
} }
......
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