Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions pkg/service/leader/leader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,33 @@ func TestLeader_Operations(t *testing.T) {
assert.Len(t, snap.GetSnapshot().GetTenants(), 2)
}

func TestLeader_RestoreResetsWriterState(t *testing.T) {
ctx := context.Background()
loc := location.New("centralus", "splitter-0")

l := leader.New(ctx, loc, memory.New(), leader.WithFastActivation())
defer l.Close()
<-l.Initialized().Closed()

response, err := l.Handle(ctx, leader.NewHandleTenantRequest(&splitterprivatepb.TenantRequest{
Req: &splitterprivatepb.TenantRequest_New{New: &splitterpb.NewTenantRequest{Name: string(tenant1)}},
}))
require.NoError(t, err)
require.NotNil(t, response.GetTenant().GetNew())

response, err = l.Handle(ctx, leader.NewHandleOperationRequest(&splitterprivatepb.OperationRequest{
Req: &splitterprivatepb.OperationRequest_Restore{Restore: &splitterprivatepb.RestoreRequest{Nuke: true}},
}))
require.NoError(t, err)
require.NotNil(t, response.GetOperation().GetRestore())

response, err = l.Handle(ctx, leader.NewHandleTenantRequest(&splitterprivatepb.TenantRequest{
Req: &splitterprivatepb.TenantRequest_New{New: &splitterpb.NewTenantRequest{Name: string(tenant1)}},
}))
require.NoError(t, err)
require.NotNil(t, response.GetTenant().GetNew())
}

func TestLeader_DoesNotAcknowledgeFailedUpdate(t *testing.T) {
ctx := context.Background()
loc := location.New("centralus", "splitter-0")
Expand Down
4 changes: 3 additions & 1 deletion pkg/service/leader/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,9 @@ func (w *Writer) deleteAsync(ctx context.Context, del core.Delete) iox.AsyncClos
}

func (w *Writer) restoreAsync(ctx context.Context, res core.Restore) iox.AsyncCloser {
w.cache.Restore(res.Snapshot())
snapshot := res.Snapshot()
w.writer = storage.NewWriter(snapshot)
w.cache.Restore(snapshot)

done := iox.NewAsyncCloser()
w.pool.Chan() <- func() {
Expand Down