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
43c85143
Commit
43c85143
authored
Jul 04, 2014
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-6288: Innodb causes server crash after disk full,
then can't ALTER TABLE any more. Fix for InnoDB storage engine.
parent
6bd2f900
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
8 deletions
+32
-8
mysql-test/suite/innodb/t/innodb-alter-table-disk-full.test
mysql-test/suite/innodb/t/innodb-alter-table-disk-full.test
+1
-1
storage/innobase/fil/fil0fil.cc
storage/innobase/fil/fil0fil.cc
+5
-2
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+26
-5
No files found.
mysql-test/suite/innodb/t/innodb-alter-table-disk-full.test
View file @
43c85143
# MDEV-6288: Innodb causes server crash after disk full, then can't ALTER TABLE any more
--
source
include
/
have_
xtra
db
.
inc
--
source
include
/
have_
inno
db
.
inc
# DEBUG_SYNC must be compiled in.
--
source
include
/
have_debug_sync
.
inc
...
...
storage/innobase/fil/fil0fil.cc
View file @
43c85143
...
...
@@ -5725,7 +5725,7 @@ fil_io(
ret
=
os_aio
(
type
,
mode
|
wake_later
,
node
->
name
,
node
->
handle
,
buf
,
offset
,
len
,
node
,
message
);
#endif
/* UNIV_HOTBACKUP */
ut_a
(
ret
);
if
(
mode
==
OS_AIO_SYNC
)
{
/* The i/o operation is already completed when we return from
...
...
@@ -5740,7 +5740,10 @@ fil_io(
ut_ad
(
fil_validate_skip
());
}
return
(
DB_SUCCESS
);
if
(
!
ret
)
{
return
(
DB_OUT_OF_FILE_SPACE
);
}
else
{
}
return
(
DB_SUCCESS
);
}
#ifndef UNIV_HOTBACKUP
...
...
storage/innobase/os/os0file.cc
View file @
43c85143
...
...
@@ -4571,11 +4571,16 @@ os_aio_func(
wake_later
=
mode
&
OS_AIO_SIMULATED_WAKE_LATER
;
mode
=
mode
&
(
~
OS_AIO_SIMULATED_WAKE_LATER
);
DBUG_EXECUTE_IF
(
"ib_os_aio_func_io_failure_28"
,
mode
=
OS_AIO_SYNC
;);
if
(
mode
==
OS_AIO_SYNC
#ifdef WIN_ASYNC_IO
&&
!
srv_use_native_aio
#endif
/* WIN_ASYNC_IO */
)
{
ibool
ret
;
/* This is actually an ordinary synchronous read or write:
no need to use an i/o-handler thread. NOTE that if we use
Windows async i/o, Windows does not allow us to use
...
...
@@ -4590,13 +4595,23 @@ os_aio_func(
and os_file_write_func() */
if
(
type
==
OS_FILE_READ
)
{
ret
urn
(
os_file_read_func
(
file
,
buf
,
offset
,
n
)
);
}
ret
=
os_file_read_func
(
file
,
buf
,
offset
,
n
);
}
else
{
ut_ad
(
!
srv_read_only_mode
);
ut_a
(
type
==
OS_FILE_WRITE
);
return
(
os_file_write_func
(
name
,
file
,
buf
,
offset
,
n
));
ret
=
os_file_write_func
(
name
,
file
,
buf
,
offset
,
n
);
}
DBUG_EXECUTE_IF
(
"ib_os_aio_func_io_failure_28"
,
os_has_said_disk_full
=
FALSE
;);
DBUG_EXECUTE_IF
(
"ib_os_aio_func_io_failure_28"
,
ret
=
0
;);
DBUG_EXECUTE_IF
(
"ib_os_aio_func_io_failure_28"
,
errno
=
28
;);
return
ret
;
}
try_again:
...
...
@@ -5421,7 +5436,13 @@ consecutive_loop:
aio_slot
->
offset
,
total_len
);
}
ut_a
(
ret
);
DBUG_EXECUTE_IF
(
"ib_os_aio_func_io_failure_28_2"
,
os_has_said_disk_full
=
FALSE
;);
DBUG_EXECUTE_IF
(
"ib_os_aio_func_io_failure_28_2"
,
ret
=
0
;);
DBUG_EXECUTE_IF
(
"ib_os_aio_func_io_failure_28_2"
,
errno
=
28
;);
srv_set_io_thread_op_info
(
global_segment
,
"file i/o done"
);
if
(
aio_slot
->
type
==
OS_FILE_READ
&&
n_consecutive
>
1
)
{
...
...
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