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
22e9321c
Unverified
Commit
22e9321c
authored
Jul 18, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Jul 18, 2018
Browse files
Merge pull request #5138 from oranagra/improve_defrag_test
make active defrag test more stable
parents
8213f64d
f89c93c8
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/defrag.c
View file @
22e9321c
...
...
@@ -867,9 +867,8 @@ void defragDictBucketCallback(void *privdata, dictEntry **bucketref) {
* or not, a false detection can cause the defragmenter to waste a lot of CPU
* without the possibility of getting any results. */
float
getAllocatorFragmentation
(
size_t
*
out_frag_bytes
)
{
size_t
resident
=
server
.
cron_malloc_stats
.
allocator_resident
;
size_t
active
=
server
.
cron_malloc_stats
.
allocator_active
;
size_t
allocated
=
server
.
cron_malloc_stats
.
allocator_allocated
;
size_t
resident
,
active
,
allocated
;
zmalloc_get_allocator_info
(
&
allocated
,
&
active
,
&
resident
);
float
frag_pct
=
((
float
)
active
/
allocated
)
*
100
-
100
;
size_t
frag_bytes
=
active
-
allocated
;
float
rss_pct
=
((
float
)
resident
/
allocated
)
*
100
-
100
;
...
...
tests/unit/memefficiency.tcl
View file @
22e9321c
...
...
@@ -41,7 +41,7 @@ start_server {tags {"defrag"}} {
test
"Active defrag"
{
r config set activedefrag no
r config set active-defrag-threshold-lower 5
r config set active-defrag-cycle-min
2
5
r config set active-defrag-cycle-min
6
5
r config set active-defrag-cycle-max 75
r config set active-defrag-ignore-bytes 2mb
r config set maxmemory 100mb
...
...
@@ -66,9 +66,10 @@ start_server {tags {"defrag"}} {
}
# Wait for the active defrag to stop working.
wait_for_condition 1
0
0 100
{
wait_for_condition 1
5
0 100
{
[
s active_defrag_running
]
eq 0
}
else
{
after 120
;
# serverCron only updates the info once in 100ms
puts
[
r info memory
]
puts
[
r memory malloc-stats
]
fail
"defrag didn't stop."
...
...
@@ -175,6 +176,7 @@ start_server {tags {"defrag"}} {
wait_for_condition 500 100
{
[
s active_defrag_running
]
eq 0
}
else
{
after 120
;
# serverCron only updates the info once in 100ms
puts
[
r info memory
]
puts
[
r memory malloc-stats
]
fail
"defrag didn't stop."
...
...
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