Browse Source

MDEV-7878: innodb_scrub_background fails sporadically in buildbot (Failing assertion: offset > 0 && offset < UNIV_PAGE_SIZE)

Problem was that when encrypted space was flushed page 0 is
also updated but crypt data offset was sometimes not
calculated.
pull/35/merge
Jan Lindström 11 years ago
parent
commit
cbc5157feb
  1. 3
      storage/innobase/fil/fil0crypt.cc
  2. 3
      storage/xtradb/fil/fil0crypt.cc

3
storage/innobase/fil/fil0crypt.cc

@ -2033,6 +2033,9 @@ fil_crypt_flush_space(rotate_thread_t *state, ulint space)
RW_X_LATCH, NULL, BUF_GET,
__FILE__, __LINE__, &mtr);
byte* frame = buf_block_get_frame(block);
ulint maxsize = 0;
crypt_data->page0_offset =
fsp_header_get_crypt_offset(zip_size, &maxsize);
fil_space_write_crypt_data(space, frame,
crypt_data->page0_offset,
ULINT_MAX, &mtr);

3
storage/xtradb/fil/fil0crypt.cc

@ -2033,6 +2033,9 @@ fil_crypt_flush_space(rotate_thread_t *state, ulint space)
RW_X_LATCH, NULL, BUF_GET,
__FILE__, __LINE__, &mtr);
byte* frame = buf_block_get_frame(block);
ulint maxsize = 0;
crypt_data->page0_offset =
fsp_header_get_crypt_offset(zip_size, &maxsize);
fil_space_write_crypt_data(space, frame,
crypt_data->page0_offset,
ULINT_MAX, &mtr);

Loading…
Cancel
Save