Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
a788c373
Commit
a788c373
authored
Feb 07, 2020
by
antirez
Browse files
Tracking: minor change of names and new INFO field.
parent
df838927
Changes
4
Show whitespace changes
Inline
Side-by-side
src/config.c
View file @
a788c373
...
@@ -2160,7 +2160,7 @@ standardConfig configs[] = {
...
@@ -2160,7 +2160,7 @@ standardConfig configs[] = {
createIntConfig("list-compress-depth", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.list_compress_depth, 0, INTEGER_CONFIG, NULL, NULL),
createIntConfig("list-compress-depth", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.list_compress_depth, 0, INTEGER_CONFIG, NULL, NULL),
createIntConfig("rdb-key-save-delay", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.rdb_key_save_delay, 0, INTEGER_CONFIG, NULL, NULL),
createIntConfig("rdb-key-save-delay", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.rdb_key_save_delay, 0, INTEGER_CONFIG, NULL, NULL),
createIntConfig("key-load-delay", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.key_load_delay, 0, INTEGER_CONFIG, NULL, NULL),
createIntConfig("key-load-delay", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.key_load_delay, 0, INTEGER_CONFIG, NULL, NULL),
createIntConfig
(
"tracking-table-max-fill"
,
NULL
,
MODIFIABLE_CONFIG
,
0
,
100
,
server
.
tracking_table_max_
fill
,
1
0
,
INTEGER_CONFIG
,
NULL
,
NULL
),
/* Default: 10% tracking table max
fill
. */
createIntConfig("tracking-table-max-fill", NULL, MODIFIABLE_CONFIG, 0, 100, server.tracking_table_max_
keys, 100000
0, INTEGER_CONFIG, NULL, NULL), /* Default: 10% tracking table max
number of keys tracked
. */
createIntConfig("active-expire-effort", NULL, MODIFIABLE_CONFIG, 1, 10, server.active_expire_effort, 1, INTEGER_CONFIG, NULL, NULL), /* From 1 to 10. */
createIntConfig("active-expire-effort", NULL, MODIFIABLE_CONFIG, 1, 10, server.active_expire_effort, 1, INTEGER_CONFIG, NULL, NULL), /* From 1 to 10. */
createIntConfig("hz", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.config_hz, CONFIG_DEFAULT_HZ, INTEGER_CONFIG, NULL, updateHZ),
createIntConfig("hz", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.config_hz, CONFIG_DEFAULT_HZ, INTEGER_CONFIG, NULL, updateHZ),
createIntConfig("min-replicas-to-write", "min-slaves-to-write", MODIFIABLE_CONFIG, 0, INT_MAX, server.repl_min_slaves_to_write, 0, INTEGER_CONFIG, NULL, updateGoodSlaves),
createIntConfig("min-replicas-to-write", "min-slaves-to-write", MODIFIABLE_CONFIG, 0, INT_MAX, server.repl_min_slaves_to_write, 0, INTEGER_CONFIG, NULL, updateGoodSlaves),
...
...
src/server.c
View file @
a788c373
...
@@ -4221,6 +4221,7 @@ sds genRedisInfoString(const char *section) {
...
@@ -4221,6 +4221,7 @@ sds genRedisInfoString(const char *section) {
"active_defrag_misses:%lld\r\n"
"active_defrag_misses:%lld\r\n"
"active_defrag_key_hits:%lld\r\n"
"active_defrag_key_hits:%lld\r\n"
"active_defrag_key_misses:%lld\r\n"
"active_defrag_key_misses:%lld\r\n"
"tracking_total_keys:%lld\r\n"
"tracking_total_items:%lld\r\n",
"tracking_total_items:%lld\r\n",
server.stat_numconnections,
server.stat_numconnections,
server.stat_numcommands,
server.stat_numcommands,
...
@@ -4249,6 +4250,7 @@ sds genRedisInfoString(const char *section) {
...
@@ -4249,6 +4250,7 @@ sds genRedisInfoString(const char *section) {
server.stat_active_defrag_misses,
server.stat_active_defrag_misses,
server.stat_active_defrag_key_hits,
server.stat_active_defrag_key_hits,
server.stat_active_defrag_key_misses,
server.stat_active_defrag_key_misses,
(unsigned long long) trackingGetTotalKeys(),
(unsigned long long) trackingGetTotalItems());
(unsigned long long) trackingGetTotalItems());
}
}
...
...
src/server.h
View file @
a788c373
...
@@ -1306,7 +1306,7 @@ struct redisServer {
...
@@ -1306,7 +1306,7 @@ struct redisServer {
list
*
ready_keys
;
/* List of readyList structures for BLPOP & co */
list
*
ready_keys
;
/* List of readyList structures for BLPOP & co */
/* Client side caching. */
/* Client side caching. */
unsigned
int
tracking_clients
;
/* # of clients with tracking enabled.*/
unsigned
int
tracking_clients
;
/* # of clients with tracking enabled.*/
int
tracking_table_max_
fill
;
/* Max
fill percentag
e. */
int
tracking_table_max_
keys
;
/* Max
number of keys in tracking tabl
e. */
/* Sort parameters - qsort_r() is only available under BSD so we
/* Sort parameters - qsort_r() is only available under BSD so we
* have to take this state global, in order to pass it to sortCompare() */
* have to take this state global, in order to pass it to sortCompare() */
int
sort_desc
;
int
sort_desc
;
...
@@ -1655,6 +1655,7 @@ void trackingInvalidateKey(robj *keyobj);
...
@@ -1655,6 +1655,7 @@ void trackingInvalidateKey(robj *keyobj);
void
trackingInvalidateKeysOnFlush
(
int
dbid
);
void
trackingInvalidateKeysOnFlush
(
int
dbid
);
void
trackingLimitUsedSlots
(
void
);
void
trackingLimitUsedSlots
(
void
);
uint64_t
trackingGetTotalItems
(
void
);
uint64_t
trackingGetTotalItems
(
void
);
uint64_t
trackingGetTotalKeys
(
void
);
/* List data type */
/* List data type */
void
listTypeTryConversion
(
robj
*
subject
,
robj
*
value
);
void
listTypeTryConversion
(
robj
*
subject
,
robj
*
value
);
...
...
src/tracking.c
View file @
a788c373
...
@@ -223,8 +223,8 @@ void trackingInvalidateKeysOnFlush(int dbid) {
...
@@ -223,8 +223,8 @@ void trackingInvalidateKeysOnFlush(int dbid) {
void
trackingLimitUsedSlots
(
void
)
{
void
trackingLimitUsedSlots
(
void
)
{
static
unsigned
int
timeout_counter
=
0
;
static
unsigned
int
timeout_counter
=
0
;
if
(
TrackingTable
==
NULL
)
return
;
if
(
TrackingTable
==
NULL
)
return
;
if
(
server
.
tracking_table_max_
fill
==
0
)
return
;
/* No limits set. */
if
(
server
.
tracking_table_max_
keys
==
0
)
return
;
/* No limits set. */
size_t
max_keys
=
server
.
tracking_table_max_
fill
;
size_t
max_keys
=
server
.
tracking_table_max_
keys
;
if
(
raxSize
(
TrackingTable
)
<=
max_keys
)
{
if
(
raxSize
(
TrackingTable
)
<=
max_keys
)
{
timeout_counter
=
0
;
timeout_counter
=
0
;
return
;
/* Limit not reached. */
return
;
/* Limit not reached. */
...
@@ -264,3 +264,7 @@ void trackingLimitUsedSlots(void) {
...
@@ -264,3 +264,7 @@ void trackingLimitUsedSlots(void) {
uint64_t
trackingGetTotalItems
(
void
)
{
uint64_t
trackingGetTotalItems
(
void
)
{
return
TrackingTableTotalItems
;
return
TrackingTableTotalItems
;
}
}
uint64_t
trackingGetTotalKeys
(
void
)
{
return
raxSize
(
TrackingTable
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment