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
81eb7328
Commit
81eb7328
authored
17 years ago
by
tomas@whalegate.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
parents
a10759d0
21da0d21
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
375 additions
and
96 deletions
+375
-96
ndb/src/kernel/blocks/dblqh/Dblqh.hpp
ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+3
-2
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+285
-87
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+7
-0
ndb/test/ndbapi/testNodeRestart.cpp
ndb/test/ndbapi/testNodeRestart.cpp
+58
-5
ndb/test/run-test/daily-basic-tests.txt
ndb/test/run-test/daily-basic-tests.txt
+8
-0
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_cond.h
+14
-2
No files found.
ndb/src/kernel/blocks/dblqh/Dblqh.hpp
View file @
81eb7328
...
@@ -1617,7 +1617,8 @@ public:
...
@@ -1617,7 +1617,8 @@ public:
ACTIVE_WRITE_LOG
=
17
,
///< A write operation during
ACTIVE_WRITE_LOG
=
17
,
///< A write operation during
///< writing of log
///< writing of log
READ_SR_INVALIDATE_PAGES
=
18
,
READ_SR_INVALIDATE_PAGES
=
18
,
WRITE_SR_INVALIDATE_PAGES
=
19
WRITE_SR_INVALIDATE_PAGES
=
19
,
WRITE_SR_INVALIDATE_PAGES_UPDATE_PAGE0
=
20
};
};
/**
/**
* We have to remember the log pages read.
* We have to remember the log pages read.
...
@@ -2436,7 +2437,7 @@ private:
...
@@ -2436,7 +2437,7 @@ private:
void
errorReport
(
Signal
*
signal
,
int
place
);
void
errorReport
(
Signal
*
signal
,
int
place
);
void
warningReport
(
Signal
*
signal
,
int
place
);
void
warningReport
(
Signal
*
signal
,
int
place
);
void
invalidateLogAfterLastGCI
(
Signal
*
signal
);
void
invalidateLogAfterLastGCI
(
Signal
*
signal
);
void
readFileInInvalidate
(
Signal
*
signal
);
void
readFileInInvalidate
(
Signal
*
signal
,
bool
stepNext
);
void
exitFromInvalidate
(
Signal
*
signal
);
void
exitFromInvalidate
(
Signal
*
signal
);
Uint32
calcPageCheckSum
(
LogPageRecordPtr
logP
);
Uint32
calcPageCheckSum
(
LogPageRecordPtr
logP
);
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file @
81eb7328
...
@@ -109,6 +109,10 @@ operator<<(NdbOut& out, Dblqh::ScanRecord::ScanType state){
...
@@ -109,6 +109,10 @@ operator<<(NdbOut& out, Dblqh::ScanRecord::ScanType state){
//#define MARKER_TRACE 1
//#define MARKER_TRACE 1
//#define TRACE_SCAN_TAKEOVER 1
//#define TRACE_SCAN_TAKEOVER 1
#ifndef DEBUG_REDO
#define DEBUG_REDO 0
#endif
const
Uint32
NR_ScanNo
=
0
;
const
Uint32
NR_ScanNo
=
0
;
void
Dblqh
::
execACC_COM_BLOCK
(
Signal
*
signal
)
void
Dblqh
::
execACC_COM_BLOCK
(
Signal
*
signal
)
...
@@ -11153,6 +11157,13 @@ void Dblqh::sendLCP_COMPLETE_REP(Signal* signal, Uint32 lcpId)
...
@@ -11153,6 +11157,13 @@ void Dblqh::sendLCP_COMPLETE_REP(Signal* signal, Uint32 lcpId)
jam
();
jam
();
sendEMPTY_LCP_CONF
(
signal
,
true
);
sendEMPTY_LCP_CONF
(
signal
,
true
);
}
}
if
(
getNodeState
().
getNodeRestartInProgress
()
&&
cstartRecReq
!=
3
)
{
jam
();
ndbrequire
(
cstartRecReq
==
2
);
cstartRecReq
=
3
;
}
return
;
return
;
}
//Dblqh::sendCOMP_LCP_ROUND()
}
//Dblqh::sendCOMP_LCP_ROUND()
...
@@ -11717,15 +11728,27 @@ void Dblqh::execGCP_SAVEREQ(Signal* signal)
...
@@ -11717,15 +11728,27 @@ void Dblqh::execGCP_SAVEREQ(Signal* signal)
return
;
return
;
}
}
ccurrentGcprec
=
0
;
gcpPtr
.
i
=
ccurrentGcprec
;
ptrCheckGuard
(
gcpPtr
,
cgcprecFileSize
,
gcpRecord
);
cnewestCompletedGci
=
gci
;
cnewestCompletedGci
=
gci
;
if
(
gci
>
cnewestGci
)
{
if
(
gci
>
cnewestGci
)
{
jam
();
jam
();
cnewestGci
=
gci
;
cnewestGci
=
gci
;
}
//if
}
//if
if
(
getNodeState
().
getNodeRestartInProgress
()
&&
cstartRecReq
<
3
)
{
GCPSaveRef
*
const
saveRef
=
(
GCPSaveRef
*
)
&
signal
->
theData
[
0
];
saveRef
->
dihPtr
=
dihPtr
;
saveRef
->
nodeId
=
getOwnNodeId
();
saveRef
->
gci
=
gci
;
saveRef
->
errorCode
=
GCPSaveRef
::
NodeRestartInProgress
;
sendSignal
(
dihBlockRef
,
GSN_GCP_SAVEREF
,
signal
,
GCPSaveRef
::
SignalLength
,
JBB
);
return
;
}
ccurrentGcprec
=
0
;
gcpPtr
.
i
=
ccurrentGcprec
;
ptrCheckGuard
(
gcpPtr
,
cgcprecFileSize
,
gcpRecord
);
gcpPtr
.
p
->
gcpBlockref
=
dihBlockRef
;
gcpPtr
.
p
->
gcpBlockref
=
dihBlockRef
;
gcpPtr
.
p
->
gcpUserptr
=
dihPtr
;
gcpPtr
.
p
->
gcpUserptr
=
dihPtr
;
...
@@ -11979,9 +12002,6 @@ void Dblqh::execFSCLOSECONF(Signal* signal)
...
@@ -11979,9 +12002,6 @@ void Dblqh::execFSCLOSECONF(Signal* signal)
case
LogFileRecord
:
:
CLOSE_SR_INVALIDATE_PAGES
:
case
LogFileRecord
:
:
CLOSE_SR_INVALIDATE_PAGES
:
jam
();
jam
();
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
CLOSED
;
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
CLOSED
;
// Set the prev file to check if we shall close it.
logFilePtr
.
i
=
logFilePtr
.
p
->
prevLogFile
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
logPartPtr
.
i
=
logFilePtr
.
p
->
logPartRec
;
logPartPtr
.
i
=
logFilePtr
.
p
->
logPartRec
;
ptrCheckGuard
(
logPartPtr
,
clogPartFileSize
,
logPartRecord
);
ptrCheckGuard
(
logPartPtr
,
clogPartFileSize
,
logPartRecord
);
...
@@ -12031,7 +12051,7 @@ void Dblqh::execFSOPENCONF(Signal* signal)
...
@@ -12031,7 +12051,7 @@ void Dblqh::execFSOPENCONF(Signal* signal)
case
LogFileRecord
:
:
OPEN_SR_INVALIDATE_PAGES
:
case
LogFileRecord
:
:
OPEN_SR_INVALIDATE_PAGES
:
jam
();
jam
();
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
OPEN
;
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
OPEN
;
readFileInInvalidate
(
signal
);
readFileInInvalidate
(
signal
,
false
);
return
;
return
;
case
LogFileRecord
:
:
OPENING_INIT
:
case
LogFileRecord
:
:
OPENING_INIT
:
jam
();
jam
();
...
@@ -12211,6 +12231,7 @@ void Dblqh::execFSWRITECONF(Signal* signal)
...
@@ -12211,6 +12231,7 @@ void Dblqh::execFSWRITECONF(Signal* signal)
case
LogFileOperationRecord
:
:
WRITE_SR_INVALIDATE_PAGES
:
case
LogFileOperationRecord
:
:
WRITE_SR_INVALIDATE_PAGES
:
jam
();
jam
();
invalidateLogAfterLastGCI
(
signal
);
invalidateLogAfterLastGCI
(
signal
);
CRASH_INSERTION
(
5047
);
return
;
return
;
case
LogFileOperationRecord
:
:
WRITE_PAGE_ZERO
:
case
LogFileOperationRecord
:
:
WRITE_PAGE_ZERO
:
jam
();
jam
();
...
@@ -12248,6 +12269,14 @@ void Dblqh::execFSWRITECONF(Signal* signal)
...
@@ -12248,6 +12269,14 @@ void Dblqh::execFSWRITECONF(Signal* signal)
jam
();
jam
();
firstPageWriteLab
(
signal
);
firstPageWriteLab
(
signal
);
return
;
return
;
case
LogFileOperationRecord
:
:
WRITE_SR_INVALIDATE_PAGES_UPDATE_PAGE0
:
jam
();
// We are done...send completed signal and exit this phase.
releaseLfo
(
signal
);
signal
->
theData
[
0
]
=
ZSR_FOURTH_COMP
;
signal
->
theData
[
1
]
=
logPartPtr
.
i
;
sendSignal
(
cownref
,
GSN_CONTINUEB
,
signal
,
2
,
JBB
);
return
;
default:
default:
jam
();
jam
();
systemErrorLab
(
signal
,
__LINE__
);
systemErrorLab
(
signal
,
__LINE__
);
...
@@ -13318,6 +13347,12 @@ void Dblqh::writeSinglePage(Signal* signal, Uint32 pageNo,
...
@@ -13318,6 +13347,12 @@ void Dblqh::writeSinglePage(Signal* signal, Uint32 pageNo,
signal
->
theData
[
6
]
=
logPagePtr
.
i
;
signal
->
theData
[
6
]
=
logPagePtr
.
i
;
signal
->
theData
[
7
]
=
pageNo
;
signal
->
theData
[
7
]
=
pageNo
;
sendSignal
(
NDBFS_REF
,
GSN_FSWRITEREQ
,
signal
,
8
,
JBA
);
sendSignal
(
NDBFS_REF
,
GSN_FSWRITEREQ
,
signal
,
8
,
JBA
);
if
(
DEBUG_REDO
)
ndbout_c
(
"writeSingle 1 page at part: %u file: %u pos: %u"
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
pageNo
);
}
//Dblqh::writeSinglePage()
}
//Dblqh::writeSinglePage()
/* ##########################################################################
/* ##########################################################################
...
@@ -13383,6 +13418,12 @@ void Dblqh::openSrLastFileLab(Signal* signal)
...
@@ -13383,6 +13418,12 @@ void Dblqh::openSrLastFileLab(Signal* signal)
void
Dblqh
::
readSrLastFileLab
(
Signal
*
signal
)
void
Dblqh
::
readSrLastFileLab
(
Signal
*
signal
)
{
{
logPartPtr
.
p
->
logLap
=
logPagePtr
.
p
->
logPageWord
[
ZPOS_LOG_LAP
];
logPartPtr
.
p
->
logLap
=
logPagePtr
.
p
->
logPageWord
[
ZPOS_LOG_LAP
];
if
(
DEBUG_REDO
)
ndbout_c
(
"readSrLastFileLab part: %u logExecState: %u logPartState: %u logLap: %u"
,
logPartPtr
.
i
,
logPartPtr
.
p
->
logExecState
,
logPartPtr
.
p
->
logPartState
,
logPartPtr
.
p
->
logLap
);
if
(
logPartPtr
.
p
->
noLogFiles
>
ZMAX_LOG_FILES_IN_PAGE_ZERO
)
{
if
(
logPartPtr
.
p
->
noLogFiles
>
ZMAX_LOG_FILES_IN_PAGE_ZERO
)
{
jam
();
jam
();
initGciInLogFileRec
(
signal
,
ZMAX_LOG_FILES_IN_PAGE_ZERO
);
initGciInLogFileRec
(
signal
,
ZMAX_LOG_FILES_IN_PAGE_ZERO
);
...
@@ -14600,6 +14641,20 @@ void Dblqh::srLogLimits(Signal* signal)
...
@@ -14600,6 +14641,20 @@ void Dblqh::srLogLimits(Signal* signal)
break
;
break
;
}
//if
}
//if
}
//while
}
//while
if
(
DEBUG_REDO
)
{
LogFileRecordPtr
tmp
;
tmp
.
i
=
logPartPtr
.
p
->
stopLogfile
;
ptrCheckGuard
(
tmp
,
clogFileFileSize
,
logFileRecord
);
ndbout_c
(
"srLogLimits part: %u start file: %u mb: %u stop file: %u mb: %u"
,
logPartPtr
.
i
,
tlastPrepRef
>>
16
,
tlastPrepRef
&
65535
,
tmp
.
p
->
fileNo
,
logPartPtr
.
p
->
stopMbyte
);
}
/* ------------------------------------------------------------------------
/* ------------------------------------------------------------------------
* WE HAVE NOW FOUND BOTH THE START AND THE STOP OF THE LOG. NOW START
* WE HAVE NOW FOUND BOTH THE START AND THE STOP OF THE LOG. NOW START
* EXECUTING THE LOG. THE FIRST ACTION IS TO OPEN THE LOG FILE WHERE TO
* EXECUTING THE LOG. THE FIRST ACTION IS TO OPEN THE LOG FILE WHERE TO
...
@@ -15026,6 +15081,12 @@ void Dblqh::execSr(Signal* signal)
...
@@ -15026,6 +15081,12 @@ void Dblqh::execSr(Signal* signal)
case
ZCOMPLETED_GCI_TYPE
:
case
ZCOMPLETED_GCI_TYPE
:
jam
();
jam
();
logWord
=
readLogword
(
signal
);
logWord
=
readLogword
(
signal
);
if
(
DEBUG_REDO
)
ndbout_c
(
"found gci: %u part: %u file: %u page: %u"
,
logWord
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
logFilePtr
.
p
->
currentFilepage
);
if
(
logWord
==
logPartPtr
.
p
->
logLastGci
)
{
if
(
logWord
==
logPartPtr
.
p
->
logLastGci
)
{
jam
();
jam
();
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
...
@@ -15042,6 +15103,10 @@ void Dblqh::execSr(Signal* signal)
...
@@ -15042,6 +15103,10 @@ void Dblqh::execSr(Signal* signal)
logPartPtr
.
p
->
headPageNo
=
logFilePtr
.
p
->
currentFilepage
;
logPartPtr
.
p
->
headPageNo
=
logFilePtr
.
p
->
currentFilepage
;
logPartPtr
.
p
->
headPageIndex
=
logPartPtr
.
p
->
headPageIndex
=
logPagePtr
.
p
->
logPageWord
[
ZCURR_PAGE_INDEX
];
logPagePtr
.
p
->
logPageWord
[
ZCURR_PAGE_INDEX
];
logPartPtr
.
p
->
logLap
=
logPagePtr
.
p
->
logPageWord
[
ZPOS_LOG_LAP
];
if
(
DEBUG_REDO
)
ndbout_c
(
"execSr part: %u logLap: %u"
,
logPartPtr
.
i
,
logPartPtr
.
p
->
logLap
);
}
//if
}
//if
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
/* THERE IS NO NEED OF EXECUTING PAST THIS LINE SINCE THERE WILL ONLY BE LOG */
/* THERE IS NO NEED OF EXECUTING PAST THIS LINE SINCE THERE WILL ONLY BE LOG */
...
@@ -15202,67 +15267,140 @@ void Dblqh::invalidateLogAfterLastGCI(Signal* signal) {
...
@@ -15202,67 +15267,140 @@ void Dblqh::invalidateLogAfterLastGCI(Signal* signal) {
}
}
switch
(
lfoPtr
.
p
->
lfoState
)
{
switch
(
lfoPtr
.
p
->
lfoState
)
{
case
LogFileOperationRecord
:
:
WRITE_SR_INVALIDATE_PAGES
:
jam
();
releaseLfo
(
signal
);
releaseLogpage
(
signal
);
if
(
logPartPtr
.
p
->
invalidatePageNo
<
(
ZNO_MBYTES_IN_FILE
*
ZPAGES_IN_MBYTE
-
1
))
{
// We continue in this file.
logPartPtr
.
p
->
invalidatePageNo
++
;
}
else
{
// We continue in the next file.
logFilePtr
.
i
=
logFilePtr
.
p
->
nextLogFile
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
logPartPtr
.
p
->
invalidateFileNo
=
logFilePtr
.
p
->
fileNo
;
// Page 0 is used for file descriptors.
logPartPtr
.
p
->
invalidatePageNo
=
1
;
if
(
logFilePtr
.
p
->
logFileStatus
!=
LogFileRecord
::
OPEN
)
{
jam
();
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
OPEN_SR_INVALIDATE_PAGES
;
openFileRw
(
signal
,
logFilePtr
);
return
;
break
;
}
}
// Read a page from the log file.
readFileInInvalidate
(
signal
);
return
;
break
;
case
LogFileOperationRecord
:
:
READ_SR_INVALIDATE_PAGES
:
case
LogFileOperationRecord
:
:
READ_SR_INVALIDATE_PAGES
:
jam
();
jam
();
releaseLfo
(
signal
);
// Check if this page must be invalidated.
// Check if this page must be invalidated.
// If the log lap number on a page after the head of the tail is the same
// If the log lap number on a page after the head of the tail is the same
// as the actual log lap number we must invalidate this page. Otherwise it
// as the actual log lap number we must invalidate this page. Otherwise it
// could be impossible to find the end of the log in a later system/node
// could be impossible to find the end of the log in a later system/node
// restart.
// restart.
if
(
logPagePtr
.
p
->
logPageWord
[
ZPOS_LOG_LAP
]
==
logPartPtr
.
p
->
logLap
)
{
if
(
logPagePtr
.
p
->
logPageWord
[
ZPOS_LOG_LAP
]
==
logPartPtr
.
p
->
logLap
)
{
// This page must be invalidated.
// This page must be invalidated.
logPagePtr
.
p
->
logPageWord
[
ZPOS_LOG_LAP
]
=
0
;
// We search for end
// Contact NDBFS. Real time break.
// read next
writeSinglePage
(
signal
,
logPartPtr
.
p
->
invalidatePageNo
,
releaseLfo
(
signal
);
ZPAGE_SIZE
-
1
,
__LINE__
);
releaseLogpage
(
signal
);
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
WRITE_SR_INVALIDATE_PAGES
;
readFileInInvalidate
(
signal
,
true
);
}
else
{
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
READ_SR_INVALIDATE_PAGES
;
// We are done with invalidating. Finish start phase 3.4.
return
;
}
/**
* We found the "last" page to invalidate...
* Invalidate backwards until head...
*/
// Fall through...
case
LogFileOperationRecord
:
:
WRITE_SR_INVALIDATE_PAGES
:
jam
();
releaseLfo
(
signal
);
releaseLogpage
(
signal
);
// Step backwards...
logPartPtr
.
p
->
invalidatePageNo
--
;
if
(
logPartPtr
.
p
->
invalidatePageNo
==
0
)
{
jam
();
if
(
logFilePtr
.
p
->
fileNo
==
0
)
{
/**
* We're wrapping in the log...
* update logLap
*/
logPartPtr
.
p
->
logLap
--
;
ndbrequire
(
logPartPtr
.
p
->
logLap
);
// Should always be > 0
if
(
DEBUG_REDO
)
ndbout_c
(
"invalidateLogAfterLastGCI part: %u wrap from file 0 -> logLap: %u"
,
logPartPtr
.
i
,
logPartPtr
.
p
->
logLap
);
}
/**
* Move to prev file
*/
logFilePtr
.
i
=
logFilePtr
.
p
->
prevLogFile
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
logPartPtr
.
p
->
invalidateFileNo
=
logFilePtr
.
p
->
fileNo
;
logPartPtr
.
p
->
invalidatePageNo
=
ZNO_MBYTES_IN_FILE
*
ZPAGES_IN_MBYTE
-
1
;
}
if
(
logPartPtr
.
p
->
invalidateFileNo
==
logPartPtr
.
p
->
headFileNo
&&
logPartPtr
.
p
->
invalidatePageNo
==
logPartPtr
.
p
->
headPageNo
)
{
/**
* Done...
*/
logFilePtr
.
i
=
logPartPtr
.
p
->
currentLogfile
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
logFilePtr
.
i
=
logFilePtr
.
p
->
nextLogFile
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
// Close files if necessary. Current file and the next file should be
// left open.
exitFromInvalidate
(
signal
);
exitFromInvalidate
(
signal
);
return
;
}
}
return
;
break
;
seizeLogpage
(
signal
);
/**
* Make page really empty
*/
bzero
(
logPagePtr
.
p
,
sizeof
(
LogPageRecord
));
writeSinglePage
(
signal
,
logPartPtr
.
p
->
invalidatePageNo
,
ZPAGE_SIZE
-
1
,
__LINE__
);
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
WRITE_SR_INVALIDATE_PAGES
;
return
;
default:
default:
jam
();
jam
();
systemError
(
signal
,
__LINE__
);
systemError
(
signal
,
__LINE__
);
return
;
return
;
break
;
break
;
}
}
return
;
}
//Dblqh::invalidateLogAfterLastGCI
}
//Dblqh::invalidateLogAfterLastGCI
void
Dblqh
::
readFileInInvalidate
(
Signal
*
signal
)
{
void
Dblqh
::
readFileInInvalidate
(
Signal
*
signal
,
bool
stepNext
)
{
jam
();
jam
();
if
(
stepNext
)
{
logPartPtr
.
p
->
invalidatePageNo
++
;
if
(
logPartPtr
.
p
->
invalidatePageNo
==
(
ZNO_MBYTES_IN_FILE
*
ZPAGES_IN_MBYTE
))
{
// We continue in the next file.
logFilePtr
.
i
=
logFilePtr
.
p
->
nextLogFile
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
logPartPtr
.
p
->
invalidateFileNo
=
logFilePtr
.
p
->
fileNo
;
// Page 0 is used for file descriptors.
logPartPtr
.
p
->
invalidatePageNo
=
1
;
if
(
logFilePtr
.
p
->
fileNo
==
0
)
{
/**
* We're wrapping in the log...
* update logLap
*/
logPartPtr
.
p
->
logLap
++
;
if
(
DEBUG_REDO
)
ndbout_c
(
"readFileInInvalidate part: %u wrap to file 0 -> logLap: %u"
,
logPartPtr
.
i
,
logPartPtr
.
p
->
logLap
);
}
if
(
logFilePtr
.
p
->
logFileStatus
!=
LogFileRecord
::
OPEN
)
{
jam
();
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
OPEN_SR_INVALIDATE_PAGES
;
openFileRw
(
signal
,
logFilePtr
);
return
;
}
}
}
// Contact NDBFS. Real time break.
// Contact NDBFS. Real time break.
readSinglePage
(
signal
,
logPartPtr
.
p
->
invalidatePageNo
);
readSinglePage
(
signal
,
logPartPtr
.
p
->
invalidatePageNo
);
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
READ_SR_INVALIDATE_PAGES
;
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
READ_SR_INVALIDATE_PAGES
;
...
@@ -15270,34 +15408,57 @@ void Dblqh::readFileInInvalidate(Signal* signal) {
...
@@ -15270,34 +15408,57 @@ void Dblqh::readFileInInvalidate(Signal* signal) {
void
Dblqh
::
exitFromInvalidate
(
Signal
*
signal
)
{
void
Dblqh
::
exitFromInvalidate
(
Signal
*
signal
)
{
jam
();
jam
();
// Close files if necessary. Current file and the next file should be
// left open.
if
(
logFilePtr
.
i
!=
logPartPtr
.
p
->
currentLogfile
)
{
LogFileRecordPtr
currentLogFilePtr
;
LogFileRecordPtr
nextAfterCurrentLogFilePtr
;
currentLogFilePtr
.
i
=
logPartPtr
.
p
->
currentLogfile
;
ptrCheckGuard
(
currentLogFilePtr
,
clogFileFileSize
,
logFileRecord
);
nextAfterCurrentLogFilePtr
.
i
=
currentLogFilePtr
.
p
->
nextLogFile
;
if
(
logFilePtr
.
i
!=
nextAfterCurrentLogFilePtr
.
i
)
{
// This file should be closed.
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
CLOSE_SR_INVALIDATE_PAGES
;
closeFile
(
signal
,
logFilePtr
);
// Return from this function and wait for close confirm. Then come back
// and test the previous file for closing.
return
;
}
}
// We are done with closing files, send completed signal and exit this phase.
loop:
signal
->
theData
[
0
]
=
ZSR_FOURTH_COMP
;
logFilePtr
.
i
=
logFilePtr
.
p
->
nextLogFile
;
signal
->
theData
[
1
]
=
logPartPtr
.
i
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
sendSignal
(
cownref
,
GSN_CONTINUEB
,
signal
,
2
,
JBB
);
if
(
logFilePtr
.
i
==
logPartPtr
.
p
->
currentLogfile
)
{
jam
();
goto
done
;
}
if
(
logFilePtr
.
p
->
fileNo
==
0
)
{
jam
();
/**
* Logfile 0 shoult *not* be closed
*/
goto
loop
;
}
if
(
logFilePtr
.
p
->
logFileStatus
==
LogFileRecord
::
CLOSED
)
{
jam
();
goto
done
;
}
jam
();
ndbrequire
(
logFilePtr
.
p
->
logFileStatus
==
LogFileRecord
::
OPEN
);
logFilePtr
.
p
->
logFileStatus
=
LogFileRecord
::
CLOSE_SR_INVALIDATE_PAGES
;
closeFile
(
signal
,
logFilePtr
);
return
;
return
;
}
done:
if
(
DEBUG_REDO
)
ndbout_c
(
"exitFromInvalidate part: %u head file: %u page: %u"
,
logPartPtr
.
i
,
logPartPtr
.
p
->
headFileNo
,
logPartPtr
.
p
->
headPageNo
);
logFilePtr
.
i
=
logPartPtr
.
p
->
firstLogfile
;
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
logPagePtr
.
i
=
logFilePtr
.
p
->
logPageZero
;
ptrCheckGuard
(
logPagePtr
,
clogPageFileSize
,
logPageRecord
);
logPagePtr
.
p
->
logPageWord
[
ZPAGE_HEADER_SIZE
+
ZPOS_FILE_NO
]
=
logPartPtr
.
p
->
headFileNo
;
writeSinglePage
(
signal
,
0
,
ZPAGE_SIZE
-
1
,
__LINE__
);
lfoPtr
.
p
->
logFileRec
=
logFilePtr
.
i
;
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
WRITE_SR_INVALIDATE_PAGES_UPDATE_PAGE0
;
return
;
}
/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
/* THE EXECUTION OF A LOG RECORD IS COMPLETED. RELEASE PAGES IF THEY WERE */
/* THE EXECUTION OF A LOG RECORD IS COMPLETED. RELEASE PAGES IF THEY WERE */
...
@@ -15684,20 +15845,10 @@ void Dblqh::readSrFourthZeroLab(Signal* signal)
...
@@ -15684,20 +15845,10 @@ void Dblqh::readSrFourthZeroLab(Signal* signal)
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
ptrCheckGuard
(
logFilePtr
,
clogFileFileSize
,
logFileRecord
);
logPartPtr
.
p
->
invalidateFileNo
=
logPartPtr
.
p
->
headFileNo
;
logPartPtr
.
p
->
invalidateFileNo
=
logPartPtr
.
p
->
headFileNo
;
logPartPtr
.
p
->
invalidatePageNo
=
logPartPtr
.
p
->
headPageNo
;
logPartPtr
.
p
->
invalidatePageNo
=
logPartPtr
.
p
->
headPageNo
;
logPartPtr
.
p
->
logExecState
=
LogPartRecord
::
LES_EXEC_LOG_INVALIDATE
;
logPartPtr
.
p
->
logExecState
=
LogPartRecord
::
LES_EXEC_LOG_INVALIDATE
;
seizeLfo
(
signal
);
initLfo
(
signal
);
readFileInInvalidate
(
signal
,
true
);
// The state here is a little confusing, but simulates that we return
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
READ_SR_INVALIDATE_PAGES
;
// to invalidateLogAfterLastGCI() from an invalidate write and are ready
// to read a page from file.
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
WRITE_SR_INVALIDATE_PAGES
;
/**
* Make sure we dont release zero page
*/
seizeLogpage
(
signal
);
invalidateLogAfterLastGCI
(
signal
);
return
;
return
;
}
//Dblqh::readSrFourthZeroLab()
}
//Dblqh::readSrFourthZeroLab()
...
@@ -16269,6 +16420,14 @@ void Dblqh::completedLogPage(Signal* signal, Uint32 clpType, Uint32 place)
...
@@ -16269,6 +16420,14 @@ void Dblqh::completedLogPage(Signal* signal, Uint32 clpType, Uint32 place)
signal
->
theData
[
4
]
=
ZVAR_NO_LOG_PAGE_WORD
;
signal
->
theData
[
4
]
=
ZVAR_NO_LOG_PAGE_WORD
;
signal
->
theData
[
5
]
=
twlpNoPages
;
signal
->
theData
[
5
]
=
twlpNoPages
;
sendSignal
(
NDBFS_REF
,
GSN_FSWRITEREQ
,
signal
,
15
,
JBA
);
sendSignal
(
NDBFS_REF
,
GSN_FSWRITEREQ
,
signal
,
15
,
JBA
);
if
(
DEBUG_REDO
)
ndbout_c
(
"writing %d pages at part: %u file: %u pos: %u"
,
twlpNoPages
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
logFilePtr
.
p
->
filePosition
);
if
(
twlpType
==
ZNORMAL
)
{
if
(
twlpType
==
ZNORMAL
)
{
jam
();
jam
();
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
ACTIVE_WRITE_LOG
;
lfoPtr
.
p
->
lfoState
=
LogFileOperationRecord
::
ACTIVE_WRITE_LOG
;
...
@@ -17508,6 +17667,14 @@ void Dblqh::readExecLog(Signal* signal)
...
@@ -17508,6 +17667,14 @@ void Dblqh::readExecLog(Signal* signal)
signal
->
theData
[
14
]
=
lfoPtr
.
p
->
logPageArray
[
8
];
signal
->
theData
[
14
]
=
lfoPtr
.
p
->
logPageArray
[
8
];
signal
->
theData
[
15
]
=
lfoPtr
.
p
->
logPageArray
[
9
];
signal
->
theData
[
15
]
=
lfoPtr
.
p
->
logPageArray
[
9
];
sendSignal
(
NDBFS_REF
,
GSN_FSREADREQ
,
signal
,
16
,
JBA
);
sendSignal
(
NDBFS_REF
,
GSN_FSREADREQ
,
signal
,
16
,
JBA
);
if
(
DEBUG_REDO
)
ndbout_c
(
"readExecLog %u page at part: %u file: %u pos: %u"
,
lfoPtr
.
p
->
noPagesRw
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
logPartPtr
.
p
->
execSrStartPageNo
);
}
//Dblqh::readExecLog()
}
//Dblqh::readExecLog()
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
...
@@ -17570,6 +17737,14 @@ void Dblqh::readExecSr(Signal* signal)
...
@@ -17570,6 +17737,14 @@ void Dblqh::readExecSr(Signal* signal)
signal
->
theData
[
13
]
=
lfoPtr
.
p
->
logPageArray
[
7
];
signal
->
theData
[
13
]
=
lfoPtr
.
p
->
logPageArray
[
7
];
signal
->
theData
[
14
]
=
tresPageid
;
signal
->
theData
[
14
]
=
tresPageid
;
sendSignal
(
NDBFS_REF
,
GSN_FSREADREQ
,
signal
,
15
,
JBA
);
sendSignal
(
NDBFS_REF
,
GSN_FSREADREQ
,
signal
,
15
,
JBA
);
if
(
DEBUG_REDO
)
ndbout_c
(
"readExecSr %u page at part: %u file: %u pos: %u"
,
8
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
tresPageid
);
}
//Dblqh::readExecSr()
}
//Dblqh::readExecSr()
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
...
@@ -17719,6 +17894,13 @@ void Dblqh::readSinglePage(Signal* signal, Uint32 pageNo)
...
@@ -17719,6 +17894,13 @@ void Dblqh::readSinglePage(Signal* signal, Uint32 pageNo)
signal
->
theData
[
6
]
=
logPagePtr
.
i
;
signal
->
theData
[
6
]
=
logPagePtr
.
i
;
signal
->
theData
[
7
]
=
pageNo
;
signal
->
theData
[
7
]
=
pageNo
;
sendSignal
(
NDBFS_REF
,
GSN_FSREADREQ
,
signal
,
8
,
JBA
);
sendSignal
(
NDBFS_REF
,
GSN_FSREADREQ
,
signal
,
8
,
JBA
);
if
(
DEBUG_REDO
)
ndbout_c
(
"readSinglePage 1 page at part: %u file: %u pos: %u"
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
pageNo
);
}
//Dblqh::readSinglePage()
}
//Dblqh::readSinglePage()
/* --------------------------------------------------------------------------
/* --------------------------------------------------------------------------
...
@@ -18301,8 +18483,17 @@ void Dblqh::writeCompletedGciLog(Signal* signal)
...
@@ -18301,8 +18483,17 @@ void Dblqh::writeCompletedGciLog(Signal* signal)
jam
();
jam
();
changeMbyte
(
signal
);
changeMbyte
(
signal
);
}
//if
}
//if
logFilePtr
.
p
->
remainingWordsInMbyte
=
logFilePtr
.
p
->
remainingWordsInMbyte
=
logFilePtr
.
p
->
remainingWordsInMbyte
-
ZCOMPLETED_GCI_LOG_SIZE
;
logFilePtr
.
p
->
remainingWordsInMbyte
-
ZCOMPLETED_GCI_LOG_SIZE
;
if
(
DEBUG_REDO
)
ndbout_c
(
"writeCompletedGciLog gci: %u part: %u file: %u page: %u"
,
cnewestCompletedGci
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
logFilePtr
.
p
->
currentFilepage
);
writeLogWord
(
signal
,
ZCOMPLETED_GCI_TYPE
);
writeLogWord
(
signal
,
ZCOMPLETED_GCI_TYPE
);
writeLogWord
(
signal
,
cnewestCompletedGci
);
writeLogWord
(
signal
,
cnewestCompletedGci
);
logPartPtr
.
p
->
logPartNewestCompletedGCI
=
cnewestCompletedGci
;
logPartPtr
.
p
->
logPartNewestCompletedGCI
=
cnewestCompletedGci
;
...
@@ -18339,6 +18530,13 @@ void Dblqh::writeDirty(Signal* signal, Uint32 place)
...
@@ -18339,6 +18530,13 @@ void Dblqh::writeDirty(Signal* signal, Uint32 place)
signal
->
theData
[
6
]
=
logPagePtr
.
i
;
signal
->
theData
[
6
]
=
logPagePtr
.
i
;
signal
->
theData
[
7
]
=
logPartPtr
.
p
->
prevFilepage
;
signal
->
theData
[
7
]
=
logPartPtr
.
p
->
prevFilepage
;
sendSignal
(
NDBFS_REF
,
GSN_FSWRITEREQ
,
signal
,
8
,
JBA
);
sendSignal
(
NDBFS_REF
,
GSN_FSWRITEREQ
,
signal
,
8
,
JBA
);
if
(
DEBUG_REDO
)
ndbout_c
(
"writeDirty 1 page at part: %u file: %u pos: %u"
,
logPartPtr
.
i
,
logFilePtr
.
p
->
fileNo
,
logPartPtr
.
p
->
prevFilepage
);
}
//Dblqh::writeDirty()
}
//Dblqh::writeDirty()
/* --------------------------------------------------------------------------
/* --------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
View file @
81eb7328
...
@@ -883,6 +883,12 @@ void Dbtc::execREAD_NODESCONF(Signal* signal)
...
@@ -883,6 +883,12 @@ void Dbtc::execREAD_NODESCONF(Signal* signal)
hostptr
.
p
->
hostStatus
=
HS_ALIVE
;
hostptr
.
p
->
hostStatus
=
HS_ALIVE
;
c_alive_nodes
.
set
(
i
);
c_alive_nodes
.
set
(
i
);
}
//if
}
//if
if
(
NodeBitmask
::
get
(
readNodes
->
startedNodes
,
i
))
{
jam
();
hostptr
.
p
->
m_nf_bits
=
HostRecord
::
NF_STARTED
;
}
}
//if
}
//if
}
//for
}
//for
ndbsttorry010Lab
(
signal
);
ndbsttorry010Lab
(
signal
);
...
@@ -10223,6 +10229,7 @@ void Dbtc::inithost(Signal* signal)
...
@@ -10223,6 +10229,7 @@ void Dbtc::inithost(Signal* signal)
hostptr
.
p
->
noOfWordsTCINDXCONF
=
0
;
hostptr
.
p
->
noOfWordsTCINDXCONF
=
0
;
hostptr
.
p
->
noOfPackedWordsLqh
=
0
;
hostptr
.
p
->
noOfPackedWordsLqh
=
0
;
hostptr
.
p
->
hostLqhBlockRef
=
calcLqhBlockRef
(
hostptr
.
i
);
hostptr
.
p
->
hostLqhBlockRef
=
calcLqhBlockRef
(
hostptr
.
i
);
hostptr
.
p
->
m_nf_bits
=
0
;
}
//for
}
//for
c_alive_nodes
.
clear
();
c_alive_nodes
.
clear
();
}
//Dbtc::inithost()
}
//Dbtc::inithost()
...
...
This diff is collapsed.
Click to expand it.
ndb/test/ndbapi/testNodeRestart.cpp
View file @
81eb7328
...
@@ -943,12 +943,62 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){
...
@@ -943,12 +943,62 @@ int runBug24717(NDBT_Context* ctx, NDBT_Step* step){
restarter
.
startNodes
(
&
nodeId
,
1
);
restarter
.
startNodes
(
&
nodeId
,
1
);
for
(
Uint32
i
=
0
;
i
<
100
;
i
++
)
do
{
{
for
(
Uint32
i
=
0
;
i
<
100
;
i
++
)
hugoTrans
.
pkReadRecords
(
pNdb
,
100
,
1
,
NdbOperation
::
LM_CommittedRead
);
{
}
hugoTrans
.
pkReadRecords
(
pNdb
,
100
,
1
,
NdbOperation
::
LM_CommittedRead
);
}
}
while
(
restarter
.
waitClusterStarted
(
5
)
!=
0
);
}
return
NDBT_OK
;
}
int
runBug29364
(
NDBT_Context
*
ctx
,
NDBT_Step
*
step
){
int
result
=
NDBT_OK
;
int
loops
=
ctx
->
getNumLoops
();
int
records
=
ctx
->
getNumRecords
();
NdbRestarter
restarter
;
Ndb
*
pNdb
=
GETNDB
(
step
);
HugoTransactions
hugoTrans
(
*
ctx
->
getTab
());
if
(
restarter
.
getNumDbNodes
()
<
4
)
return
NDBT_OK
;
int
dump0
[]
=
{
9000
,
0
}
;
int
dump1
[]
=
{
9001
,
0
}
;
Uint32
ownNode
=
refToNode
(
pNdb
->
getReference
());
dump0
[
1
]
=
ownNode
;
for
(;
loops
;
loops
--
)
{
int
node0
=
restarter
.
getDbNodeId
(
rand
()
%
restarter
.
getNumDbNodes
());
int
node1
=
restarter
.
getRandomNodeOtherNodeGroup
(
node0
,
rand
());
restarter
.
restartOneDbNode
(
node0
,
false
,
true
,
true
);
restarter
.
waitNodesNoStart
(
&
node0
,
1
);
restarter
.
startNodes
(
&
node0
,
1
);
restarter
.
waitClusterStarted
();
restarter
.
waitClusterStarted
();
restarter
.
restartOneDbNode
(
node1
,
false
,
true
,
true
);
restarter
.
waitNodesNoStart
(
&
node1
,
1
);
if
(
restarter
.
dumpStateOneNode
(
node1
,
dump0
,
2
))
return
NDBT_FAILED
;
restarter
.
startNodes
(
&
node1
,
1
);
do
{
for
(
Uint32
i
=
0
;
i
<
100
;
i
++
)
{
hugoTrans
.
pkReadRecords
(
pNdb
,
100
,
1
,
NdbOperation
::
LM_CommittedRead
);
}
}
while
(
restarter
.
waitClusterStarted
(
5
)
!=
0
);
if
(
restarter
.
dumpStateOneNode
(
node1
,
dump1
,
1
))
return
NDBT_FAILED
;
}
}
return
NDBT_OK
;
return
NDBT_OK
;
...
@@ -1633,6 +1683,9 @@ TESTCASE("Bug27283", ""){
...
@@ -1633,6 +1683,9 @@ TESTCASE("Bug27283", ""){
TESTCASE
(
"Bug28717"
,
""
){
TESTCASE
(
"Bug28717"
,
""
){
INITIALIZER
(
runBug28717
);
INITIALIZER
(
runBug28717
);
}
}
TESTCASE
(
"Bug29364"
,
""
){
INITIALIZER
(
runBug29364
);
}
NDBT_TESTSUITE_END
(
testNodeRestart
);
NDBT_TESTSUITE_END
(
testNodeRestart
);
int
main
(
int
argc
,
const
char
**
argv
){
int
main
(
int
argc
,
const
char
**
argv
){
...
...
This diff is collapsed.
Click to expand it.
ndb/test/run-test/daily-basic-tests.txt
View file @
81eb7328
...
@@ -477,6 +477,10 @@ max-time: 1000
...
@@ -477,6 +477,10 @@ max-time: 1000
cmd: testNodeRestart
cmd: testNodeRestart
args: -n Bug24717 T1
args: -n Bug24717 T1
max-time: 1000
cmd: testNodeRestart
args: -n Bug29364 T1
max-time: 1000
max-time: 1000
cmd: testNodeRestart
cmd: testNodeRestart
args: -n Bug25364 T1
args: -n Bug25364 T1
...
@@ -637,6 +641,10 @@ max-time: 1000
...
@@ -637,6 +641,10 @@ max-time: 1000
cmd: testNdbApi
cmd: testNdbApi
args: -n BugBug28443
args: -n BugBug28443
max-time: 1000
cmd: testNdbApi
args: -n Bug28443
#max-time: 500
#max-time: 500
#cmd: testInterpreter
#cmd: testInterpreter
#args: T1
#args: T1
...
...
This diff is collapsed.
Click to expand it.
sql/ha_ndbcluster_cond.h
View file @
81eb7328
...
@@ -259,8 +259,20 @@ class Ndb_cond : public Sql_alloc
...
@@ -259,8 +259,20 @@ class Ndb_cond : public Sql_alloc
~
Ndb_cond
()
~
Ndb_cond
()
{
{
if
(
ndb_item
)
delete
ndb_item
;
if
(
ndb_item
)
delete
ndb_item
;
ndb_item
=
NULL
;
ndb_item
=
NULL
;
if
(
next
)
delete
next
;
/*
First item in the linked list deletes all in a loop
Note - doing it recursively causes stack issues for
big IN clauses
*/
Ndb_cond
*
n
=
next
;
while
(
n
)
{
Ndb_cond
*
tmp
=
n
;
n
=
n
->
next
;
tmp
->
next
=
NULL
;
delete
tmp
;
}
next
=
prev
=
NULL
;
next
=
prev
=
NULL
;
};
};
Ndb_item
*
ndb_item
;
Ndb_item
*
ndb_item
;
...
...
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