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
15767832
Commit
15767832
authored
Oct 12, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
parents
76dd9aa2
6b041b49
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
130 additions
and
80 deletions
+130
-80
ndb/src/kernel/blocks/ERROR_codes.txt
ndb/src/kernel/blocks/ERROR_codes.txt
+3
-1
ndb/src/kernel/blocks/dbdih/Dbdih.hpp
ndb/src/kernel/blocks/dbdih/Dbdih.hpp
+2
-0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+123
-77
ndb/src/ndbapi/NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp
+2
-2
No files found.
ndb/src/kernel/blocks/ERROR_codes.txt
View file @
15767832
...
@@ -5,7 +5,7 @@ Next DBACC 3002
...
@@ -5,7 +5,7 @@ Next DBACC 3002
Next DBTUP 4014
Next DBTUP 4014
Next DBLQH 5043
Next DBLQH 5043
Next DBDICT 6007
Next DBDICT 6007
Next DBDIH 717
7
Next DBDIH 717
8
Next DBTC 8038
Next DBTC 8038
Next CMVMI 9000
Next CMVMI 9000
Next BACKUP 10022
Next BACKUP 10022
...
@@ -66,6 +66,8 @@ Delay GCP_SAVEREQ by 10 secs
...
@@ -66,6 +66,8 @@ Delay GCP_SAVEREQ by 10 secs
7030: Delay in GCP_PREPARE until node has completed a node failure
7030: Delay in GCP_PREPARE until node has completed a node failure
7031: Delay in GCP_PREPARE and die 3s later
7031: Delay in GCP_PREPARE and die 3s later
7177: Delay copying of sysfileData in execCOPY_GCIREQ
ERROR CODES FOR TESTING NODE FAILURE, LOCAL CHECKPOINT HANDLING:
ERROR CODES FOR TESTING NODE FAILURE, LOCAL CHECKPOINT HANDLING:
-----------------------------------------------------------------
-----------------------------------------------------------------
...
...
ndb/src/kernel/blocks/dbdih/Dbdih.hpp
View file @
15767832
...
@@ -1048,6 +1048,8 @@ private:
...
@@ -1048,6 +1048,8 @@ private:
void
removeStoredReplica
(
FragmentstorePtr
regFragptr
,
void
removeStoredReplica
(
FragmentstorePtr
regFragptr
,
ReplicaRecordPtr
replicaPtr
);
ReplicaRecordPtr
replicaPtr
);
void
searchStoredReplicas
(
FragmentstorePtr
regFragptr
);
void
searchStoredReplicas
(
FragmentstorePtr
regFragptr
);
bool
setup_create_replica
(
FragmentstorePtr
,
CreateReplicaRecord
*
,
ConstPtr
<
ReplicaRecord
>
);
void
updateNodeInfo
(
FragmentstorePtr
regFragptr
);
void
updateNodeInfo
(
FragmentstorePtr
regFragptr
);
//------------------------------------
//------------------------------------
...
...
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
15767832
...
@@ -627,22 +627,48 @@ void Dbdih::execCOPY_GCIREQ(Signal* signal)
...
@@ -627,22 +627,48 @@ void Dbdih::execCOPY_GCIREQ(Signal* signal)
ndbrequire
(
c_copyGCISlave
.
m_copyReason
==
CopyGCIReq
::
IDLE
);
ndbrequire
(
c_copyGCISlave
.
m_copyReason
==
CopyGCIReq
::
IDLE
);
ndbrequire
(
c_copyGCISlave
.
m_expectedNextWord
==
tstart
);
ndbrequire
(
c_copyGCISlave
.
m_expectedNextWord
==
tstart
);
ndbrequire
(
reason
!=
CopyGCIReq
::
IDLE
);
ndbrequire
(
reason
!=
CopyGCIReq
::
IDLE
);
bool
isdone
=
(
tstart
+
CopyGCIReq
::
DATA_SIZE
)
>=
Sysfile
::
SYSFILE_SIZE32
;
if
(
ERROR_INSERTED
(
7177
))
{
jam
();
if
(
signal
->
getLength
()
==
3
)
{
jam
();
goto
done
;
}
}
arrGuard
(
tstart
+
CopyGCIReq
::
DATA_SIZE
,
sizeof
(
sysfileData
)
/
4
);
arrGuard
(
tstart
+
CopyGCIReq
::
DATA_SIZE
,
sizeof
(
sysfileData
)
/
4
);
for
(
Uint32
i
=
0
;
i
<
CopyGCIReq
::
DATA_SIZE
;
i
++
)
for
(
Uint32
i
=
0
;
i
<
CopyGCIReq
::
DATA_SIZE
;
i
++
)
cdata
[
tstart
+
i
]
=
copyGCI
->
data
[
i
];
cdata
[
tstart
+
i
]
=
copyGCI
->
data
[
i
];
if
((
tstart
+
CopyGCIReq
::
DATA_SIZE
)
>=
Sysfile
::
SYSFILE_SIZE32
)
{
if
(
ERROR_INSERTED
(
7177
)
&&
isMaster
()
&&
isdone
)
{
sendSignalWithDelay
(
reference
(),
GSN_COPY_GCIREQ
,
signal
,
1000
,
3
);
return
;
}
done:
if
(
isdone
)
{
jam
();
jam
();
c_copyGCISlave
.
m_expectedNextWord
=
0
;
c_copyGCISlave
.
m_expectedNextWord
=
0
;
}
else
{
}
else
{
jam
();
jam
();
c_copyGCISlave
.
m_expectedNextWord
+=
CopyGCIReq
::
DATA_SIZE
;
c_copyGCISlave
.
m_expectedNextWord
+=
CopyGCIReq
::
DATA_SIZE
;
return
;
return
;
}
//if
}
memcpy
(
sysfileData
,
cdata
,
sizeof
(
sysfileData
));
if
(
cmasterdihref
!=
reference
())
{
jam
();
memcpy
(
sysfileData
,
cdata
,
sizeof
(
sysfileData
));
}
c_copyGCISlave
.
m_copyReason
=
reason
;
c_copyGCISlave
.
m_copyReason
=
reason
;
c_copyGCISlave
.
m_senderRef
=
signal
->
senderBlockRef
();
c_copyGCISlave
.
m_senderRef
=
signal
->
senderBlockRef
();
c_copyGCISlave
.
m_senderData
=
copyGCI
->
anyData
;
c_copyGCISlave
.
m_senderData
=
copyGCI
->
anyData
;
...
@@ -8447,14 +8473,30 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){
...
@@ -8447,14 +8473,30 @@ Dbdih::resetReplicaSr(TabRecordPtr tabPtr){
resetReplicaLcp
(
replicaPtr
.
p
,
newestRestorableGCI
);
resetReplicaLcp
(
replicaPtr
.
p
,
newestRestorableGCI
);
/* -----------------------------------------------------------------
/**
* LINK THE REPLICA INTO THE STORED REPLICA LIST. WE WILL USE THIS
* Make sure we can also find REDO for restoring replica...
* NODE AS A STORED REPLICA.
*/
* WE MUST FIRST LINK IT OUT OF THE LIST OF OLD STORED REPLICAS.
{
* --------------------------------------------------------------- */
CreateReplicaRecord
createReplica
;
removeOldStoredReplica
(
fragPtr
,
replicaPtr
);
ConstPtr
<
ReplicaRecord
>
constReplicaPtr
;
linkStoredReplica
(
fragPtr
,
replicaPtr
);
constReplicaPtr
.
i
=
replicaPtr
.
i
;
constReplicaPtr
.
p
=
replicaPtr
.
p
;
if
(
setup_create_replica
(
fragPtr
,
&
createReplica
,
constReplicaPtr
))
{
removeOldStoredReplica
(
fragPtr
,
replicaPtr
);
linkStoredReplica
(
fragPtr
,
replicaPtr
);
}
else
{
infoEvent
(
"Forcing take-over of node %d due to unsufficient REDO"
" for table %d fragment: %d"
,
nodePtr
.
i
,
tabPtr
.
i
,
i
);
setNodeActiveStatus
(
nodePtr
.
i
,
Sysfile
::
NS_NotActive_NotTakenOver
);
}
}
}
}
default:
default:
jam
();
jam
();
...
@@ -9498,6 +9540,7 @@ void Dbdih::calculateKeepGciLab(Signal* signal, Uint32 tableId, Uint32 fragId)
...
@@ -9498,6 +9540,7 @@ void Dbdih::calculateKeepGciLab(Signal* signal, Uint32 tableId, Uint32 fragId)
FragmentstorePtr
fragPtr
;
FragmentstorePtr
fragPtr
;
getFragstore
(
tabPtr
.
p
,
fragId
,
fragPtr
);
getFragstore
(
tabPtr
.
p
,
fragId
,
fragPtr
);
checkKeepGci
(
tabPtr
,
fragId
,
fragPtr
.
p
,
fragPtr
.
p
->
storedReplicas
);
checkKeepGci
(
tabPtr
,
fragId
,
fragPtr
.
p
,
fragPtr
.
p
->
storedReplicas
);
checkKeepGci
(
tabPtr
,
fragId
,
fragPtr
.
p
,
fragPtr
.
p
->
oldStoredReplicas
);
fragId
++
;
fragId
++
;
if
(
fragId
>=
tabPtr
.
p
->
totalfragments
)
{
if
(
fragId
>=
tabPtr
.
p
->
totalfragments
)
{
jam
();
jam
();
...
@@ -12493,16 +12536,75 @@ void Dbdih::removeTooNewCrashedReplicas(ReplicaRecordPtr rtnReplicaPtr)
...
@@ -12493,16 +12536,75 @@ void Dbdih::removeTooNewCrashedReplicas(ReplicaRecordPtr rtnReplicaPtr)
/* CHECKPOINT WITHOUT NEEDING ANY EXTRA LOGGING FACILITIES.*/
/* CHECKPOINT WITHOUT NEEDING ANY EXTRA LOGGING FACILITIES.*/
/* A MAXIMUM OF FOUR NODES IS RETRIEVED. */
/* A MAXIMUM OF FOUR NODES IS RETRIEVED. */
/*************************************************************************/
/*************************************************************************/
bool
Dbdih
::
setup_create_replica
(
FragmentstorePtr
fragPtr
,
CreateReplicaRecord
*
createReplicaPtrP
,
ConstPtr
<
ReplicaRecord
>
replicaPtr
)
{
createReplicaPtrP
->
dataNodeId
=
replicaPtr
.
p
->
procNode
;
createReplicaPtrP
->
replicaRec
=
replicaPtr
.
i
;
/* ----------------------------------------------------------------- */
/* WE NEED TO SEARCH FOR A PROPER LOCAL CHECKPOINT TO USE FOR THE */
/* SYSTEM RESTART. */
/* ----------------------------------------------------------------- */
Uint32
startGci
;
Uint32
startLcpNo
;
Uint32
stopGci
=
SYSFILE
->
newestRestorableGCI
;
bool
result
=
findStartGci
(
replicaPtr
,
stopGci
,
startGci
,
startLcpNo
);
if
(
!
result
)
{
jam
();
/* --------------------------------------------------------------- */
/* WE COULD NOT FIND ANY LOCAL CHECKPOINT. THE FRAGMENT THUS DO NOT*/
/* CONTAIN ANY VALID LOCAL CHECKPOINT. IT DOES HOWEVER CONTAIN A */
/* VALID FRAGMENT LOG. THUS BY FIRST CREATING THE FRAGMENT AND THEN*/
/* EXECUTING THE FRAGMENT LOG WE CAN CREATE THE FRAGMENT AS */
/* DESIRED. THIS SHOULD ONLY OCCUR AFTER CREATING A FRAGMENT. */
/* */
/* TO INDICATE THAT NO LOCAL CHECKPOINT IS TO BE USED WE SET THE */
/* LOCAL CHECKPOINT TO ZNIL. */
/* --------------------------------------------------------------- */
createReplicaPtrP
->
lcpNo
=
ZNIL
;
}
else
{
jam
();
/* --------------------------------------------------------------- */
/* WE FOUND A PROPER LOCAL CHECKPOINT TO RESTART FROM. */
/* SET LOCAL CHECKPOINT ID AND LOCAL CHECKPOINT NUMBER. */
/* --------------------------------------------------------------- */
createReplicaPtrP
->
lcpNo
=
startLcpNo
;
arrGuard
(
startLcpNo
,
MAX_LCP_STORED
);
createReplicaPtrP
->
createLcpId
=
replicaPtr
.
p
->
lcpId
[
startLcpNo
];
}
//if
/* ----------------------------------------------------------------- */
/* WE HAVE EITHER FOUND A LOCAL CHECKPOINT OR WE ARE PLANNING TO */
/* EXECUTE THE LOG FROM THE INITIAL CREATION OF THE TABLE. IN BOTH */
/* CASES WE NEED TO FIND A SET OF LOGS THAT CAN EXECUTE SUCH THAT */
/* WE RECOVER TO THE SYSTEM RESTART GLOBAL CHECKPOINT. */
/* -_--------------------------------------------------------------- */
return
findLogNodes
(
createReplicaPtrP
,
fragPtr
,
startGci
,
stopGci
);
}
void
Dbdih
::
searchStoredReplicas
(
FragmentstorePtr
fragPtr
)
void
Dbdih
::
searchStoredReplicas
(
FragmentstorePtr
fragPtr
)
{
{
Uint32
nextReplicaPtrI
;
Uint32
nextReplicaPtrI
;
Const
Ptr
<
ReplicaRecord
>
replicaPtr
;
Ptr
<
ReplicaRecord
>
replicaPtr
;
replicaPtr
.
i
=
fragPtr
.
p
->
storedReplicas
;
replicaPtr
.
i
=
fragPtr
.
p
->
storedReplicas
;
while
(
replicaPtr
.
i
!=
RNIL
)
{
while
(
replicaPtr
.
i
!=
RNIL
)
{
jam
();
jam
();
ptrCheckGuard
(
replicaPtr
,
creplicaFileSize
,
replicaRecord
);
ptrCheckGuard
(
replicaPtr
,
creplicaFileSize
,
replicaRecord
);
nextReplicaPtrI
=
replicaPtr
.
p
->
nextReplica
;
nextReplicaPtrI
=
replicaPtr
.
p
->
nextReplica
;
ConstPtr
<
ReplicaRecord
>
constReplicaPtr
;
constReplicaPtr
.
i
=
replicaPtr
.
i
;
constReplicaPtr
.
p
=
replicaPtr
.
p
;
NodeRecordPtr
nodePtr
;
NodeRecordPtr
nodePtr
;
nodePtr
.
i
=
replicaPtr
.
p
->
procNode
;
nodePtr
.
i
=
replicaPtr
.
p
->
procNode
;
ptrCheckGuard
(
nodePtr
,
MAX_NDB_NODES
,
nodeRecord
);
ptrCheckGuard
(
nodePtr
,
MAX_NDB_NODES
,
nodeRecord
);
...
@@ -12522,69 +12624,13 @@ void Dbdih::searchStoredReplicas(FragmentstorePtr fragPtr)
...
@@ -12522,69 +12624,13 @@ void Dbdih::searchStoredReplicas(FragmentstorePtr fragPtr)
createReplicaPtr
.
i
=
cnoOfCreateReplicas
;
createReplicaPtr
.
i
=
cnoOfCreateReplicas
;
ptrCheckGuard
(
createReplicaPtr
,
4
,
createReplicaRecord
);
ptrCheckGuard
(
createReplicaPtr
,
4
,
createReplicaRecord
);
cnoOfCreateReplicas
++
;
cnoOfCreateReplicas
++
;
createReplicaPtr
.
p
->
dataNodeId
=
replicaPtr
.
p
->
procNode
;
createReplicaPtr
.
p
->
replicaRec
=
replicaPtr
.
i
;
/* ----------------------------------------------------------------- */
/* WE NEED TO SEARCH FOR A PROPER LOCAL CHECKPOINT TO USE FOR THE */
/* SYSTEM RESTART. */
/* ----------------------------------------------------------------- */
Uint32
startGci
;
Uint32
startLcpNo
;
Uint32
stopGci
=
SYSFILE
->
newestRestorableGCI
;
bool
result
=
findStartGci
(
replicaPtr
,
stopGci
,
startGci
,
startLcpNo
);
if
(
!
result
)
{
jam
();
/* --------------------------------------------------------------- */
/* WE COULD NOT FIND ANY LOCAL CHECKPOINT. THE FRAGMENT THUS DO NOT*/
/* CONTAIN ANY VALID LOCAL CHECKPOINT. IT DOES HOWEVER CONTAIN A */
/* VALID FRAGMENT LOG. THUS BY FIRST CREATING THE FRAGMENT AND THEN*/
/* EXECUTING THE FRAGMENT LOG WE CAN CREATE THE FRAGMENT AS */
/* DESIRED. THIS SHOULD ONLY OCCUR AFTER CREATING A FRAGMENT. */
/* */
/* TO INDICATE THAT NO LOCAL CHECKPOINT IS TO BE USED WE SET THE */
/* LOCAL CHECKPOINT TO ZNIL. */
/* --------------------------------------------------------------- */
createReplicaPtr
.
p
->
lcpNo
=
ZNIL
;
}
else
{
jam
();
/* --------------------------------------------------------------- */
/* WE FOUND A PROPER LOCAL CHECKPOINT TO RESTART FROM. */
/* SET LOCAL CHECKPOINT ID AND LOCAL CHECKPOINT NUMBER. */
/* --------------------------------------------------------------- */
createReplicaPtr
.
p
->
lcpNo
=
startLcpNo
;
arrGuard
(
startLcpNo
,
MAX_LCP_STORED
);
createReplicaPtr
.
p
->
createLcpId
=
replicaPtr
.
p
->
lcpId
[
startLcpNo
];
}
//if
if
(
ERROR_INSERTED
(
7073
)
||
ERROR_INSERTED
(
7074
)){
jam
();
nodePtr
.
p
->
nodeStatus
=
NodeRecord
::
DEAD
;
}
/* ----------------------------------------------------------------- */
/* WE HAVE EITHER FOUND A LOCAL CHECKPOINT OR WE ARE PLANNING TO */
/* EXECUTE THE LOG FROM THE INITIAL CREATION OF THE TABLE. IN BOTH */
/* CASES WE NEED TO FIND A SET OF LOGS THAT CAN EXECUTE SUCH THAT */
/* WE RECOVER TO THE SYSTEM RESTART GLOBAL CHECKPOINT. */
/* -_--------------------------------------------------------------- */
if
(
!
findLogNodes
(
createReplicaPtr
.
p
,
fragPtr
,
startGci
,
stopGci
))
{
jam
();
/* --------------------------------------------------------------- */
/* WE WERE NOT ABLE TO FIND ANY WAY OF RESTORING THIS REPLICA. */
/* THIS IS A POTENTIAL SYSTEM ERROR. */
/* --------------------------------------------------------------- */
cnoOfCreateReplicas
--
;
return
;
}
//if
if
(
ERROR_INSERTED
(
7073
)
||
ERROR_INSERTED
(
7074
)){
jam
();
nodePtr
.
p
->
nodeStatus
=
NodeRecord
::
ALIVE
;
}
/**
* Should have been checked in resetReplicaSr
*/
ndbrequire
(
setup_create_replica
(
fragPtr
,
createReplicaPtr
.
p
,
constReplicaPtr
));
break
;
break
;
}
}
default:
default:
...
...
ndb/src/ndbapi/NdbScanOperation.cpp
View file @
15767832
...
@@ -680,7 +680,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp)
...
@@ -680,7 +680,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp)
theNdbCon
=
NULL
;
theNdbCon
=
NULL
;
m_transConnection
=
NULL
;
m_transConnection
=
NULL
;
if
(
tTransCon
)
if
(
tTransCon
&&
releaseOp
)
{
{
NdbIndexScanOperation
*
tOp
=
(
NdbIndexScanOperation
*
)
this
;
NdbIndexScanOperation
*
tOp
=
(
NdbIndexScanOperation
*
)
this
;
...
@@ -695,7 +695,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp)
...
@@ -695,7 +695,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp)
&
tTransCon
->
m_theLastScanOperation
,
&
tTransCon
->
m_theLastScanOperation
,
tOp
);
tOp
);
}
}
else
if
(
releaseOp
)
else
{
{
ret
=
tTransCon
->
releaseScanOperation
(
&
tTransCon
->
m_firstExecutedScanOp
,
ret
=
tTransCon
->
releaseScanOperation
(
&
tTransCon
->
m_firstExecutedScanOp
,
0
,
tOp
);
0
,
tOp
);
...
...
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