wl#1882
allow ndb_mgmd to use my.cnf for cluster configuration ndb/src/mgmsrv/ConfigInfo.cpp: Depricate Id infavor of nodeid in config.ini ndb/src/mgmsrv/InitConfigFileParser.cpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/InitConfigFileParser.hpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/MgmtSrvr.cpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/main.cpp: Add support for getting cluster config from my.cnf [cluster_config]
This commit is contained in:
unknown
parent
3b49f80aba
commit
b55ad590b9
@ -241,6 +241,9 @@ struct DepricationTransform {
|
||||
static
|
||||
const DepricationTransform f_deprication[] = {
|
||||
{ DB_TOKEN, "Discless", "Diskless", 0, 1 },
|
||||
{ DB_TOKEN, "Id", "nodeid", 0, 1 },
|
||||
{ API_TOKEN, "Id", "nodeid", 0, 1 },
|
||||
{ MGM_TOKEN, "Id", "nodeid", 0, 1 },
|
||||
{ 0, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
@ -405,9 +408,21 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
|
||||
0, 0 },
|
||||
|
||||
{
|
||||
CFG_NODE_ID,
|
||||
KEY_INTERNAL,
|
||||
"Id",
|
||||
DB_TOKEN,
|
||||
"",
|
||||
ConfigInfo::CI_DEPRICATED,
|
||||
false,
|
||||
ConfigInfo::CI_INT,
|
||||
MANDATORY,
|
||||
"1",
|
||||
STR_VALUE(MAX_NODES) },
|
||||
|
||||
{
|
||||
CFG_NODE_ID,
|
||||
"nodeid",
|
||||
DB_TOKEN,
|
||||
"Number identifying the database node ("DB_TOKEN_PRINT")",
|
||||
ConfigInfo::CI_USED,
|
||||
false,
|
||||
@ -1244,9 +1259,21 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
|
||||
0, 0 },
|
||||
|
||||
{
|
||||
CFG_NODE_ID,
|
||||
KEY_INTERNAL,
|
||||
"Id",
|
||||
API_TOKEN,
|
||||
"",
|
||||
ConfigInfo::CI_DEPRICATED,
|
||||
false,
|
||||
ConfigInfo::CI_INT,
|
||||
MANDATORY,
|
||||
"1",
|
||||
STR_VALUE(MAX_NODES) },
|
||||
|
||||
{
|
||||
CFG_NODE_ID,
|
||||
"nodeid",
|
||||
API_TOKEN,
|
||||
"Number identifying application node ("API_TOKEN_PRINT")",
|
||||
ConfigInfo::CI_USED,
|
||||
false,
|
||||
@ -1375,9 +1402,21 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
|
||||
0, 0 },
|
||||
|
||||
{
|
||||
CFG_NODE_ID,
|
||||
KEY_INTERNAL,
|
||||
"Id",
|
||||
MGM_TOKEN,
|
||||
"",
|
||||
ConfigInfo::CI_DEPRICATED,
|
||||
false,
|
||||
ConfigInfo::CI_INT,
|
||||
MANDATORY,
|
||||
"1",
|
||||
STR_VALUE(MAX_NODES) },
|
||||
|
||||
{
|
||||
CFG_NODE_ID,
|
||||
"nodeid",
|
||||
MGM_TOKEN,
|
||||
"Number identifying the management server node ("MGM_TOKEN_PRINT")",
|
||||
ConfigInfo::CI_USED,
|
||||
false,
|
||||
@ -2516,14 +2555,14 @@ bool
|
||||
transformNode(InitConfigFileParser::Context & ctx, const char * data){
|
||||
|
||||
Uint32 id;
|
||||
if(!ctx.m_currentSection->get("Id", &id)){
|
||||
if(!ctx.m_currentSection->get("nodeid", &id) && !ctx.m_currentSection->get("Id", &id)){
|
||||
Uint32 nextNodeId= 1;
|
||||
ctx.m_userProperties.get("NextNodeId", &nextNodeId);
|
||||
id= nextNodeId;
|
||||
while (ctx.m_userProperties.get("AllocatedNodeId_", id, &id))
|
||||
id++;
|
||||
ctx.m_userProperties.put("NextNodeId", id+1, true);
|
||||
ctx.m_currentSection->put("Id", id);
|
||||
ctx.m_currentSection->put("nodeid", id);
|
||||
#if 0
|
||||
ctx.reportError("Mandatory parameter Id missing from section "
|
||||
"[%s] starting at line: %d",
|
||||
@ -2531,7 +2570,7 @@ transformNode(InitConfigFileParser::Context & ctx, const char * data){
|
||||
return false;
|
||||
#endif
|
||||
} else if(ctx.m_userProperties.get("AllocatedNodeId_", id, &id)) {
|
||||
ctx.reportError("Duplicate Id in section "
|
||||
ctx.reportError("Duplicate nodeid in section "
|
||||
"[%s] starting at line: %d",
|
||||
ctx.fname, ctx.m_sectionLineno);
|
||||
return false;
|
||||
@ -3356,6 +3395,7 @@ transform(InitConfigFileParser::Context & ctx,
|
||||
PropertiesType oldType;
|
||||
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::CI_INT || newType == ConfigInfo::CI_INT64 || newType == ConfigInfo::CI_BOOL))){
|
||||
ndbout << "oldType: " << (int)oldType << ", newType: " << (int)newType << endl;
|
||||
|
||||
@ -160,6 +160,13 @@ InitConfigFileParser::parseConfig(FILE * file) {
|
||||
ctx.reportError("Could not store section of configuration file.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
return run_config_rules(ctx);
|
||||
}
|
||||
|
||||
Config*
|
||||
InitConfigFileParser::run_config_rules(Context& ctx)
|
||||
{
|
||||
for(size_t i = 0; ConfigInfo::m_ConfigRules[i].m_configRule != 0; i++){
|
||||
ctx.type = InitConfigFileParser::Undefined;
|
||||
ctx.m_currentSection = 0;
|
||||
@ -267,10 +274,10 @@ bool InitConfigFileParser::parseNameValuePair(Context& ctx, const char* line)
|
||||
}
|
||||
if (status == ConfigInfo::CI_DEPRICATED) {
|
||||
const char * desc = m_info->getDescription(ctx.m_currentInfo, fname);
|
||||
if(desc){
|
||||
if(desc && desc[0]){
|
||||
ctx.reportWarning("[%s] %s is depricated, use %s instead",
|
||||
ctx.fname, fname, desc);
|
||||
} else {
|
||||
} else if (desc == 0){
|
||||
ctx.reportWarning("[%s] %s is depricated", ctx.fname, fname);
|
||||
}
|
||||
}
|
||||
@ -588,3 +595,354 @@ InitConfigFileParser::Context::reportWarning(const char * fmt, ...){
|
||||
ndbout << "Warning line " << m_lineno << ": " << buf << endl;
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
#include <my_sys.h>
|
||||
#include <my_getopt.h>
|
||||
|
||||
static int order = 1;
|
||||
static
|
||||
my_bool
|
||||
parse_mycnf_opt(int, const struct my_option * opt, char * value)
|
||||
{
|
||||
if(opt->comment)
|
||||
((struct my_option *)opt)->app_type++;
|
||||
else
|
||||
((struct my_option *)opt)->app_type = order++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool
|
||||
InitConfigFileParser::store_in_properties(Vector<struct my_option>& options,
|
||||
InitConfigFileParser::Context& ctx,
|
||||
const char * name)
|
||||
{
|
||||
for(unsigned i = 0; i<options.size(); i++)
|
||||
{
|
||||
if(options[i].comment &&
|
||||
options[i].app_type &&
|
||||
strcmp(options[i].comment, name) == 0)
|
||||
{
|
||||
Uint64 value_int;
|
||||
switch(options[i].var_type){
|
||||
case GET_INT:
|
||||
value_int = *(Uint32*)options[i].value;
|
||||
break;
|
||||
case GET_LL:
|
||||
value_int = *(Uint64*)options[i].value;
|
||||
break;
|
||||
case GET_STR:
|
||||
ctx.m_currentSection->put(options[i].name, (char*)options[i].value);
|
||||
continue;
|
||||
default:
|
||||
abort();
|
||||
}
|
||||
|
||||
const char * fname = options[i].name;
|
||||
if (!m_info->verify(ctx.m_currentInfo, fname, value_int)) {
|
||||
ctx.reportError("Illegal value %lld for parameter %s.\n"
|
||||
"Legal values are between %Lu and %Lu",
|
||||
value_int, fname,
|
||||
m_info->getMin(ctx.m_currentInfo, fname),
|
||||
m_info->getMax(ctx.m_currentInfo, fname));
|
||||
return false;
|
||||
}
|
||||
if (options[i].var_type == GET_INT)
|
||||
ctx.m_currentSection->put(options[i].name, (Uint32)value_int);
|
||||
else
|
||||
ctx.m_currentSection->put(options[i].name, value_int);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
InitConfigFileParser::handle_mycnf_defaults(Vector<struct my_option>& options,
|
||||
InitConfigFileParser::Context& ctx,
|
||||
const char * name)
|
||||
{
|
||||
strcpy(ctx.fname, name);
|
||||
ctx.type = InitConfigFileParser::DefaultSection;
|
||||
ctx.m_currentSection = new Properties(true);
|
||||
ctx.m_userDefaults = NULL;
|
||||
require((ctx.m_currentInfo = m_info->getInfo(ctx.fname)) != 0);
|
||||
require((ctx.m_systemDefaults = m_info->getDefaults(ctx.fname)) != 0);
|
||||
if(store_in_properties(options, ctx, name))
|
||||
return storeSection(ctx);
|
||||
return false;
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
load_defaults(Vector<struct my_option>& options, const char* groups[])
|
||||
{
|
||||
int argc = 1;
|
||||
const char * argv[] = { "ndb_mgmd", 0, 0, 0, 0 };
|
||||
BaseString file;
|
||||
BaseString extra_file;
|
||||
BaseString group_suffix;
|
||||
|
||||
const char *save_file = defaults_file;
|
||||
char *save_extra_file = defaults_extra_file;
|
||||
const char *save_group_suffix = defaults_group_suffix;
|
||||
|
||||
if (defaults_file)
|
||||
{
|
||||
file.assfmt("--defaults-file=%s", defaults_file);
|
||||
argv[argc++] = file.c_str();
|
||||
}
|
||||
|
||||
if (defaults_extra_file)
|
||||
{
|
||||
extra_file.assfmt("--defaults-extra-file=%s", defaults_extra_file);
|
||||
argv[argc++] = extra_file.c_str();
|
||||
}
|
||||
|
||||
if (defaults_group_suffix)
|
||||
{
|
||||
group_suffix.assfmt("--defaults-group-suffix=%s", defaults_group_suffix);
|
||||
argv[argc++] = group_suffix.c_str();
|
||||
}
|
||||
|
||||
char ** tmp = (char**)argv;
|
||||
int ret = load_defaults("my", groups, &argc, &tmp);
|
||||
|
||||
defaults_file = save_file;
|
||||
defaults_extra_file = save_extra_file;
|
||||
defaults_group_suffix = save_group_suffix;
|
||||
|
||||
if (ret == 0)
|
||||
{
|
||||
return handle_options(&argc, &tmp, options.getBase(), parse_mycnf_opt);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool
|
||||
InitConfigFileParser::load_mycnf_groups(Vector<struct my_option> & options,
|
||||
InitConfigFileParser::Context& ctx,
|
||||
const char * name,
|
||||
const char *groups[])
|
||||
{
|
||||
unsigned i;
|
||||
Vector<struct my_option> copy;
|
||||
for(i = 0; i<options.size(); i++)
|
||||
{
|
||||
if(options[i].comment && strcmp(options[i].comment, name) == 0)
|
||||
{
|
||||
options[i].app_type = 0;
|
||||
copy.push_back(options[i]);
|
||||
}
|
||||
}
|
||||
|
||||
struct my_option end;
|
||||
bzero(&end, sizeof(end));
|
||||
copy.push_back(end);
|
||||
|
||||
if (load_defaults(copy, groups))
|
||||
return false;
|
||||
|
||||
return store_in_properties(copy, ctx, name);
|
||||
}
|
||||
|
||||
Config *
|
||||
InitConfigFileParser::parse_mycnf()
|
||||
{
|
||||
int i;
|
||||
Config * res = 0;
|
||||
Vector<struct my_option> options;
|
||||
for(i = 0; i<ConfigInfo::m_NoOfParams; i++)
|
||||
{
|
||||
if (strcmp(ConfigInfo::m_ParamInfo[i]._section, "DB") == 0 ||
|
||||
strcmp(ConfigInfo::m_ParamInfo[i]._section, "API") == 0 ||
|
||||
strcmp(ConfigInfo::m_ParamInfo[i]._section, "MGM") == 0)
|
||||
{
|
||||
struct my_option opt;
|
||||
bzero(&opt, sizeof(opt));
|
||||
const ConfigInfo::ParamInfo& param = ConfigInfo::m_ParamInfo[i];
|
||||
switch(param._type){
|
||||
case ConfigInfo::CI_BOOL:
|
||||
opt.value = (gptr*)malloc(sizeof(int));
|
||||
opt.var_type = GET_INT;
|
||||
break;
|
||||
case ConfigInfo::CI_INT:
|
||||
opt.value = (gptr*)malloc(sizeof(int));
|
||||
opt.var_type = GET_INT;
|
||||
require(convertStringToUint64(param._min, (Uint64&)opt.min_value));
|
||||
require(convertStringToUint64(param._max, (Uint64&)opt.max_value));
|
||||
break;
|
||||
case ConfigInfo::CI_INT64:
|
||||
opt.value = (gptr*)malloc(sizeof(Int64));
|
||||
opt.var_type = GET_LL;
|
||||
require(convertStringToUint64(param._min, (Uint64&)opt.min_value));
|
||||
require(convertStringToUint64(param._max, (Uint64&)opt.max_value));
|
||||
break;
|
||||
case ConfigInfo::CI_STRING:
|
||||
opt.value = (gptr*)malloc(sizeof(char *));
|
||||
opt.var_type = GET_STR;
|
||||
break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
opt.name = param._fname;
|
||||
opt.id = 256;
|
||||
opt.app_type = 0;
|
||||
opt.arg_type = REQUIRED_ARG;
|
||||
opt.comment = param._section;
|
||||
options.push_back(opt);
|
||||
}
|
||||
}
|
||||
|
||||
struct my_option *ndbd, *ndb_mgmd, *mysqld, *api;
|
||||
|
||||
/**
|
||||
* Add ndbd, ndb_mgmd, api/mysqld
|
||||
*/
|
||||
{
|
||||
struct my_option opt;
|
||||
bzero(&opt, sizeof(opt));
|
||||
opt.name = "ndbd";
|
||||
opt.id = 256;
|
||||
opt.value = (gptr*)malloc(sizeof(char*));
|
||||
opt.var_type = GET_STR;
|
||||
opt.arg_type = REQUIRED_ARG;
|
||||
options.push_back(opt);
|
||||
ndbd = &options.back();
|
||||
|
||||
opt.name = "ndb_mgmd";
|
||||
opt.id = 256;
|
||||
opt.value = (gptr*)malloc(sizeof(char*));
|
||||
opt.var_type = GET_STR;
|
||||
opt.arg_type = REQUIRED_ARG;
|
||||
options.push_back(opt);
|
||||
ndb_mgmd = &options.back();
|
||||
|
||||
opt.name = "mysqld";
|
||||
opt.id = 256;
|
||||
opt.value = (gptr*)malloc(sizeof(char*));
|
||||
opt.var_type = GET_STR;
|
||||
opt.arg_type = REQUIRED_ARG;
|
||||
options.push_back(opt);
|
||||
mysqld = &options.back();
|
||||
|
||||
opt.name = "api";
|
||||
opt.id = 256;
|
||||
opt.value = (gptr*)malloc(sizeof(char*));
|
||||
opt.var_type = GET_STR;
|
||||
opt.arg_type = REQUIRED_ARG;
|
||||
options.push_back(opt);
|
||||
api = &options.back();
|
||||
|
||||
bzero(&opt, sizeof(opt));
|
||||
options.push_back(opt);
|
||||
}
|
||||
|
||||
|
||||
Context ctx(m_info);
|
||||
const char *groups[]= { "cluster_config", 0 };
|
||||
if (load_defaults(options, groups))
|
||||
goto end;
|
||||
|
||||
ctx.m_lineno = 0;
|
||||
if(!handle_mycnf_defaults(options, ctx, "DB"))
|
||||
goto end;
|
||||
if(!handle_mycnf_defaults(options, ctx, "API"))
|
||||
goto end;
|
||||
if(!handle_mycnf_defaults(options, ctx, "MGM"))
|
||||
goto end;
|
||||
|
||||
{
|
||||
struct sect { struct my_option* src; const char * name; } sections[] =
|
||||
{
|
||||
{ ndb_mgmd, "MGM" }
|
||||
,{ ndbd, "DB" }
|
||||
,{ mysqld, "API" }
|
||||
,{ api, "API" }
|
||||
,{ 0, 0 }, { 0, 0 }
|
||||
};
|
||||
|
||||
for(i = 0; sections[i].src; i++)
|
||||
{
|
||||
for(int j = i + 1; sections[j].src; j++)
|
||||
{
|
||||
if (sections[j].src->app_type < sections[i].src->app_type)
|
||||
{
|
||||
sect swap = sections[i];
|
||||
sections[i] = sections[j];
|
||||
sections[j] = swap;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ctx.type = InitConfigFileParser::Section;
|
||||
ctx.m_sectionLineno = ctx.m_lineno;
|
||||
for(i = 0; sections[i].src; i++)
|
||||
{
|
||||
if (sections[i].src->app_type)
|
||||
{
|
||||
strcpy(ctx.fname, sections[i].name);
|
||||
BaseString str(*(char**)sections[i].src->value);
|
||||
Vector<BaseString> list;
|
||||
str.split(list, ",");
|
||||
|
||||
const char * defaults_groups[] = { 0, 0, 0 };
|
||||
for(unsigned j = 0; j<list.size(); j++)
|
||||
{
|
||||
BaseString group_idx;
|
||||
BaseString group_host;
|
||||
group_idx.assfmt("%s.%s.%d", groups[0],
|
||||
sections[i].src->name, j + 1);
|
||||
group_host.assfmt("%s.%s.%s", groups[0],
|
||||
sections[i].src->name, list[j].c_str());
|
||||
defaults_groups[0] = group_idx.c_str();
|
||||
if(list[j].length())
|
||||
defaults_groups[1] = group_host.c_str();
|
||||
else
|
||||
defaults_groups[1] = 0;
|
||||
|
||||
ctx.m_currentSection = new Properties(true);
|
||||
ctx.m_userDefaults = getSection(ctx.fname, ctx.m_defaults);
|
||||
require((ctx.m_currentInfo = m_info->getInfo(ctx.fname)) != 0);
|
||||
require((ctx.m_systemDefaults = m_info->getDefaults(ctx.fname))!= 0);
|
||||
ctx.m_currentSection->put("HostName", list[j].c_str());
|
||||
if(!load_mycnf_groups(options, ctx, sections[i].name,
|
||||
defaults_groups))
|
||||
goto end;
|
||||
|
||||
if(!storeSection(ctx))
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
res = run_config_rules(ctx);
|
||||
|
||||
end:
|
||||
for(i = 0; options[i].name; i++)
|
||||
free(options[i].value);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
template class Vector<struct my_option>;
|
||||
|
||||
#if 0
|
||||
struct my_option
|
||||
{
|
||||
const char *name; /* Name of the option */
|
||||
int id; /* unique id or short option */
|
||||
const char *comment; /* option comment, for autom. --help */
|
||||
gptr *value; /* The variable value */
|
||||
gptr *u_max_value; /* The user def. max variable value */
|
||||
const char **str_values; /* Pointer to possible values */
|
||||
ulong var_type;
|
||||
enum get_opt_arg_type arg_type;
|
||||
longlong def_value; /* Default value */
|
||||
longlong min_value; /* Min allowed value */
|
||||
longlong max_value; /* Max allowed value */
|
||||
longlong sub_size; /* Subtract this from given value */
|
||||
long block_size; /* Value should be a mult. of this */
|
||||
int app_type; /* To be used by an application */
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -50,6 +50,7 @@ public:
|
||||
*/
|
||||
Config * parseConfig(FILE * file);
|
||||
Config * parseConfig(const char * filename);
|
||||
Config * parse_mycnf();
|
||||
|
||||
/**
|
||||
* Parser context struct
|
||||
@ -122,6 +123,21 @@ private:
|
||||
* Information about parameters (min, max values etc)
|
||||
*/
|
||||
ConfigInfo* m_info;
|
||||
|
||||
bool handle_mycnf_defaults(Vector<struct my_option>& options,
|
||||
InitConfigFileParser::Context& ctx,
|
||||
const char * name);
|
||||
|
||||
bool load_mycnf_groups(Vector<struct my_option> & options,
|
||||
InitConfigFileParser::Context& ctx,
|
||||
const char * name,
|
||||
const char *groups[]);
|
||||
|
||||
bool store_in_properties(Vector<struct my_option>& options,
|
||||
InitConfigFileParser::Context& ctx,
|
||||
const char * name);
|
||||
|
||||
Config* run_config_rules(Context& ctx);
|
||||
};
|
||||
|
||||
#endif // InitConfigFileParser_H
|
||||
|
||||
@ -433,8 +433,6 @@ MgmtSrvr::MgmtSrvr(SocketServer *socket_server,
|
||||
m_newConfig = NULL;
|
||||
if (config_filename)
|
||||
m_configFilename.assign(config_filename);
|
||||
else
|
||||
m_configFilename.assign("config.ini");
|
||||
|
||||
m_nextConfigGenerationNumber = 0;
|
||||
|
||||
@ -469,7 +467,7 @@ MgmtSrvr::MgmtSrvr(SocketServer *socket_server,
|
||||
_config= readConfig();
|
||||
if (_config == 0) {
|
||||
ndbout << "Unable to read config file" << endl;
|
||||
require(false);
|
||||
exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -274,7 +274,15 @@ Config *
|
||||
MgmtSrvr::readConfig() {
|
||||
Config *conf;
|
||||
InitConfigFileParser parser;
|
||||
conf = parser.parseConfig(m_configFilename.c_str());
|
||||
if (m_configFilename.length())
|
||||
{
|
||||
conf = parser.parseConfig(m_configFilename.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
ndbout_c("Reading cluster configuration using my.cnf");
|
||||
conf = parser.parse_mycnf();
|
||||
}
|
||||
return conf;
|
||||
}
|
||||
|
||||
|
||||
@ -102,6 +102,7 @@ static int opt_daemon; // NOT bool, bool need not be int
|
||||
static int opt_non_interactive;
|
||||
static int opt_interactive;
|
||||
static const char * opt_config_filename= 0;
|
||||
static int opt_mycnf = 0;
|
||||
|
||||
struct MgmGlobals {
|
||||
MgmGlobals();
|
||||
@ -166,6 +167,10 @@ static struct my_option my_long_options[] =
|
||||
"Don't run as daemon, but don't read from stdin",
|
||||
(gptr*) &opt_non_interactive, (gptr*) &opt_non_interactive, 0,
|
||||
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
||||
{ "mycnf", 256,
|
||||
"Read cluster config from my.cnf",
|
||||
(gptr*) &opt_mycnf, (gptr*) &opt_mycnf, 0,
|
||||
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
||||
};
|
||||
|
||||
@ -199,7 +204,7 @@ int main(int argc, char** argv)
|
||||
#endif
|
||||
|
||||
global_mgmt_server_check = 1;
|
||||
|
||||
|
||||
const char *load_default_groups[]= { "mysql_cluster","ndb_mgmd",0 };
|
||||
load_defaults("my",load_default_groups,&argc,&argv);
|
||||
|
||||
@ -217,13 +222,26 @@ int main(int argc, char** argv)
|
||||
opt_daemon= 0;
|
||||
}
|
||||
|
||||
if (opt_mycnf && opt_config_filename)
|
||||
{
|
||||
ndbout_c("Both --mycnf and -f is not supported");
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (opt_mycnf == 0 && opt_config_filename == 0)
|
||||
{
|
||||
struct stat buf;
|
||||
if (stat("config.ini", &buf) != -1)
|
||||
opt_config_filename = "config.ini";
|
||||
}
|
||||
|
||||
glob->socketServer = new SocketServer();
|
||||
|
||||
MgmApiService * mapi = new MgmApiService();
|
||||
|
||||
glob->mgmObject = new MgmtSrvr(glob->socketServer,
|
||||
opt_config_filename,
|
||||
opt_connect_str);
|
||||
opt_config_filename,
|
||||
opt_connect_str);
|
||||
|
||||
if (g_print_full_config)
|
||||
goto the_end;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user