Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(varlogtest): create new instance of admin and log #591

Merged
merged 1 commit into from
Oct 4, 2023
Merged

feat(varlogtest): create new instance of admin and log #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/varlogtest/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ import (
)

type testAdmin struct {
vt *VarlogTest
vt *VarlogTest
closed bool
}

var _ varlog.Admin = (*testAdmin)(nil)

func (c *testAdmin) lock() error {
c.vt.cond.L.Lock()
if c.vt.adminClientClosed {
if c.closed {
c.vt.cond.L.Unlock()
return verrors.ErrClosed
}
Expand Down Expand Up @@ -534,6 +535,6 @@ func (c *testAdmin) RemoveMRPeer(ctx context.Context, raftURL string, opts ...va
func (c *testAdmin) Close() error {
c.vt.cond.L.Lock()
defer c.vt.cond.L.Unlock()
c.vt.adminClientClosed = true
c.closed = true
return nil
}
9 changes: 5 additions & 4 deletions pkg/varlogtest/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ import (
)

type testLog struct {
vt *VarlogTest
vt *VarlogTest
closed bool
}

var _ varlog.Log = (*testLog)(nil)

func (c *testLog) lock() error {
c.vt.cond.L.Lock()
if c.vt.varlogClientClosed {
if c.closed {
c.vt.cond.L.Unlock()
return verrors.ErrClosed
}
Expand All @@ -35,7 +36,7 @@ func (c *testLog) unlock() {
func (c *testLog) Close() error {
c.vt.cond.L.Lock()
defer c.vt.cond.L.Unlock()
c.vt.varlogClientClosed = true
c.closed = true
c.vt.cond.Broadcast()
return nil
}
Expand Down Expand Up @@ -247,7 +248,7 @@ func (c *testLog) SubscribeTo(ctx context.Context, topicID types.TopicID, logStr
return logEntries
}
s.vt.closedClient = func() bool {
return c.vt.varlogClientClosed
return c.closed
}

s.wg.Add(1)
Expand Down
16 changes: 4 additions & 12 deletions pkg/varlogtest/varlogtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ import (
type VarlogTest struct {
config

admin *testAdmin
vlg *testLog

rng *rand.Rand

mu sync.Mutex
Expand All @@ -38,9 +35,6 @@ type VarlogTest struct {
nextTopicID types.TopicID
nextStorageNodeID types.StorageNodeID
nextLogStreamID types.LogStreamID

adminClientClosed bool
varlogClientClosed bool
}

func New(opts ...Option) (*VarlogTest, error) {
Expand All @@ -62,8 +56,6 @@ func New(opts ...Option) (*VarlogTest, error) {
leaderMR: types.InvalidNodeID,
}
vt.cond = sync.NewCond(&vt.mu)
vt.admin = &testAdmin{vt: vt}
vt.vlg = &testLog{vt: vt}

for _, mrn := range vt.initialMRNodes {
if vt.leaderMR == types.InvalidNodeID {
Expand All @@ -76,12 +68,12 @@ func New(opts ...Option) (*VarlogTest, error) {
return vt, nil
}

func (vt *VarlogTest) Admin() varlog.Admin {
return vt.admin
func (vt *VarlogTest) NewAdminClient() varlog.Admin {
return &testAdmin{vt: vt}
}

func (vt *VarlogTest) Log() varlog.Log {
return vt.vlg
func (vt *VarlogTest) NewLogClient() varlog.Log {
return &testLog{vt: vt}
}

func (vt *VarlogTest) generateTopicID() types.TopicID {
Expand Down
14 changes: 7 additions & 7 deletions pkg/varlogtest/varlogtest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ func TestVarlotTest_LogStreamAppender(t *testing.T) {
)
require.NoError(t, err)

adm := vt.Admin()
vlg := vt.Log()
adm := vt.NewAdminClient()
vlg := vt.NewLogClient()
defer func() {
require.NoError(t, vlg.Close())
require.NoError(t, adm.Close())
Expand Down Expand Up @@ -176,8 +176,8 @@ func TestVarlogTest(t *testing.T) {
)
require.NoError(t, err)

adm := vt.Admin()
vlg := vt.Log()
adm := vt.NewAdminClient()
vlg := vt.NewLogClient()
defer func() {
require.NoError(t, vlg.Close())
require.NoError(t, adm.Close())
Expand Down Expand Up @@ -594,8 +594,8 @@ func TestVarlogTest_Trim(t *testing.T) {
)
require.NoError(t, err)

adm := vt.Admin()
vlg := vt.Log()
adm := vt.NewAdminClient()
vlg := vt.NewLogClient()
defer func() {
require.NoError(t, vlg.Close())
require.NoError(t, adm.Close())
Expand Down Expand Up @@ -783,7 +783,7 @@ func TestVarlogTestAdminMetadataRepository(t *testing.T) {
)
require.NoError(t, err)

tc.testf(t, vt.Admin())
tc.testf(t, vt.NewAdminClient())
})
}
}
Expand Down