Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a2ace296
Commit
a2ace296
authored
Aug 25, 2004
by
tomas@poseidon.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added some debug support
and some more checks
parent
64615381
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
14 deletions
+48
-14
ndb/src/common/mgmcommon/ConfigInfo.cpp
ndb/src/common/mgmcommon/ConfigInfo.cpp
+34
-14
ndb/src/mgmsrv/main.cpp
ndb/src/mgmsrv/main.cpp
+14
-0
No files found.
ndb/src/common/mgmcommon/ConfigInfo.cpp
View file @
a2ace296
...
...
@@ -14,6 +14,8 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <ndb_global.h>
#include <NdbTCP.h>
#include "ConfigInfo.hpp"
#include <mgmapi_config_parameters.h>
...
...
@@ -2261,12 +2263,40 @@ transformNode(InitConfigFileParser::Context & ctx, const char * data){
return
true
;
}
static
bool
checkLocalhostHostnameMix
(
InitConfigFileParser
::
Context
&
ctx
)
{
DBUG_ENTER
(
"checkLocalhostHostnameMix"
);
const
char
*
hostname
=
0
;
ctx
.
m_currentSection
->
get
(
"HostName"
,
&
hostname
);
if
(
hostname
==
0
||
hostname
[
0
]
==
0
)
DBUG_RETURN
(
true
);
Uint32
localhost_used
=
0
;
if
(
!
strcmp
(
hostname
,
"localhost"
)
||
!
strcmp
(
hostname
,
"127.0.0.1"
)){
localhost_used
=
1
;
ctx
.
m_userProperties
.
put
(
"$computer-localhost-used"
,
localhost_used
);
if
(
!
ctx
.
m_userProperties
.
get
(
"$computer-localhost"
,
&
hostname
))
DBUG_RETURN
(
true
);
}
else
{
ctx
.
m_userProperties
.
get
(
"$computer-localhost-used"
,
&
localhost_used
);
ctx
.
m_userProperties
.
put
(
"$computer-localhost"
,
hostname
);
}
if
(
localhost_used
)
{
ctx
.
reportError
(
"Mixing of localhost with other hostname(%s) is illegal"
,
hostname
);
DBUG_RETURN
(
false
);
}
DBUG_RETURN
(
true
);
}
bool
fixNodeHostname
(
InitConfigFileParser
::
Context
&
ctx
,
const
char
*
data
){
const
char
*
hostname
;
if
(
ctx
.
m_currentSection
->
get
(
"HostName"
,
&
hostname
))
return
true
;
return
checkLocalhostHostnameMix
(
ctx
)
;
const
char
*
compId
;
if
(
!
ctx
.
m_currentSection
->
get
(
"ExecuteOnComputer"
,
&
compId
)){
...
...
@@ -2275,7 +2305,7 @@ fixNodeHostname(InitConfigFileParser::Context & ctx, const char * data){
require
(
ctx
.
m_currentSection
->
put
(
"HostName"
,
"localhost"
));
else
require
(
ctx
.
m_currentSection
->
put
(
"HostName"
,
""
));
return
true
;
return
checkLocalhostHostnameMix
(
ctx
)
;
}
const
Properties
*
computer
;
...
...
@@ -2296,7 +2326,7 @@ fixNodeHostname(InitConfigFileParser::Context & ctx, const char * data){
}
require
(
ctx
.
m_currentSection
->
put
(
"HostName"
,
hostname
));
return
true
;
return
checkLocalhostHostnameMix
(
ctx
)
;
}
bool
...
...
@@ -2408,17 +2438,7 @@ transformComputer(InitConfigFileParser::Context & ctx, const char * data){
return
true
;
}
if
(
!
strcmp
(
hostname
,
"localhost"
)
||
!
strcmp
(
hostname
,
"127.0.0.1"
)){
if
(
ctx
.
m_userProperties
.
get
(
"$computer-localhost"
,
&
hostname
)){
ctx
.
reportError
(
"Mixing of localhost with other hostname(%s) is illegal"
,
hostname
);
return
false
;
}
}
else
{
ctx
.
m_userProperties
.
put
(
"$computer-localhost"
,
hostname
);
}
return
true
;
return
checkLocalhostHostnameMix
(
ctx
);
}
/**
...
...
ndb/src/mgmsrv/main.cpp
View file @
a2ace296
...
...
@@ -15,6 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <ndb_global.h>
#include <my_pthread.h>
#include "MgmtSrvr.hpp"
#include "EventLogger.hpp"
...
...
@@ -97,12 +98,19 @@ extern EventLogger g_EventLogger;
extern
int
global_mgmt_server_check
;
int
_print_version
=
0
;
#ifndef DBUG_OFF
const
char
*
debug_option
=
0
;
#endif
struct
getargs
args
[]
=
{
{
"version"
,
'v'
,
arg_flag
,
&
_print_version
,
"Print ndb_mgmd version"
},
{
"config-file"
,
'c'
,
arg_string
,
&
glob
.
config_filename
,
"Specify cluster configuration file"
,
"filename"
},
#ifndef DBUG_OFF
{
"debug"
,
0
,
arg_string
,
&
debug_option
,
"Specify debug option"
,
"options"
},
#endif
{
"daemon"
,
'd'
,
arg_flag
,
&
glob
.
daemon
,
"Run ndb_mgmd in daemon mode"
},
{
NULL
,
'l'
,
arg_string
,
&
glob
.
local_config_filename
,
...
...
@@ -135,6 +143,12 @@ NDB_MAIN(mgmsrv){
exit
(
1
);
}
my_thread_global_init
();
#ifndef DBUG_OFF
if
(
debug_option
)
DBUG_PUSH
(
debug_option
);
#endif
if
(
_print_version
)
{
ndbPrintVersion
();
exit
(
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment