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
2b5f6258
Commit
2b5f6258
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/50-jonas
parents
1b5ce338
4c4afd22
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
ndb/src/kernel/blocks/qmgr/Qmgr.hpp
ndb/src/kernel/blocks/qmgr/Qmgr.hpp
+1
-1
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+15
-5
No files found.
ndb/src/kernel/blocks/qmgr/Qmgr.hpp
View file @
2b5f6258
...
...
@@ -425,7 +425,7 @@ private:
Uint16
ccommitFailedNodes
[
MAX_NDB_NODES
];
StopReq
c_stopReq
;
void
check_multi_node_shutdown
(
Signal
*
signal
);
bool
check_multi_node_shutdown
(
Signal
*
signal
);
};
#endif
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
View file @
2b5f6258
...
...
@@ -2763,7 +2763,11 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode,
ptrCheckGuard
(
failedNodePtr
,
MAX_NODES
,
nodeRec
);
FailRep
*
rep
=
(
FailRep
*
)
signal
->
getDataPtr
();
check_multi_node_shutdown
(
signal
);
if
(
check_multi_node_shutdown
(
signal
))
{
jam
();
return
;
}
if
(
failedNodePtr
.
i
==
getOwnNodeId
())
{
jam
();
...
...
@@ -2832,8 +2836,8 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode,
"We(%u) have been declared dead by %u reason: %s(%u)"
,
getOwnNodeId
(),
refToNode
(
signal
->
getSendersBlockRef
()),
aFailCause
,
msg
?
msg
:
"<Unknown>"
);
msg
?
msg
:
"<Unknown>"
,
aFailCause
);
progError
(
__LINE__
,
code
,
buf
);
return
;
...
...
@@ -2893,7 +2897,11 @@ void Qmgr::execPREP_FAILREQ(Signal* signal)
NodeRecPtr
myNodePtr
;
jamEntry
();
check_multi_node_shutdown
(
signal
);
if
(
check_multi_node_shutdown
(
signal
))
{
jam
();
return
;
}
PrepFailReqRef
*
const
prepFail
=
(
PrepFailReqRef
*
)
&
signal
->
theData
[
0
];
...
...
@@ -4729,7 +4737,7 @@ Qmgr::execSTOP_REQ(Signal* signal)
}
}
void
bool
Qmgr
::
check_multi_node_shutdown
(
Signal
*
signal
)
{
if
(
c_stopReq
.
senderRef
&&
...
...
@@ -4745,5 +4753,7 @@ Qmgr::check_multi_node_shutdown(Signal* signal)
}
else
{
EXECUTE_DIRECT
(
CMVMI
,
GSN_STOP_ORD
,
signal
,
1
);
}
return
true
;
}
return
false
;
}
This diff is collapsed.
Click to expand it.
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