mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00

This change introduces joint quorums by changing the Node and RawNode API to accept pb.ConfChangeV2 (on top of pb.ConfChange). pb.ConfChange continues to work as today: it allows carrying out a single configuration change. A pb.ConfChange proposal gets added to the Raft log as such and is thus also observed by the app during Ready handling, and fed back to ApplyConfChange. ConfChangeV2 allows joint configuration changes but will continue to carry out configuration changes in "one phase" (i.e. without ever entering a joint config) when this is possible.
110 lines
2.9 KiB
Go
110 lines
2.9 KiB
Go
// Copyright 2019 The etcd Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package confchange
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/cockroachdb/datadriven"
|
|
pb "go.etcd.io/etcd/raft/raftpb"
|
|
"go.etcd.io/etcd/raft/tracker"
|
|
)
|
|
|
|
func TestConfChangeDataDriven(t *testing.T) {
|
|
datadriven.Walk(t, "testdata", func(t *testing.T, path string) {
|
|
tr := tracker.MakeProgressTracker(10)
|
|
c := Changer{
|
|
Tracker: tr,
|
|
LastIndex: 0, // incremented in this test with each cmd
|
|
}
|
|
|
|
// The test files use the commands
|
|
// - simple: run a simple conf change (i.e. no joint consensus),
|
|
// - enter-joint: enter a joint config, and
|
|
// - leave-joint: leave a joint config.
|
|
// The first two take a list of config changes, which have the following
|
|
// syntax:
|
|
// - vn: make n a voter,
|
|
// - ln: make n a learner,
|
|
// - rn: remove n, and
|
|
// - un: update n.
|
|
datadriven.RunTest(t, path, func(d *datadriven.TestData) string {
|
|
defer func() {
|
|
c.LastIndex++
|
|
}()
|
|
var ccs []pb.ConfChangeSingle
|
|
toks := strings.Split(strings.TrimSpace(d.Input), " ")
|
|
if toks[0] == "" {
|
|
toks = nil
|
|
}
|
|
for _, tok := range toks {
|
|
if len(tok) < 2 {
|
|
return fmt.Sprintf("unknown token %s", tok)
|
|
}
|
|
var cc pb.ConfChangeSingle
|
|
switch tok[0] {
|
|
case 'v':
|
|
cc.Type = pb.ConfChangeAddNode
|
|
case 'l':
|
|
cc.Type = pb.ConfChangeAddLearnerNode
|
|
case 'r':
|
|
cc.Type = pb.ConfChangeRemoveNode
|
|
case 'u':
|
|
cc.Type = pb.ConfChangeUpdateNode
|
|
default:
|
|
return fmt.Sprintf("unknown input: %s", tok)
|
|
}
|
|
id, err := strconv.ParseUint(tok[1:], 10, 64)
|
|
if err != nil {
|
|
return err.Error()
|
|
}
|
|
cc.NodeID = id
|
|
ccs = append(ccs, cc)
|
|
}
|
|
|
|
var cfg tracker.Config
|
|
var prs tracker.ProgressMap
|
|
var err error
|
|
switch d.Cmd {
|
|
case "simple":
|
|
cfg, prs, err = c.Simple(ccs...)
|
|
case "enter-joint":
|
|
var autoLeave bool
|
|
if len(d.CmdArgs) > 0 {
|
|
d.ScanArgs(t, "autoleave", &autoLeave)
|
|
}
|
|
cfg, prs, err = c.EnterJoint(autoLeave, ccs...)
|
|
case "leave-joint":
|
|
if len(ccs) > 0 {
|
|
err = errors.New("this command takes no input")
|
|
} else {
|
|
cfg, prs, err = c.LeaveJoint()
|
|
}
|
|
default:
|
|
return "unknown command"
|
|
}
|
|
if err != nil {
|
|
return err.Error() + "\n"
|
|
}
|
|
c.Tracker.Config, c.Tracker.Progress = cfg, prs
|
|
return fmt.Sprintf("%s\n%s", c.Tracker.Config, c.Tracker.Progress)
|
|
})
|
|
})
|
|
}
|