Skip to content

Commit

Permalink
Fix XtraBackup confusion between ulong and double
Browse files Browse the repository at this point in the history
Summary:
In InnoDB srv_max_buf_pool_modified_pct is a double. But the
XtraBackup param initialization code was setting it as a ulong,
resulting in the variable being set to 0 instead of the default
of 50.0. Remove it as an option and let XtraBackup just use the
default value so that we stop getting asserts from buf0flu.cc
about it and srv_max_dirty_pages_pct_lwm.

Test Plan:
./mtr --parallel=auto --suite=xtrabackup and examine logs for the
values of the variables I now print out.
Jenkins
MySQL RPM tests

Reviewers: pengt, tianx, santoshb

Reviewed By: santoshb
  • Loading branch information
jtolmer committed Jan 5, 2016
1 parent 9d97282 commit f81189c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions xtrabackup/src/xtrabackup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,6 @@ enum options_xtrabackup
OPT_INNODB_LOG_ARCH_DIR,
OPT_INNODB_LOG_ARCHIVE,
OPT_INNODB_LOG_GROUP_HOME_DIR,
OPT_INNODB_MAX_DIRTY_PAGES_PCT,
OPT_INNODB_MAX_PURGE_LAG,
OPT_INNODB_ROLLBACK_ON_TIMEOUT,
OPT_INNODB_STATUS_FILE,
Expand Down Expand Up @@ -866,9 +865,6 @@ Disable with --skip-innodb-doublewrite.", (G_PTR*) &innobase_use_doublewrite,
"Path to InnoDB log files.", (G_PTR*) &INNODB_LOG_DIR,
(G_PTR*) &INNODB_LOG_DIR, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0,
0, 0},
{"innodb_max_dirty_pages_pct", OPT_INNODB_MAX_DIRTY_PAGES_PCT,
"Percentage of dirty pages allowed in bufferpool.", (G_PTR*) &srv_max_buf_pool_modified_pct,
(G_PTR*) &srv_max_buf_pool_modified_pct, 0, GET_ULONG, REQUIRED_ARG, 90, 0, 100, 0, 0, 0},
/*
{"innodb_max_purge_lag", OPT_INNODB_MAX_PURGE_LAG,
"Desired maximum length of the purge queue (0 = no limit)",
Expand Down Expand Up @@ -1515,6 +1511,10 @@ innodb_init_param(void)
srv_use_native_aio = FALSE;

#endif
msg("InnoDB: srv_max_dirty_pages_pct_lwm = %f\n",
srv_max_dirty_pages_pct_lwm);
msg("InnoDB: srv_max_buf_pool_modified_pct = %f\n",
srv_max_buf_pool_modified_pct);

return(FALSE);

Expand Down

0 comments on commit f81189c

Please sign in to comment.