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
7bf45bec
Commit
7bf45bec
authored
Jul 24, 2014
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix too agressive long semaphore wait output and add guard against introducing
compression failures on insert buffer.
parent
06655a19
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
83 additions
and
42 deletions
+83
-42
mysql-test/include/mtr_warnings.sql
mysql-test/include/mtr_warnings.sql
+1
-0
storage/innobase/page/page0zip.c
storage/innobase/page/page0zip.c
+1
-0
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0arr.c
+40
-21
storage/xtradb/page/page0zip.c
storage/xtradb/page/page0zip.c
+1
-0
storage/xtradb/sync/sync0arr.c
storage/xtradb/sync/sync0arr.c
+40
-21
No files found.
mysql-test/include/mtr_warnings.sql
View file @
7bf45bec
...
@@ -159,6 +159,7 @@ INSERT INTO global_suppressions VALUES
...
@@ -159,6 +159,7 @@ INSERT INTO global_suppressions VALUES
(
"InnoDB: Error: in ALTER TABLE `test`.`t[123]`"
),
(
"InnoDB: Error: in ALTER TABLE `test`.`t[123]`"
),
(
"InnoDB: Error: in RENAME TABLE table `test`.`t1`"
),
(
"InnoDB: Error: in RENAME TABLE table `test`.`t1`"
),
(
"InnoDB: Error: table `test`.`t[123]` .*does not exist in the InnoDB internal"
),
(
"InnoDB: Error: table `test`.`t[123]` .*does not exist in the InnoDB internal"
),
(
"InnoDB: Warning: semaphore wait:"
),
/*
/*
BUG#32080 - Excessive warnings on Solaris: setrlimit could not
BUG#32080 - Excessive warnings on Solaris: setrlimit could not
...
...
storage/innobase/page/page0zip.c
View file @
7bf45bec
...
@@ -1272,6 +1272,7 @@ page_zip_compress(
...
@@ -1272,6 +1272,7 @@ page_zip_compress(
records. */
records. */
if
(
srv_simulate_comp_failures
if
(
srv_simulate_comp_failures
&&
!
dict_index_is_ibuf
(
index
)
&&
page_get_n_recs
(
page
)
>=
2
&&
page_get_n_recs
(
page
)
>=
2
&&
((
ulint
)(
rand
()
%
100
)
<
srv_simulate_comp_failures
))
{
&&
((
ulint
)(
rand
()
%
100
)
<
srv_simulate_comp_failures
))
{
...
...
storage/innobase/sync/sync0arr.c
View file @
7bf45bec
...
@@ -971,11 +971,39 @@ sync_array_print_long_waits(
...
@@ -971,11 +971,39 @@ sync_array_print_long_waits(
stderr
);
stderr
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
noticed
=
TRUE
;
noticed
=
TRUE
;
}
else
{
}
if
(
diff
>
fatal_timeout
)
{
fatal
=
TRUE
;
}
if
(
diff
>
longest_diff
)
{
longest_diff
=
diff
;
*
sema
=
wait_object
;
*
waiter
=
cell
->
thread
;
}
}
/* We found a long semaphore wait, wait all threads that are
waiting for a semaphore. */
if
(
noticed
)
{
for
(
i
=
0
;
i
<
sync_primary_wait_array
->
n_cells
;
i
++
)
{
void
*
wait_object
;
os_thread_id_t
reserver
=
0
;
cell
=
sync_array_get_nth_cell
(
sync_primary_wait_array
,
i
);
wait_object
=
cell
->
wait_object
;
if
(
wait_object
==
NULL
||
!
cell
->
waiting
)
{
continue
;
}
fputs
(
"InnoDB: Warning: semaphore wait:
\n
"
,
fputs
(
"InnoDB: Warning: semaphore wait:
\n
"
,
stderr
);
stderr
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
}
noticed
=
TRUE
;
/* Try to output cell information for writer recursive way */
/* Try to output cell information for writer recursive way */
while
(
reserver
!=
0
)
{
while
(
reserver
!=
0
)
{
...
@@ -993,15 +1021,6 @@ sync_array_print_long_waits(
...
@@ -993,15 +1021,6 @@ sync_array_print_long_waits(
reserver
=
0
;
reserver
=
0
;
}
}
}
}
if
(
diff
>
fatal_timeout
)
{
fatal
=
TRUE
;
}
if
(
diff
>
longest_diff
)
{
longest_diff
=
diff
;
*
sema
=
wait_object
;
*
waiter
=
cell
->
thread
;
}
}
}
}
...
...
storage/xtradb/page/page0zip.c
View file @
7bf45bec
...
@@ -1276,6 +1276,7 @@ page_zip_compress(
...
@@ -1276,6 +1276,7 @@ page_zip_compress(
records. */
records. */
if
(
srv_simulate_comp_failures
if
(
srv_simulate_comp_failures
&&
!
dict_index_is_ibuf
(
index
)
&&
page_get_n_recs
(
page
)
>=
2
&&
page_get_n_recs
(
page
)
>=
2
&&
((
ulint
)(
rand
()
%
100
)
<
srv_simulate_comp_failures
))
{
&&
((
ulint
)(
rand
()
%
100
)
<
srv_simulate_comp_failures
))
{
...
...
storage/xtradb/sync/sync0arr.c
View file @
7bf45bec
...
@@ -995,11 +995,39 @@ sync_array_print_long_waits(
...
@@ -995,11 +995,39 @@ sync_array_print_long_waits(
stderr
);
stderr
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
noticed
=
TRUE
;
noticed
=
TRUE
;
}
else
{
}
if
(
diff
>
fatal_timeout
)
{
fatal
=
TRUE
;
}
if
(
diff
>
longest_diff
)
{
longest_diff
=
diff
;
*
sema
=
wait_object
;
*
waiter
=
cell
->
thread
;
}
}
/* We found a long semaphore wait, wait all threads that are
waiting for a semaphore. */
if
(
noticed
)
{
for
(
i
=
0
;
i
<
sync_primary_wait_array
->
n_cells
;
i
++
)
{
void
*
wait_object
;
os_thread_id_t
reserver
=
0
;
cell
=
sync_array_get_nth_cell
(
sync_primary_wait_array
,
i
);
wait_object
=
cell
->
wait_object
;
if
(
wait_object
==
NULL
||
!
cell
->
waiting
)
{
continue
;
}
fputs
(
"InnoDB: Warning: semaphore wait:
\n
"
,
fputs
(
"InnoDB: Warning: semaphore wait:
\n
"
,
stderr
);
stderr
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
sync_array_cell_print
(
stderr
,
cell
,
&
reserver
);
}
noticed
=
TRUE
;
/* Try to output cell information for writer recursive way */
/* Try to output cell information for writer recursive way */
while
(
reserver
!=
0
)
{
while
(
reserver
!=
0
)
{
...
@@ -1017,15 +1045,6 @@ sync_array_print_long_waits(
...
@@ -1017,15 +1045,6 @@ sync_array_print_long_waits(
reserver
=
0
;
reserver
=
0
;
}
}
}
}
if
(
diff
>
fatal_timeout
)
{
fatal
=
TRUE
;
}
if
(
diff
>
longest_diff
)
{
longest_diff
=
diff
;
*
sema
=
wait_object
;
*
waiter
=
cell
->
thread
;
}
}
}
}
...
...
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