Commit 40244b10 authored by Oran Agra's avatar Oran Agra Committed by antirez
Browse files

fix #5580, display fragmentation and rss overhead bytes as signed

these metrics become negative when RSS is smaller than the used_memory.
This can easily happen when the program allocated a lot of memory and haven't
written to it yet, in which case the kernel doesn't allocate any pages to the process
parent beab3151
...@@ -3243,11 +3243,11 @@ sds genRedisInfoString(char *section) { ...@@ -3243,11 +3243,11 @@ sds genRedisInfoString(char *section) {
"allocator_frag_ratio:%.2f\r\n" "allocator_frag_ratio:%.2f\r\n"
"allocator_frag_bytes:%zu\r\n" "allocator_frag_bytes:%zu\r\n"
"allocator_rss_ratio:%.2f\r\n" "allocator_rss_ratio:%.2f\r\n"
"allocator_rss_bytes:%zu\r\n" "allocator_rss_bytes:%zd\r\n"
"rss_overhead_ratio:%.2f\r\n" "rss_overhead_ratio:%.2f\r\n"
"rss_overhead_bytes:%zu\r\n" "rss_overhead_bytes:%zd\r\n"
"mem_fragmentation_ratio:%.2f\r\n" "mem_fragmentation_ratio:%.2f\r\n"
"mem_fragmentation_bytes:%zu\r\n" "mem_fragmentation_bytes:%zd\r\n"
"mem_not_counted_for_evict:%zu\r\n" "mem_not_counted_for_evict:%zu\r\n"
"mem_replication_backlog:%zu\r\n" "mem_replication_backlog:%zu\r\n"
"mem_clients_slaves:%zu\r\n" "mem_clients_slaves:%zu\r\n"
......
...@@ -864,11 +864,11 @@ struct redisMemOverhead { ...@@ -864,11 +864,11 @@ struct redisMemOverhead {
float dataset_perc; float dataset_perc;
float peak_perc; float peak_perc;
float total_frag; float total_frag;
size_t total_frag_bytes; ssize_t total_frag_bytes;
float allocator_frag; float allocator_frag;
size_t allocator_frag_bytes; ssize_t allocator_frag_bytes;
float allocator_rss; float allocator_rss;
size_t allocator_rss_bytes; ssize_t allocator_rss_bytes;
float rss_extra; float rss_extra;
size_t rss_extra_bytes; size_t rss_extra_bytes;
size_t num_dbs; size_t num_dbs;
......
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