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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d360786e
Commit
d360786e
authored
Mar 04, 2005
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get connected nodes correct earlier for correct node id allocation
parent
358ba900
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
ndb/src/mgmsrv/MgmtSrvr.cpp
ndb/src/mgmsrv/MgmtSrvr.cpp
+3
-1
ndb/src/ndbapi/ClusterMgr.cpp
ndb/src/ndbapi/ClusterMgr.cpp
+4
-0
No files found.
ndb/src/mgmsrv/MgmtSrvr.cpp
View file @
d360786e
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
#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
...
@@ -2138,9 +2139,10 @@ MgmtSrvr::get_connected_nodes(NodeBitmask &connected_nodes) const
...
@@ -2138,9 +2139,10 @@ 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
(
node
.
connected
)
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/ndbapi/ClusterMgr.cpp
View file @
d360786e
...
@@ -260,6 +260,7 @@ ClusterMgr::Node::Node()
...
@@ -260,6 +260,7 @@ ClusterMgr::Node::Node()
:
m_state
(
NodeState
::
SL_NOTHING
)
{
:
m_state
(
NodeState
::
SL_NOTHING
)
{
compatible
=
nfCompleteRep
=
true
;
compatible
=
nfCompleteRep
=
true
;
connected
=
defined
=
m_alive
=
false
;
connected
=
defined
=
m_alive
=
false
;
m_state
.
m_connected_nodes
.
clear
();
}
}
/******************************************************************************
/******************************************************************************
...
@@ -434,6 +435,9 @@ ClusterMgr::reportDisconnected(NodeId nodeId){
...
@@ -434,6 +435,9 @@ ClusterMgr::reportDisconnected(NodeId nodeId){
noOfConnectedNodes
--
;
noOfConnectedNodes
--
;
theNodes
[
nodeId
].
connected
=
false
;
theNodes
[
nodeId
].
connected
=
false
;
theNodes
[
nodeId
].
m_state
.
m_connected_nodes
.
clear
();
reportNodeFailed
(
nodeId
);
reportNodeFailed
(
nodeId
);
}
}
...
...
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