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

Jump to bottom

Fix blocking for ServiceDumping by kind #6919

Merged
merged 1 commit into from
Dec 10, 2019
Merged

Fix blocking for ServiceDumping by kind #6919

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
10 changes: 7 additions & 3 deletions agent/consul/state/catalog_oss.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,18 @@ func (s *Store) catalogInsertService(tx *memdb.Txn, svc *structs.ServiceNode) er
return fmt.Errorf("failed inserting service: %s", err)
}

// overall services index
if err := tx.Insert("index", &IndexEntry{"services", svc.ModifyIndex}); err != nil {
mkeeler marked this conversation as resolved.
Show resolved Hide resolved
return fmt.Errorf("failed updating index: %s", err)
if err := s.catalogUpdateServicesIndexes(tx, svc.ModifyIndex, &svc.EnterpriseMeta); err != nil {
mkeeler marked this conversation as resolved.
Show resolved Hide resolved
return err
}

if err := s.catalogUpdateServiceIndexes(tx, svc.ServiceName, svc.ModifyIndex, &svc.EnterpriseMeta); err != nil {
return err
}

if err := s.catalogUpdateServiceKindIndexes(tx, svc.ServiceKind, svc.ModifyIndex, &svc.EnterpriseMeta); err != nil {
return err
}

return nil
}

Expand Down