gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add total_forks to INFO STATS (#8155)

Browse Source
This commit is contained in:
Wang Yuan 2020-12-13 16:01:18 +08:00 committed by GitHub
parent 63c1303cfb
commit e3ff414513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server.c
View File

@ -2925,6 +2925,7 @@ void resetServerStats(void) {
server.stat_active_defrag_scanned = 0; server.stat_active_defrag_scanned = 0;
server.stat_fork_time = 0; server.stat_fork_time = 0;
server.stat_fork_rate = 0; server.stat_fork_rate = 0;
server.stat_total_forks = 0;
server.stat_rejected_conn = 0; server.stat_rejected_conn = 0;
server.stat_sync_full = 0; server.stat_sync_full = 0;
server.stat_sync_partial_ok = 0; server.stat_sync_partial_ok = 0;
@ -4654,6 +4655,7 @@ sds genRedisInfoString(const char *section) {
"pubsub_channels:%ld\r\n" "pubsub_channels:%ld\r\n"
"pubsub_patterns:%lu\r\n" "pubsub_patterns:%lu\r\n"
"latest_fork_usec:%lld\r\n" "latest_fork_usec:%lld\r\n"
"total_forks:%lld\r\n"
"migrate_cached_sockets:%ld\r\n" "migrate_cached_sockets:%ld\r\n"
"slave_expires_tracked_keys:%zu\r\n" "slave_expires_tracked_keys:%zu\r\n"
"active_defrag_hits:%lld\r\n" "active_defrag_hits:%lld\r\n"
@ -4690,6 +4692,7 @@ sds genRedisInfoString(const char *section) {
dictSize(server.pubsub_channels), dictSize(server.pubsub_channels),
listLength(server.pubsub_patterns), listLength(server.pubsub_patterns),
server.stat_fork_time, server.stat_fork_time,
server.stat_total_forks,
dictSize(server.migrate_cached_sockets), dictSize(server.migrate_cached_sockets),
getSlaveKeyWithExpireCount(), getSlaveKeyWithExpireCount(),
server.stat_active_defrag_hits, server.stat_active_defrag_hits,
@ -5188,6 +5191,7 @@ int redisFork(int purpose) {
closeClildUnusedResourceAfterFork(); closeClildUnusedResourceAfterFork();
} else { } else {
/* Parent */ /* Parent */
server.stat_total_forks++;
server.stat_fork_time = ustime()-start; server.stat_fork_time = ustime()-start;
server.stat_fork_rate = (double) zmalloc_used_memory() * 1000000 / server.stat_fork_time / (1024*1024*1024); /* GB per second. */ server.stat_fork_rate = (double) zmalloc_used_memory() * 1000000 / server.stat_fork_time / (1024*1024*1024); /* GB per second. */
latencyAddSampleIfNeeded("fork",server.stat_fork_time/1000); latencyAddSampleIfNeeded("fork",server.stat_fork_time/1000);

1
src/server.h
View File

@ -1215,6 +1215,7 @@ struct redisServer {
size_t stat_peak_memory; /* Max used memory record */ size_t stat_peak_memory; /* Max used memory record */
long long stat_fork_time; /* Time needed to perform latest fork() */ long long stat_fork_time; /* Time needed to perform latest fork() */
double stat_fork_rate; /* Fork rate in GB/sec. */ double stat_fork_rate; /* Fork rate in GB/sec. */
long long stat_total_forks; /* Total count of fork. */
long long stat_rejected_conn; /* Clients rejected because of maxclients */ long long stat_rejected_conn; /* Clients rejected because of maxclients */
long long stat_sync_full; /* Number of full resyncs with slaves. */ long long stat_sync_full; /* Number of full resyncs with slaves. */
long long stat_sync_partial_ok; /* Number of accepted PSYNC requests. */ long long stat_sync_partial_ok; /* Number of accepted PSYNC requests. */