status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Backport catalog index fix to 1.8.x

This commit is contained in:
Kyle Havlovitz 2020-08-11 15:13:25 -07:00
parent eaf3a00b88
commit ae8aa66cd7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1690,16 +1690,13 @@ func (s *Store) ensureCheckTxn(tx *memdb.Txn, idx uint64, preserveIndexes bool,
} }
} }
} }
if modified { if modified && !preserveIndexes {
// We update the modify index, ONLY if something has changed, thus // We update the modify index, ONLY if something has changed, thus
// With constant output, no change is seen when watching a service // With constant output, no change is seen when watching a service
// With huge number of nodes where anti-entropy updates continuously // With huge number of nodes where anti-entropy updates continuously
// the checks, but not the values within the check // the checks, but not the values within the check
hc.ModifyIndex = idx hc.ModifyIndex = idx
} }
if !preserveIndexes {
hc.ModifyIndex = idx
}
// TODO (state store) TODO (catalog) - should we be reinserting at all. Similar // TODO (state store) TODO (catalog) - should we be reinserting at all. Similar
// code in ensureServiceTxn simply returns nil when the service being inserted // code in ensureServiceTxn simply returns nil when the service being inserted