1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-25919 fixup: MSAN and Valgrind errors related to statistics

Browse Source 
dict_table_close(): Fix a race condition around dict_stats_deinit().
This was not observed; it should have been caught by an assertion.

dict_stats_deinit(): Slightly simplify the code.

ha_innobase::info_low(): If the table is unreadable,
initialize some dummy statistics.
This commit is contained in:
Marko Mäkelä 2021-09-04 19:08:14 +03:00
parent c4ebfe22f9
commit 5ae5453291
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storage/innobase/dict/dict0dict.cc
View File

@ -225,7 +225,8 @@ void dict_table_close(dict_table_t *table)
if (table->release())
{
table->stats_mutex_lock();
dict_stats_deinit(table);
if (table->get_ref_count() == 0)
dict_stats_deinit(table);
table->stats_mutex_unlock();
}
dict_sys.unlock();
@ -258,7 +259,8 @@ dict_table_close(
that FLUSH TABLE can be used to forcibly fetch stats from disk if
they have been manually modified. */
table->stats_mutex_lock();
dict_stats_deinit(table);
if (table->get_ref_count() == 0)
dict_stats_deinit(table);
table->stats_mutex_unlock();
}

5
storage/innobase/handler/ha_innodb.cc
View File

@ -14532,7 +14532,12 @@ ha_innobase::info_low(
DBUG_ASSERT(ib_table->get_ref_count() > 0);
if (!ib_table->is_readable()) {
ib_table->stats_mutex_lock();
ib_table->stat_initialized = true;
ib_table->stat_n_rows = 0;
ib_table->stat_clustered_index_size = 0;
ib_table->stat_sum_of_other_index_sizes = 0;
ib_table->stats_mutex_unlock();
}
if (flag & HA_STATUS_TIME) {

8
storage/innobase/include/dict0stats.ic
View File

@ -175,16 +175,13 @@ dict_stats_deinit(
dict_table_t* table) /*!< in/out: table */
{
ut_ad(table->stats_mutex_is_owner());
ut_ad(table->get_ref_count() == 0);
ut_a(table->get_ref_count() == 0);
#ifdef HAVE_valgrind
if (!table->stat_initialized) {
return;
}
table->stat_initialized = FALSE;
#ifdef HAVE_valgrind
MEM_UNDEFINED(&table->stat_n_rows, sizeof table->stat_n_rows);
MEM_UNDEFINED(&table->stat_clustered_index_size,
sizeof table->stat_clustered_index_size);
@ -218,4 +215,5 @@ dict_stats_deinit(
sizeof(index->stat_n_leaf_pages));
}
#endif /* HAVE_valgrind */
table->stat_initialized = FALSE;
}