Skip to content

M
mariadb
Commit 971c30b1 authored by Barry Perlman's avatar Barry Perlman Committed by Yoni Fogel
Browse files
Options

[t:4326] [t:4234] [t:4326] [t:4355] [t:4362] Merged changesets 38452, 38473,... 

[t:4326] [t:4234] [t:4326] [t:4355] [t:4362] Merged changesets 38452, 38473, 38514, 38473, 38452 from 5.2.3 handlerton to main.  These changesets should have been on main in the first place but were accidentally committed to 5.2.3 instead.  Merge commands were:
{{{
svn merge -c38452 mysql.branches/5.2.3/mysql/tokudb-engine/tokudb-engine mysql/tokudb-engine/tokudb-engine
svn merge -c38473 mysql.branches/5.2.3/mysql/tokudb-engine/tokudb-engine mysql/tokudb-engine/tokudb-engine
svn merge -c38514 mysql.branches/5.2.3/mysql/tokudb-engine/tokudb-engine mysql/tokudb-engine/tokudb-engine
svn merge -c38529 mysql.branches/5.2.3/mysql/tokudb-engine/tokudb-engine mysql/tokudb-engine/tokudb-engine
svn merge -c38545 mysql.branches/5.2.3/mysql/tokudb-engine/tokudb-engine mysql/tokudb-engine/tokudb-engine
}}}

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@38562 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7b87cf71
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 15 deletions
storage/tokudb/hatoku_hton.cc
View file @ 971c30b1
...@@ -1206,6 +1206,23 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1206,6 +1206,23 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
STATPRINT("checkpoints taken ", buf); STATPRINT("checkpoints taken ", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_count_fail); snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_count_fail);
STATPRINT("checkpoints failed", buf); STATPRINT("checkpoints failed", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_waiters_now);
STATPRINT("checkpoint waiters now", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_waiters_max);
STATPRINT("checkpoint waiters max", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_client_wait_on_mo);
STATPRINT("checkpoint client wait on mo lock", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_client_wait_on_cs);
STATPRINT("checkpoint client wait on cs lock", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_wait_sched);
STATPRINT("checkpoint wait sched", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_wait_client);
STATPRINT("checkpoint wait client", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_wait_txn);
STATPRINT("checkpoint wait txn", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.checkpoint_wait_other);
STATPRINT("checkpoint wait other", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cleaner_period); snprintf(buf, bufsiz, "%" PRIu64, engstat.cleaner_period);
STATPRINT("cleaner period", buf); STATPRINT("cleaner period", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cleaner_iterations); snprintf(buf, bufsiz, "%" PRIu64, engstat.cleaner_iterations);
...@@ -1401,7 +1418,6 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1401,7 +1418,6 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
snprintf(buf, bufsiz, "%.6f", tokutime_to_seconds(engstat.total_time_since_start)); snprintf(buf, bufsiz, "%.6f", tokutime_to_seconds(engstat.total_time_since_start));
STATPRINT("total_time_since_start", buf); STATPRINT("total_time_since_start", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_lock_taken); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_lock_taken);
STATPRINT("cachetable lock taken", buf); STATPRINT("cachetable lock taken", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_lock_released); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_lock_released);
...@@ -1412,14 +1428,18 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1412,14 +1428,18 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
STATPRINT("cachetable miss", buf); STATPRINT("cachetable miss", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_misstime); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_misstime);
STATPRINT("cachetable misstime", buf); STATPRINT("cachetable misstime", buf);
#if 0
// restore display when this is fixed
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_waittime); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_waittime);
STATPRINT("cachetable waittime", buf); STATPRINT("cachetable waittime", buf);
#endif
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_wait_reading); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_wait_reading);
STATPRINT("cachetable wait reading", buf); STATPRINT("cachetable wait reading", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_wait_writing); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_wait_writing);
STATPRINT("cachetable wait writing", buf); STATPRINT("cachetable wait writing", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_wait_checkpoint); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_wait_checkpoint);
STATPRINT("cachetable wait checkpoint", buf); STATPRINT("cachetable wait checkpoint", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.puts); snprintf(buf, bufsiz, "%" PRIu64, engstat.puts);
STATPRINT("cachetable puts (new nodes)", buf); STATPRINT("cachetable puts (new nodes)", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.prefetches); snprintf(buf, bufsiz, "%" PRIu64, engstat.prefetches);
...@@ -1428,30 +1448,25 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1428,30 +1448,25 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
STATPRINT("cachetable maybe_get_and_pins", buf); STATPRINT("cachetable maybe_get_and_pins", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.maybe_get_and_pin_hits); snprintf(buf, bufsiz, "%" PRIu64, engstat.maybe_get_and_pin_hits);
STATPRINT("cachetable maybe_get_and_pin_hits", buf); STATPRINT("cachetable maybe_get_and_pin_hits", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_evictions);
STATPRINT("cachetable evictions", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_current); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_current);
STATPRINT("cachetable size_current", buf); STATPRINT("cachetable size_current", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_limit); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_limit);
STATPRINT("cachetable size_limit", buf); STATPRINT("cachetable size_limit", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_max); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_max);
STATPRINT("cachetable size_max", buf); STATPRINT("cachetable size_max", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_leaf); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_writing);
STATPRINT("cachetable size_leaf", buf); STATPRINT("cachetable size_writing", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_nonleaf); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_nonleaf);
STATPRINT("cachetable size_nonleaf", buf); STATPRINT("cachetable size_nonleaf", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_leaf);
STATPRINT("cachetable size_leaf", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_rollback); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_rollback);
STATPRINT("cachetable size_rollback", buf); STATPRINT("cachetable size_rollback", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_writing); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_size_cachepressure);
STATPRINT("cachetable size_writing", buf); STATPRINT("cachetable size_cachepressure", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.get_and_pin_footprint); snprintf(buf, bufsiz, "%" PRIu64, engstat.cachetable_evictions);
STATPRINT("cachetable get_and_pin_footprint", buf); STATPRINT("cachetable evictions", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.local_checkpoint); // cleaner_executions displayed with other cleaner thread info
STATPRINT("local checkpoint", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.local_checkpoint_files);
STATPRINT("local checkpoint files", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.local_checkpoint_during_checkpoint);
STATPRINT("local checkpoint during checkpoint", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.range_locks_max); snprintf(buf, bufsiz, "%" PRIu64, engstat.range_locks_max);
STATPRINT("max range locks", buf); STATPRINT("max range locks", buf);
...@@ -1556,6 +1571,8 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1556,6 +1571,8 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
snprintf(buf, bufsiz, "%" PRIu64, engstat.indexer_max); snprintf(buf, bufsiz, "%" PRIu64, engstat.indexer_max);
STATPRINT("indexer max", buf); STATPRINT("indexer max", buf);
#if 0
// Restore these when we support upgrade again
snprintf(buf, bufsiz, "%" PRIu64, engstat.upgrade_env_status); snprintf(buf, bufsiz, "%" PRIu64, engstat.upgrade_env_status);
STATPRINT("upgrade env status", buf); STATPRINT("upgrade env status", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.upgrade_header); snprintf(buf, bufsiz, "%" PRIu64, engstat.upgrade_header);
...@@ -1574,6 +1591,7 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1574,6 +1591,7 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
snprintf(buf, bufsiz, "%" PRIu64, engstat.last_lsn_v13); snprintf(buf, bufsiz, "%" PRIu64, engstat.last_lsn_v13);
STATPRINT("last LSN of version 13", buf); STATPRINT("last LSN of version 13", buf);
STATPRINT("time of upgrade to version 14", engstat.upgrade_v14_time); STATPRINT("time of upgrade to version 14", engstat.upgrade_v14_time);
#endif
snprintf(buf, bufsiz, "%" PRIu64, engstat.malloc_count); snprintf(buf, bufsiz, "%" PRIu64, engstat.malloc_count);
STATPRINT("malloc count", buf); STATPRINT("malloc count", buf);
...@@ -1593,6 +1611,8 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -1593,6 +1611,8 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
STATPRINT("mem freed", buf); STATPRINT("mem freed", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.max_mem_in_use); snprintf(buf, bufsiz, "%" PRIu64, engstat.max_mem_in_use);
STATPRINT("max mem in use", buf); STATPRINT("max mem in use", buf);
snprintf(buf, bufsiz, "%" PRIu64, engstat.malloc_mmap_threshold);
STATPRINT("malloc mmap threshold", buf);
snprintf(buf, bufsiz, "%s", engstat.mallocator_version); snprintf(buf, bufsiz, "%s", engstat.mallocator_version);
STATPRINT("mallocator version", buf); STATPRINT("mallocator version", buf);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7