mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
768da490ed
correct 'backend' (bbolt) context in aspect of membership.
Prior to this change the 'restored' backend used to still contain:
- old memberid (mvcc deletion used, why the membership is in bolt
bucket, but not mvcc part):
```
mvs := mvcc.NewStore(s.lg, be, lessor, ci, mvcc.StoreConfig{CompactionBatchLimit: math.MaxInt32})
defer mvs.Close()
txn := mvs.Write(traceutil.TODO())
btx := be.BatchTx()
del := func(k, v []byte) error {
txn.DeleteRange(k, nil)
return nil
}
// delete stored members from old cluster since using new members
btx.UnsafeForEach([]byte("members"), del)
```
- didn't get new members added.
44 lines
1.1 KiB
Go
44 lines
1.1 KiB
Go
package membership
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/coreos/go-semver/semver"
|
|
"github.com/stretchr/testify/assert"
|
|
"go.etcd.io/etcd/client/pkg/v3/types"
|
|
betesting "go.etcd.io/etcd/server/v3/mvcc/backend/testing"
|
|
|
|
"go.etcd.io/etcd/server/v3/mvcc/backend"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
func TestAddRemoveMember(t *testing.T) {
|
|
c := newTestCluster(t, nil)
|
|
be, bepath := betesting.NewDefaultTmpBackend(t)
|
|
c.SetBackend(be)
|
|
c.AddMember(newTestMember(17, nil, "node17", nil), true)
|
|
c.RemoveMember(17, true)
|
|
c.AddMember(newTestMember(18, nil, "node18", nil), true)
|
|
|
|
// Skipping removal of already removed member
|
|
c.RemoveMember(17, true)
|
|
err := be.Close()
|
|
assert.NoError(t, err)
|
|
|
|
be2 := backend.NewDefaultBackend(bepath)
|
|
defer func() {
|
|
assert.NoError(t, be2.Close())
|
|
}()
|
|
|
|
if false {
|
|
// TODO: Enable this code when Recover is reading membership from the backend.
|
|
c2 := newTestCluster(t, nil)
|
|
c2.SetBackend(be2)
|
|
c2.Recover(func(*zap.Logger, *semver.Version) {})
|
|
assert.Equal(t, []*Member{{ID: types.ID(18),
|
|
Attributes: Attributes{Name: "node18"}}}, c2.Members())
|
|
assert.Equal(t, true, c2.IsIDRemoved(17))
|
|
assert.Equal(t, false, c2.IsIDRemoved(18))
|
|
}
|
|
}
|