Skip to content

fix(metadata): hold persistMu across topic create/delete mutations #165

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

Merged
kamir merged 1 commit into from
Jul 7, 2026
Merged

fix(metadata): hold persistMu across topic create/delete mutations #165

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
16 changes: 11 additions & 5 deletions pkg/metadata/etcd_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,14 @@ func (s *EtcdStore) CreatePartitions(ctx context.Context, topic string, partitio
// CreateTopic currently updates only the in-memory snapshot; the operator is still responsible
// for reconciling durable topic configuration into etcd/S3.
func (s *EtcdStore) CreateTopic(ctx context.Context, spec TopicSpec) (*protocol.MetadataTopic, error) {
s.persistMu.Lock()
defer s.persistMu.Unlock()

topic, err := s.metadata.CreateTopic(ctx, spec)
if err != nil {
return nil, err
}
if err := s.persistSnapshot(ctx); err != nil {
if err := s.persistSnapshotLocked(ctx); err != nil {
return nil, err
}
return topic, nil
Expand Down Expand Up @@ -460,6 +463,9 @@ func (s *EtcdStore) partitionExists(ctx context.Context, topic string, partition

// DeleteTopic updates the local snapshot so admin APIs behave consistently.
func (s *EtcdStore) DeleteTopic(ctx context.Context, name string) error {
s.persistMu.Lock()
defer s.persistMu.Unlock()

metaCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
defer cancel()
state, err := s.metadata.Metadata(metaCtx, []string{name})
Expand All @@ -485,10 +491,7 @@ func (s *EtcdStore) DeleteTopic(ctx context.Context, name string) error {
if err := s.deleteConsumerOffsets(ctx, name); err != nil {
return err
}
if err := s.persistSnapshot(ctx); err != nil {
return err
}
return nil
return s.persistSnapshotLocked(ctx)
}

func (s *EtcdStore) startWatchers() {
Expand Down Expand Up @@ -552,7 +555,10 @@ func snapshotKey() string {
func (s *EtcdStore) persistSnapshot(ctx context.Context) error {
s.persistMu.Lock()
defer s.persistMu.Unlock()
return s.persistSnapshotLocked(ctx)
}

func (s *EtcdStore) persistSnapshotLocked(ctx context.Context) error {
state, err := s.metadata.Metadata(context.Background(), nil)
if err != nil {
return err
Expand Down
Loading