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
eb41f3f7
Commit
eb41f3f7
authored
Mar 04, 2005
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed order of transporter_connect and closing the mgmapisession
parent
d360786e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
ndb/src/mgmsrv/MgmtSrvr.cpp
ndb/src/mgmsrv/MgmtSrvr.cpp
+1
-6
ndb/src/mgmsrv/Services.cpp
ndb/src/mgmsrv/Services.cpp
+5
-5
No files found.
ndb/src/mgmsrv/MgmtSrvr.cpp
View file @
eb41f3f7
...
@@ -55,7 +55,6 @@
...
@@ -55,7 +55,6 @@
#include <mgmapi_configuration.hpp>
#include <mgmapi_configuration.hpp>
#include <mgmapi_config_parameters.h>
#include <mgmapi_config_parameters.h>
#include <m_string.h>
#include <m_string.h>
#include <Transporter.hpp>
//#define MGM_SRV_DEBUG
//#define MGM_SRV_DEBUG
#ifdef MGM_SRV_DEBUG
#ifdef MGM_SRV_DEBUG
...
@@ -2139,11 +2138,7 @@ MgmtSrvr::get_connected_nodes(NodeBitmask &connected_nodes) const
...
@@ -2139,11 +2138,7 @@ MgmtSrvr::get_connected_nodes(NodeBitmask &connected_nodes) const
if
(
getNodeType
(
i
)
==
NDB_MGM_NODE_TYPE_NDB
)
if
(
getNodeType
(
i
)
==
NDB_MGM_NODE_TYPE_NDB
)
{
{
const
ClusterMgr
::
Node
&
node
=
theFacade
->
theClusterMgr
->
getNodeInfo
(
i
);
const
ClusterMgr
::
Node
&
node
=
theFacade
->
theClusterMgr
->
getNodeInfo
(
i
);
if
(
theFacade
->
get_registry
()
->
get_transporter
(
i
)
->
isConnected
())
connected_nodes
.
bitOR
(
node
.
m_state
.
m_connected_nodes
);
{
connected_nodes
.
bitOR
(
node
.
m_state
.
m_connected_nodes
);
connected_nodes
.
set
(
i
);
}
}
}
}
}
}
}
...
...
ndb/src/mgmsrv/Services.cpp
View file @
eb41f3f7
...
@@ -1546,19 +1546,19 @@ MgmApiSession::check_connection(Parser_t::Context &ctx,
...
@@ -1546,19 +1546,19 @@ MgmApiSession::check_connection(Parser_t::Context &ctx,
void
void
MgmApiSession
::
transporter_connect
(
Parser_t
::
Context
&
ctx
,
MgmApiSession
::
transporter_connect
(
Parser_t
::
Context
&
ctx
,
Properties
const
&
args
)
{
Properties
const
&
args
)
NDB_SOCKET_TYPE
s
=
m_socket
;
{
m_mgmsrv
.
transporter_connect
(
m_socket
);
m_stop
=
true
;
m_stop
=
true
;
m_stopped
=
true
;
// force a stop (no closing socket)
m_stopped
=
true
;
// force a stop (no closing socket)
m_socket
=
NDB_INVALID_SOCKET
;
// so nobody closes it
m_socket
=
NDB_INVALID_SOCKET
;
// so nobody closes it
m_mgmsrv
.
transporter_connect
(
s
);
}
}
void
void
MgmApiSession
::
get_mgmd_nodeid
(
Parser_t
::
Context
&
ctx
,
MgmApiSession
::
get_mgmd_nodeid
(
Parser_t
::
Context
&
ctx
,
Properties
const
&
args
)
{
Properties
const
&
args
)
{
m_output
->
println
(
"get mgmd nodeid reply"
);
m_output
->
println
(
"get mgmd nodeid reply"
);
m_output
->
println
(
"nodeid:%u"
,
m_mgmsrv
.
getOwnNodeId
());
m_output
->
println
(
"nodeid:%u"
,
m_mgmsrv
.
getOwnNodeId
());
m_output
->
println
(
""
);
m_output
->
println
(
""
);
...
...
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