Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14565 from ahrtr/functional_test_cleanup_data

Browse Source 
functional_test: stop etcd and cleanup data when test is successful
This commit is contained in:
Benjamin Wang 2022-10-13 02:07:59 +08:00 committed by GitHub
commit 3b29811dd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/test.sh
View File

@ -149,7 +149,9 @@ function generic_checker {
function killall_functional_test {
log_callout "Killing all etcd-agent and etcd processes..."
killall -9 etcd-agent
killall -9 etcd
# When functional test is successful, the etcd processes have already been
# stopped by the agent, so we should ignore the error in this case.
killall -9 etcd || true
}
function functional_pass {

5
tests/functional/cmd/etcd-tester/etcd_tester_test.go
View File

@ -47,5 +47,8 @@ func TestFunctional(t *testing.T) {
t.Fatal("WaitHealth failed", zap.Error(err))
}
clus.Run(t)
if err := clus.Run(t); err == nil {
// Only stop etcd and cleanup data when test is successful.
clus.Send_SIGQUIT_ETCD_AND_REMOVE_DATA()
}
}

7
tests/functional/tester/cluster.go
View File

@ -395,11 +395,16 @@ func (clus *Cluster) Send_INITIAL_START_ETCD() error {
return clus.broadcast(rpcpb.Operation_INITIAL_START_ETCD)
}
// send_SIGQUIT_ETCD_AND_ARCHIVE_DATA sends "send_SIGQUIT_ETCD_AND_ARCHIVE_DATA" operation.
// send_SIGQUIT_ETCD_AND_ARCHIVE_DATA sends "Operation_SIGQUIT_ETCD_AND_ARCHIVE_DATA" operation.
func (clus *Cluster) send_SIGQUIT_ETCD_AND_ARCHIVE_DATA() error {
return clus.broadcast(rpcpb.Operation_SIGQUIT_ETCD_AND_ARCHIVE_DATA)
}
// Send_SIGQUIT_ETCD_AND_REMOVE_DATA sends "Operation_SIGQUIT_ETCD_AND_REMOVE_DATA" operation.
func (clus *Cluster) Send_SIGQUIT_ETCD_AND_REMOVE_DATA() error {
return clus.broadcast(rpcpb.Operation_SIGQUIT_ETCD_AND_REMOVE_DATA)
}
// send_RESTART_ETCD sends restart operation.
func (clus *Cluster) send_RESTART_ETCD() error {
return clus.broadcast(rpcpb.Operation_RESTART_ETCD)

48
tests/functional/tester/cluster_run.go
View File

@ -31,7 +31,7 @@ import (
const compactQPS = 50000
// Run starts tester.
func (clus *Cluster) Run(t *testing.T) {
func (clus *Cluster) Run(t *testing.T) error {
defer printReport()
// updateCases must be executed after etcd is started, because the FAILPOINTS case
@ -46,17 +46,25 @@ func (clus *Cluster) Run(t *testing.T) {
)
}
var preModifiedKey int64
var (
preModifiedKey int64
err error
)
for round := 0; round < int(clus.Tester.RoundLimit) || clus.Tester.RoundLimit == -1; round++ {
t.Run(fmt.Sprintf("round:%v", round), func(t *testing.T) {
preModifiedKey = clus.doRoundAndCompact(t, round, preModifiedKey)
t.Run(fmt.Sprintf("round-%d", round), func(t *testing.T) {
preModifiedKey, err = clus.doRoundAndCompact(t, round, preModifiedKey)
})
if err != nil {
clus.failed(err)
return err
}
if round > 0 && round%500 == 0 { // every 500 rounds
t.Logf("Defragmenting in round: %v", round)
if err := clus.defrag(); err != nil {
clus.failed(err)
return
return err
}
}
}
@ -67,13 +75,14 @@ func (clus *Cluster) Run(t *testing.T) {
zap.Int("case", clus.cs),
zap.Int("case-total", len(clus.cases)),
)
return nil
}
func (clus *Cluster) doRoundAndCompact(t *testing.T, round int, preModifiedKey int64) (postModifiedKey int64) {
func (clus *Cluster) doRoundAndCompact(t *testing.T, round int, preModifiedKey int64) (postModifiedKey int64, err error) {
roundTotalCounter.Inc()
clus.rd = round
if err := clus.doRound(t); err != nil {
if err = clus.doRound(t); err != nil {
clus.lg.Error(
"round FAIL",
zap.Int("round", clus.rd),
@ -81,11 +90,15 @@ func (clus *Cluster) doRoundAndCompact(t *testing.T, round int, preModifiedKey i
zap.Int("case-total", len(clus.cases)),
zap.Error(err),
)
if clus.cleanup(err) != nil {
return
if cerr := clus.cleanup(err); cerr != nil {
clus.lg.Warn(
"cleanup FAIL",
zap.Int("round", clus.rd),
zap.Int("case", clus.cs),
zap.Int("case-total", len(clus.cases)),
zap.Error(cerr),
)
}
// reset preModifiedKey after clean up
postModifiedKey = 0
return
}
@ -104,7 +117,7 @@ func (clus *Cluster) doRoundAndCompact(t *testing.T, round int, preModifiedKey i
zap.Int("case-total", len(clus.cases)),
zap.Duration("timeout", timeout),
)
if err := clus.compact(revToCompact, timeout); err != nil {
if err = clus.compact(revToCompact, timeout); err != nil {
clus.lg.Warn(
"compact FAIL",
zap.Int("round", clus.rd),
@ -112,20 +125,19 @@ func (clus *Cluster) doRoundAndCompact(t *testing.T, round int, preModifiedKey i
zap.Int("case-total", len(clus.cases)),
zap.Error(err),
)
if err = clus.cleanup(err); err != nil {
if cerr := clus.cleanup(err); cerr != nil {
clus.lg.Warn(
"cleanup FAIL",
zap.Int("round", clus.rd),
zap.Int("case", clus.cs),
zap.Int("case-total", len(clus.cases)),
zap.Error(err),
zap.Error(cerr),
)
return
}
// reset preModifiedKey after clean up
return 0
} else {
postModifiedKey = currentModifiedKey
}
return currentModifiedKey
return
}
func (clus *Cluster) doRound(t *testing.T) error {