Skip to content

Commit b5fc7f2

Browse files
wenyihu6tbg
authored andcommitted
asim: add time.Second to snapshot rate delay calculation
Previously, the delay calculation used snapshot_rate (per second) but forgot to multiply the result by time.Second, resulting in an incorrectly small delay in nanoseconds. This commit fixes the bug by applying the correct time unit. Epic: none Release note: none
1 parent 2618812 commit b5fc7f2

File tree

3 files changed

+47
-47
lines changed

3 files changed

+47
-47
lines changed

pkg/kv/kvserver/asim/config/settings.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (s *SimulationSettings) ReplicaChangeDelayFn() func(rangeSize int64, add bo
152152
return func(rangeSize int64, add bool) time.Duration {
153153
delay := s.ReplicaChangeBaseDelay
154154
if add {
155-
delay += (time.Duration(rangeSize) / time.Duration(s.RebalancingSnapshotRate))
155+
delay += (time.Duration(rangeSize) / time.Duration(s.RebalancingSnapshotRate)) * time.Second
156156
}
157157
return delay
158158
}

pkg/kv/kvserver/asim/tests/testdata/non_rand/example_add_node

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@ OK
3535
# 300 replicas as well.
3636
plot stat=replicas sample=1
3737
----
38-
301 ┼─────────────────────────────────────╭─╭───────────────────────────────────────
39-
281 ┤ ╭──
40-
261 ┤ ╭╭─
38+
301 ┼──────────────────────────────────────╭────────────────────────────────────────
39+
281 ┤ ╭──╯
40+
261 ┤ ╭─╯
4141
241 ┤ ╭──╯
42-
221 ┤ ╭──
43-
201 ┤ ╭──╯
44-
181 ┤ ╭─
45-
161 ┤ ╭──
46-
140 ┤ ╭──╯
47-
120 ┤ ╭─╯
48-
100 ┤ ╭──╯
49-
80 ┤ ╭──
50-
60 ┤ ╭─╯
51-
40 ┤ ╭─╯
42+
221 ┤ ╭╭─╯
43+
201 ┤ ╭──╯
44+
181 ┤ ╭─
45+
161 ┤ ╭─╯
46+
140 ┤ ╭╭─
47+
120 ┤ ╭╭──
48+
100 ┤ ╭──╯
49+
80 ┤ ╭──╯
50+
60 ┤ ╭╭─
51+
40 ┤ ╭─
5252
20 ┤ ╭──╯
5353
0 ┼─╯
5454
replicas
5555
initial store values: [s1=301, s2=0, s3=0] (stddev=141.89, mean=100.33, sum=301)
56-
last store values: [s1=300, s2=301, s3=300] (stddev=0.47, mean=300.33, sum=901)
56+
last store values: [s1=300, s2=300, s3=301] (stddev=0.47, mean=300.33, sum=901)
5757

5858
# vim:ft=sh

pkg/kv/kvserver/asim/tests/testdata/non_rand/example_fulldisk

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,46 @@ OK
1919
# store 5. This is shown below as it sheds replicas.
2020
plot stat=replicas
2121
----
22-
342╭╮ ╭╮ ╭╮ ╭╮╭─╭─╮╭
23-
329 ╭╮╭╭╮╭╮─╭╮╭──╮╭╭──────────────────────────╯╰──╯╯╰─
24-
317 ╭╮╭──╮─╭─╯╰╯╰─╯╰╯──╰─╯╰╯╰╯
25-
304 ┼╮──────────────────────╯╰╯╰╯╰─
26-
291 ┤╰───────────────────╮ ╰╯
27-
278 ┤ ╰──╮
28-
266 ╰╮
29-
253
30-
240 ╰──
31-
227 ╰─
32-
215 ╰────╮
33-
202 ╰───╮╭───
34-
189 ╯ ╰────
35-
176 ───────╮ ╭─╮
36-
164 ╰─╯ ╰──╮╭─────╮╭╮
37-
151╰╯ ╰╯╰─────
22+
345╭╮ ╭╮
23+
334╭─╮ ╭╮ ╭╮╭─╮╭╮╭╮╭╮╭─╭╮╯│ ╭─╭╮╭╮ ╭╮╯│╭─╭─╮╮─╭
24+
324 ┤ ╭╮╭─╮ ╭╭─│─│╭╯╭─╮╭─╭──╮╭╮╭─╮│╯╭╯╰╮╰╮╭╯│╮╰╮╭─╮╭╯╭╯╰╮─╮╭╯╰╮─╯╭│╯╰╮╮╭
25+
313 ┤ ╭╮╯╭╭─╮╭───╯ ╰╮╰│╮│╯╭│╮╯╰──╯╯╰╮╭╯╭╯│╯╭╯╭╰╮╮╭╯ │╯││││││╭╯╮╰│ ╭╭╯│╭│╭
26+
303 ┤╭──────────╯╰╮╭╯│╰╯╭╯│╰─╯│╭╯│╰╮╭╯╰─╯│ ╰╯╰╯╭╯ │╭╯─╯││╭╯╮╭│╰╭╯─╰╰─╯ ╰╯│─╭╯╯╰╯╰╯
27+
292 ┼─╮────────────╯ ╰╯╰╯╰│╭╯ ││ ╰─╰╯╰──╯╰╮╭╯ ││ ╰╯ ╰╰╯ ╰╯╰─╯╯ │╭╯ ╰─╯
28+
282╰─────────╮ ╰╯ ╰╯ ╰╯ ╰╯ ╰╯
29+
271│╭─
30+
261╰╯ │ ╭╮
31+
250╰╮╭╯╰╮ ╭╮ ╭╮ ╭╮ ╭─╮ ╭╮ ╭╮ ╭─╮ ╭╯│ ╭
32+
240││ │╭╯╰╮╭╯│ ╭╯╰╮│ ╰╮ │╰╮ ╭╮ ╭╮ ╭╯╰╮ │ │ ╭╯ ╰╮ ││
33+
229╰╯ ╰╯ ││ ╰╮│ ╰╯ │╭╯ │ ││ │╰╮ │ ╰╮╭╯ ╰╮ │ │ ╭╯╰
34+
219╰╯ ╰╯ ╰╯ ╰╮╭╯╰╮ ╭╯ │ ╭╯ ││ │╭╯ ╰╮│ ╰╮ ╭
35+
208││ │ │ ╰╮│╯ ╰╯ ╰╯ │ ╭╯│
36+
198╰╯ ╰─╯ ╰╯ ╰╮ │ ╰
37+
187 ╰─╯
3838
replicas
3939
initial store values: [s1=300, s2=300, s3=300, s4=300, s5=300] (stddev=0.00, mean=300.00, sum=1500)
40-
last store values: [s1=342, s2=338, s3=339, s4=334, s5=156] (stddev=72.94, mean=301.80, sum=1509)
40+
last store values: [s1=321, s2=337, s3=323, s4=324, s5=201] (stddev=50.42, mean=301.20, sum=1506)
4141

4242
# Plot the % of disk storage capacity used. We should see s5 hovering right
4343
# around 92.5-95% (the storage capacity threshold value).
4444
plot stat=disk_fraction_used
4545
----
46-
0.98 ┤ ╭╮ ╭╮ ╭─╮ ╭───╮ ╭╮╭╮ ╭╮ ╭╮╭──╮╭╮╭╮ ╭─╮ ╭╮ ╭╮ ╭╮ ╭╮
47-
0.91 ┤ ╭────────╯╰─╯╰─╯ ╰─╯ ╰─╯╰╯╰─╯╰───╯╰╯ ╰╯╰╯╰───╯ ╰─╯╰────╯╰──────╯╰──╯╰
48-
0.85 ┼───────╯
49-
0.78 ┤
50-
0.72 ┤
51-
0.65 ┤
52-
0.59 ┤
53-
0.52 ┤
46+
1.14 ┤ ╭─╮
47+
1.06 ┤ ╭╮ ╭╮ ╭─╮ │ │ ╭╮
48+
0.99 ┤ ╭─╮╭─╮ ╭╮ ╭─╮ ╭─╮ ╭─╮ ╭─╮ │╰╮ ╭──╮ ╭─╮ ╭╯╰╮ ╭─╮ │ ╰╮ ╭╯ ╰╮ ╭╯╰
49+
0.91 ┤ ╭─────╯ ╰╯ ╰╮╭╯╰─╯ ╰─╯ ╰╮│ ╰─╯ ╰╮╭╯ ╰╮│ ╰╮╭╯ │ ╭╯ ╰╮╭╯ ╰╮ ╭╯ ╰╮│ ╰──╯
50+
0.84 ┼─╮╭╯ ╰╯ ╰╯ ╰╯ ╰╯ ╰╯ ╰─╯ ╰╯ ╰─╯ ╰╯
51+
0.76 ┤ ╰╯
52+
0.68 ┤
53+
0.61 ┤
54+
0.53 ┤
5455
0.46 ┤
55-
0.39 ┤
56-
0.33 ┤
57-
0.26 ┤
58-
0.20 ┤
59-
0.13 ┤
60-
0.07 ┤
56+
0.38 ┤
57+
0.30 ┤
58+
0.23 ┤
59+
0.15 ┤
60+
0.08 ┤
6161
0.00 ┼───────────────────────────────────────────────────────────────────────────────
6262
disk_fraction_used
6363
initial store values: [s1=0.00, s2=0.00, s3=0.00, s4=0.00, s5=0.83] (stddev=0.33, mean=0.17, sum=1)
64-
last store values: [s1=0.00, s2=0.00, s3=0.00, s4=0.00, s5=0.94] (stddev=0.38, mean=0.19, sum=1)
64+
last store values: [s1=0.00, s2=0.00, s3=0.00, s4=0.00, s5=1.02] (stddev=0.41, mean=0.20, sum=1)

0 commit comments

Comments
 (0)