luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Display more information about check being not properly added when it fails (#4405) 

* Display more information about check being not properly added when it fails

It follows an incident where we add lots of error messages:

  [WARN] consul.fsm: EnsureRegistration failed: failed inserting check: Missing service registration

That seems related to Consul failing to restart on respective agents.

Having Node information as well as service information would help diagnose the issue.

* Renamed ensureCheckIfNodeMatches() as requested by @banks
This commit is contained in:
Pierre Souchay 2018-08-14 18:45:33 +02:00 committed by Paul Banks
parent cbe61dfcec
commit a16f34058b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
agent/consul/state/catalog.go
View File

@ -267,6 +267,17 @@ func (s *Store) EnsureRegistration(idx uint64, req *structs.RegisterRequest) err
return nil return nil
} }
func (s *Store) ensureCheckIfNodeMatches(tx *memdb.Txn, idx uint64, node string, check *structs.HealthCheck) error {
if check.Node != node {
return fmt.Errorf("check node %q does not match node %q",
check.Node, node)
}
if err := s.ensureCheckTxn(tx, idx, check); err != nil {
return fmt.Errorf("failed inserting check: %s on node %q", err, check.Node)
}
return nil
}
// ensureRegistrationTxn is used to make sure a node, service, and check // ensureRegistrationTxn is used to make sure a node, service, and check
// registration is performed within a single transaction to avoid race // registration is performed within a single transaction to avoid race
// conditions on state updates. // conditions on state updates.
@ -316,21 +327,13 @@ func (s *Store) ensureRegistrationTxn(tx *memdb.Txn, idx uint64, req *structs.Re
// Add the checks, if any. // Add the checks, if any.
if req.Check != nil { if req.Check != nil {
if req.Check.Node != req.Node { if err := s.ensureCheckIfNodeMatches(tx, idx, req.Node, req.Check); err != nil {
return fmt.Errorf("check node %q does not match node %q", return err
req.Check.Node, req.Node)
}
if err := s.ensureCheckTxn(tx, idx, req.Check); err != nil {
return fmt.Errorf("failed inserting check: %s", err)
} }
} }
for _, check := range req.Checks { for _, check := range req.Checks {
if check.Node != req.Node { if err := s.ensureCheckIfNodeMatches(tx, idx, req.Node, check); err != nil {
return fmt.Errorf("check node %q does not match node %q", return err
check.Node, req.Node)
}
if err := s.ensureCheckTxn(tx, idx, check); err != nil {
return fmt.Errorf("failed inserting check: %s", err)
} }
} }