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
RedisLabs Raft
Commits
3973759e
Unverified
Commit
3973759e
authored
May 09, 2023
by
Ozan Tezcan
Committed by
GitHub
May 09, 2023
Browse files
Fix compaction rate usage in virtraft (#161)
parent
c5aee21b
Changes
3
Show whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
3973759e
...
@@ -80,13 +80,13 @@ add_dependencies(test_fuzzer raft_cffi)
...
@@ -80,13 +80,13 @@ add_dependencies(test_fuzzer raft_cffi)
add_custom_target
(
test_virtraft
)
add_custom_target
(
test_virtraft
)
add_custom_command
(
TARGET test_virtraft
add_custom_command
(
TARGET test_virtraft
WORKING_DIRECTORY
${
CMAKE_SOURCE_DIR
}
WORKING_DIRECTORY
${
CMAKE_SOURCE_DIR
}
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
5
0 --drop_rate 5 -P 10 --seed 1 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
1
0 --drop_rate 5 -P 10 --seed 1 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 7 -i 20000 --compaction_rate
5
0 --drop_rate 5 -P 10 --seed 1 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 7 -i 20000 --compaction_rate
1
0 --drop_rate 5 -P 10 --seed 1 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
5
0 --drop_rate 5 -P 10 --seed 2 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
1
0 --drop_rate 5 -P 10 --seed 2 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
5
0 --drop_rate 5 -P 10 --seed 3 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
1
0 --drop_rate 5 -P 10 --seed 3 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
5
0 --drop_rate 5 -P 10 --seed 4 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
1
0 --drop_rate 5 -P 10 --seed 4 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
5
0 --drop_rate 5 -P 10 --seed 5 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
1
0 --drop_rate 5 -P 10 --seed 5 -m 3 $
(
VIRTRAFT_OPTS
)
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
5
0 --drop_rate 5 -P 10 --seed 6 -m 3 $
(
VIRTRAFT_OPTS
))
COMMAND
${
LIBPATH
}
python3
${
CMAKE_SOURCE_DIR
}
/tests/virtraft2.py --servers 5 -i 20000 --compaction_rate
1
0 --drop_rate 5 -P 10 --seed 6 -m 3 $
(
VIRTRAFT_OPTS
))
add_dependencies
(
test_virtraft raft_cffi
)
add_dependencies
(
test_virtraft raft_cffi
)
add_custom_target
(
raft_cffi
)
add_custom_target
(
raft_cffi
)
...
...
Makefile
View file @
3973759e
...
@@ -111,34 +111,34 @@ tests_full:
...
@@ -111,34 +111,34 @@ tests_full:
.PHONY
:
test_virtraft
.PHONY
:
test_virtraft
test_virtraft
:
$(RAFT_CFFI_TARGET)
test_virtraft
:
$(RAFT_CFFI_TARGET)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
2
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
2
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
2
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
2
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
3
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
3
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
3
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
3
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
4
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
4
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
4
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
4
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
5
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
5
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
5
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
5
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
6
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
6
-m
3
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
6
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
6
-m
3
--client_rate
0
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
7
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
1
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
2
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
2
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
2
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
2
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
3
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
3
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
3
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
3
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
4
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
4
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
4
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
4
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
5
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
5
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
5
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
5
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
6
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
6
-m
3
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
5
0
--drop_rate
5
-P
10
--seed
6
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
python3 tests/virtraft2.py
--servers
5
-i
20000
--compaction_rate
1
0
--drop_rate
5
-P
10
--seed
6
-m
3
--client_rate
0
--auto_flush
$(VIRTRAFT_OPTS)
.PHONY
:
amalgamation
.PHONY
:
amalgamation
amalgamation
:
amalgamation
:
...
...
tests/virtraft2.py
View file @
3973759e
...
@@ -916,7 +916,7 @@ class RaftServer(object):
...
@@ -916,7 +916,7 @@ class RaftServer(object):
# ))
# ))
def
periodic
(
self
,
msec
):
def
periodic
(
self
,
msec
):
if
self
.
network
.
random
.
randint
(
1
,
100
000
)
<
self
.
network
.
compaction_rate
:
if
self
.
network
.
random
.
randint
(
1
,
100
)
<
self
.
network
.
compaction_rate
:
self
.
do_compaction
()
self
.
do_compaction
()
e
=
lib
.
raft_periodic_internal
(
self
.
raft
,
msec
)
e
=
lib
.
raft_periodic_internal
(
self
.
raft
,
msec
)
...
@@ -1087,6 +1087,13 @@ class RaftServer(object):
...
@@ -1087,6 +1087,13 @@ class RaftServer(object):
if
not
leader
:
if
not
leader
:
return
0
return
0
# In case leader has a more recent snapshot, skip loading. Later in this
# function, we use leader's configuration to reconfigure nodes from the
# snapshot. If leader has taken another snapshot, we cannot use that
# configuration for the current snapshot load operation.
if
leader
.
snapshot
.
last_idx
!=
index
:
return
-
1
leader_snapshot
=
leader
.
snapshot_buf
leader_snapshot
=
leader
.
snapshot_buf
# Copy received snapshot as our snapshot and clear the temp buf
# Copy received snapshot as our snapshot and clear the temp buf
...
...
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