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
92a4e76a
Commit
92a4e76a
authored
Dec 14, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.6 into 10.7
parents
b1d647ae
660cfe47
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
79 additions
and
28 deletions
+79
-28
storage/innobase/fil/fil0fil.cc
storage/innobase/fil/fil0fil.cc
+1
-2
storage/innobase/fsp/fsp0file.cc
storage/innobase/fsp/fsp0file.cc
+8
-24
storage/innobase/include/fsp0file.h
storage/innobase/include/fsp0file.h
+1
-2
storage/innobase/log/log0recv.cc
storage/innobase/log/log0recv.cc
+69
-0
No files found.
storage/innobase/fil/fil0fil.cc
View file @
92a4e76a
...
...
@@ -2544,8 +2544,7 @@ fil_ibd_load(uint32_t space_id, const char *filename, fil_space_t *&space)
/* Read and validate the first page of the tablespace.
Assign a tablespace name based on the tablespace type. */
switch
(
file
.
validate_for_recovery
(
static_cast
<
uint32_t
>
(
space_id
)))
{
switch
(
file
.
validate_for_recovery
())
{
os_offset_t
minimum_size
;
case
DB_SUCCESS
:
deferred_space
=
file
.
m_defer
;
...
...
storage/innobase/fsp/fsp0file.cc
View file @
92a4e76a
...
...
@@ -386,11 +386,10 @@ exist and be successfully opened. We initially open it in read-only mode
because we just want to read the SpaceID. However, if the first page is
corrupt and needs to be restored from the doublewrite buffer, we will
reopen it in write mode and ry to restore that page.
@param space_id space id to validate for recovery
@retval DB_SUCCESS if tablespace is valid, DB_ERROR if not.
m_is_valid is also set true on success, else false. */
dberr_t
Datafile
::
validate_for_recovery
(
uint32_t
space_id
)
Datafile
::
validate_for_recovery
()
{
dberr_t
err
;
...
...
@@ -433,23 +432,12 @@ Datafile::validate_for_recovery(uint32_t space_id)
}
}
const
bool
empty_tablespace
=
(
m_space_id
==
UINT32_MAX
);
if
(
empty_tablespace
&&
space_id
)
{
/* Set space id to find out whether
the page exist in double write buffer */
m_space_id
=
space_id
;
if
(
m_space_id
==
UINT32_MAX
)
{
return
DB_SUCCESS
;
/* empty file */
}
if
(
restore_from_doublewrite
())
{
if
(
!
m_defer
)
{
return
DB_CORRUPTION
;
}
if
(
!
empty_tablespace
)
{
return
err
;
}
/* InnoDB may rebuild the file from redo log */
m_space_id
=
UINT32_MAX
;
return
DB_SUCCESS
;
/* empty file */
return
m_defer
?
err
:
DB_CORRUPTION
;
}
/* Free the previously read first page and then re-validate. */
...
...
@@ -777,14 +765,10 @@ Datafile::restore_from_doublewrite()
in the doublewrite buffer, then the recovery is going to fail
now. Hence this is treated as an error. */
if
(
!
m_defer
)
{
ib
::
error
()
<<
"Corrupted page "
<<
page_id
<<
" of datafile '"
<<
m_filepath
<<
"' could not be found in the "
<<
"doublewrite buffer."
;
}
<<
"' could not be found in the doublewrite buffer."
;
return
(
true
);
}
...
...
storage/innobase/include/fsp0file.h
View file @
92a4e76a
...
...
@@ -207,10 +207,9 @@ class Datafile {
However, if the first page is corrupt and needs to be restored
from the doublewrite buffer, we will reopen it in write mode and
ry to restore that page.
@param space_id space id to validate for recovery
@retval DB_SUCCESS if tablespace is valid, DB_ERROR if not.
m_is_valid is also set true on success, else false. */
dberr_t
validate_for_recovery
(
uint32_t
space_id
=
0
)
dberr_t
validate_for_recovery
()
MY_ATTRIBUTE
((
warn_unused_result
));
/** Checks the consistency of the first page of a datafile when the
...
...
storage/innobase/log/log0recv.cc
View file @
92a4e76a
...
...
@@ -661,7 +661,14 @@ static struct
return
;
}
else
if
(
d
->
second
.
lsn
<
lsn
)
{
/* Reset the old tablespace name in recovered spaces list */
recv_spaces_t
::
iterator
it
{
recv_spaces
.
find
(
d
->
first
)};
if
(
it
!=
recv_spaces
.
end
()
&&
it
->
second
.
name
==
d
->
second
.
file_name
)
it
->
second
.
name
=
""
;
defers
.
erase
(
d
++
);
}
else
{
ut_ad
(
d
->
second
.
lsn
!=
lsn
);
...
...
@@ -675,6 +682,10 @@ static struct
p
.
first
->
second
.
lsn
=
lsn
;
p
.
first
->
second
.
file_name
=
defer
.
file_name
;
}
/* Add the newly added defered space and change the file name */
recv_spaces_t
::
iterator
it
{
recv_spaces
.
find
(
space
)};
if
(
it
!=
recv_spaces
.
end
())
it
->
second
.
name
=
defer
.
file_name
;
}
void
remove
(
uint32_t
space
)
...
...
@@ -787,6 +798,62 @@ static struct
space
->
size_in_header
=
size
;
return
space
;
}
/** Attempt to recover pages from the doublewrite buffer.
This is invoked if we found neither a valid first page in the
data file nor redo log records that would initialize the first
page. */
void
deferred_dblwr
()
{
for
(
auto
d
=
defers
.
begin
();
d
!=
defers
.
end
();
)
{
if
(
d
->
second
.
deleted
)
{
next_item:
d
++
;
continue
;
}
const
page_id_t
page_id
{
d
->
first
,
0
};
const
byte
*
page
=
recv_sys
.
dblwr
.
find_page
(
page_id
);
if
(
!
page
)
goto
next_item
;
const
uint32_t
space_id
=
mach_read_from_4
(
page
+
FIL_PAGE_SPACE_ID
);
const
uint32_t
flags
=
fsp_header_get_flags
(
page
);
const
uint32_t
page_no
=
mach_read_from_4
(
page
+
FIL_PAGE_OFFSET
);
const
uint32_t
size
=
fsp_header_get_field
(
page
,
FSP_SIZE
);
if
(
page_no
==
0
&&
space_id
==
d
->
first
&&
size
>=
4
&&
fil_space_t
::
is_valid_flags
(
flags
,
space_id
)
&&
fil_space_t
::
logical_size
(
flags
)
==
srv_page_size
)
{
recv_spaces_t
::
iterator
it
{
recv_spaces
.
find
(
d
->
first
)};
ut_ad
(
it
!=
recv_spaces
.
end
());
fil_space_t
*
space
=
create
(
it
,
d
->
second
.
file_name
.
c_str
(),
flags
,
fil_space_read_crypt_data
(
fil_space_t
::
zip_size
(
flags
),
page
),
size
);
space
->
free_limit
=
fsp_header_get_field
(
page
,
FSP_FREE_LIMIT
);
space
->
free_len
=
flst_get_len
(
FSP_HEADER_OFFSET
+
FSP_FREE
+
page
);
fil_node_t
*
node
=
UT_LIST_GET_FIRST
(
space
->
chain
);
if
(
!
space
->
acquire
())
goto
next_item
;
if
(
os_file_write
(
IORequestWrite
,
node
->
name
,
node
->
handle
,
page
,
0
,
fil_space_t
::
physical_size
(
flags
)
!=
DB_SUCCESS
))
{
space
->
release
();
goto
next_item
;
}
space
->
release
();
it
->
second
.
space
=
space
;
defers
.
erase
(
d
++
);
continue
;
}
goto
next_item
;
}
}
}
deferred_spaces
;
...
...
@@ -860,6 +927,7 @@ bool recv_sys_t::recover_deferred(recv_sys_t::map::iterator &p,
}
node
->
deferred
=
false
;
space
->
release
();
it
->
second
.
space
=
space
;
return
false
;
}
...
...
@@ -4107,6 +4175,7 @@ recv_recovery_from_checkpoint_start(lsn_t flush_lsn)
recv_sys
.
parse_start_lsn
=
checkpoint_lsn
;
if
(
srv_operation
==
SRV_OPERATION_NORMAL
)
{
deferred_spaces
.
deferred_dblwr
();
buf_dblwr
.
recover
();
}
...
...
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