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

Fix spelling of deregister (#7804)

This commit is contained in:
Jono Sosulska 2020-05-08 10:03:45 -04:00 committed by GitHub
parent f04966d69c
commit 9b363e9f23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/consul/segment_oss.go
View File

@ -57,7 +57,7 @@ func (s *Server) floodSegments(config *Config) {
// reconcile is used to reconcile the differences between Serf membership and // reconcile is used to reconcile the differences between Serf membership and
// what is reflected in our strongly consistent store. Mainly we need to ensure // what is reflected in our strongly consistent store. Mainly we need to ensure
// all live nodes are registered, all failed nodes are marked as such, and all // all live nodes are registered, all failed nodes are marked as such, and all
// left nodes are de-registered. // left nodes are deregistered.
func (s *Server) reconcile() (err error) { func (s *Server) reconcile() (err error) {
defer metrics.MeasureSince([]string{"leader", "reconcile"}, time.Now()) defer metrics.MeasureSince([]string{"leader", "reconcile"}, time.Now())
members := s.serfLAN.Members() members := s.serfLAN.Members()

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

@ -2126,7 +2126,7 @@ func (s *Store) checkServiceNodesTxn(tx *memdb.Txn, ws memdb.WatchSet, serviceNa
} }
} else { } else {
// If we have no results, we should use the index of the last service // If we have no results, we should use the index of the last service
// extinction event so we don't go backwards when services de-register. We // extinction event so we don't go backwards when services deregister. We
// use target serviceName here but it actually doesn't matter. No chan will // use target serviceName here but it actually doesn't matter. No chan will
// be returned as we can't use the optimization in this case (and don't need // be returned as we can't use the optimization in this case (and don't need
// to as there is only one chan to watch anyway). // to as there is only one chan to watch anyway).

4
agent/consul/state/catalog_test.go
View File

@ -2200,7 +2200,7 @@ func TestStateStore_ConnectServiceNodes_Gateways(t *testing.T) {
_, _, err = s.ConnectServiceNodes(ws, "db", nil) _, _, err = s.ConnectServiceNodes(ws, "db", nil)
assert.Nil(err) assert.Nil(err)
// Watch should fire when a gateway instance is de-registered // Watch should fire when a gateway instance is deregistered
assert.Nil(s.DeleteService(19, "bar", "gateway", nil)) assert.Nil(s.DeleteService(19, "bar", "gateway", nil))
assert.True(watchFired(ws)) assert.True(watchFired(ws))
@ -3661,7 +3661,7 @@ func TestStateStore_CheckConnectServiceNodes_Gateways(t *testing.T) {
assert.Equal(idx, uint64(22)) assert.Equal(idx, uint64(22))
assert.Len(nodes, 3) assert.Len(nodes, 3)
// Watch should fire when a gateway instance is de-registered // Watch should fire when a gateway instance is deregistered
assert.Nil(s.DeleteService(23, "bar", "gateway", nil)) assert.Nil(s.DeleteService(23, "bar", "gateway", nil))
assert.True(watchFired(ws)) assert.True(watchFired(ws))

2
logging/monitor/monitor.go
View File

@ -14,7 +14,7 @@ type Monitor interface {
// ever time a log message occurs // ever time a log message occurs
Start() <-chan []byte Start() <-chan []byte
// Stop de-registers the sink from the InterceptLogger and closes the log // Stop deregisters the sink from the InterceptLogger and closes the log
// channels. This returns a count of the number of log messages that were // channels. This returns a count of the number of log messages that were
// dropped during streaming. // dropped during streaming.
Stop() int Stop() int

2
website/pages/api-docs/query.mdx
View File

@ -203,7 +203,7 @@ The table below shows this endpoint's support for
should be ignored when filtering unhealthy instances. This is mostly useful should be ignored when filtering unhealthy instances. This is mostly useful
in an emergency or as a temporary measure when a health check is found to be in an emergency or as a temporary measure when a health check is found to be
unreliable. Being able to ignore it in centrally-defined queries can be unreliable. Being able to ignore it in centrally-defined queries can be
simpler than de-registering the check as an interim solution until the check simpler than deregistering the check as an interim solution until the check
can be fixed. can be fixed.
- `OnlyPassing` `(bool: false)` - Specifies the behavior of the query's health - `OnlyPassing` `(bool: false)` - Specifies the behavior of the query's health

6
website/pages/docs/agent/telemetry.mdx
View File

@ -147,9 +147,9 @@ This is a full list of metrics emitted by Consul.
| `consul.client.api.catalog_register.` | This increments whenever a Consul agent receives a catalog register request. | requests | counter | | `consul.client.api.catalog_register.` | This increments whenever a Consul agent receives a catalog register request. | requests | counter |
| `consul.client.api.success.catalog_register.` | This increments whenever a Consul agent successfully responds to a catalog register request. | requests | counter | | `consul.client.api.success.catalog_register.` | This increments whenever a Consul agent successfully responds to a catalog register request. | requests | counter |
| `consul.client.rpc.error.catalog_register.` | This increments whenever a Consul agent receives an RPC error for a catalog register request. | errors | counter | | `consul.client.rpc.error.catalog_register.` | This increments whenever a Consul agent receives an RPC error for a catalog register request. | errors | counter |
| `consul.client.api.catalog_deregister.` | This increments whenever a Consul agent receives a catalog de-register request. | requests | counter | | `consul.client.api.catalog_deregister.` | This increments whenever a Consul agent receives a catalog deregister request. | requests | counter |
| `consul.client.api.success.catalog_deregister.` | This increments whenever a Consul agent successfully responds to a catalog de-register request. | requests | counter | | `consul.client.api.success.catalog_deregister.` | This increments whenever a Consul agent successfully responds to a catalog deregister request. | requests | counter |
| `consul.client.rpc.error.catalog_deregister.` | This increments whenever a Consul agent receives an RPC error for a catalog de-register request. | errors | counter | | `consul.client.rpc.error.catalog_deregister.` | This increments whenever a Consul agent receives an RPC error for a catalog deregister request. | errors | counter |
| `consul.client.api.catalog_datacenters.` | This increments whenever a Consul agent receives a request to list datacenters in the catalog. | requests | counter | | `consul.client.api.catalog_datacenters.` | This increments whenever a Consul agent receives a request to list datacenters in the catalog. | requests | counter |
| `consul.client.api.success.catalog_datacenters.` | This increments whenever a Consul agent successfully responds to a request to list datacenters. | requests | counter | | `consul.client.api.success.catalog_datacenters.` | This increments whenever a Consul agent successfully responds to a request to list datacenters. | requests | counter |
| `consul.client.rpc.error.catalog_datacenters.` | This increments whenever a Consul agent receives an RPC error for a request to list datacenters. | errors | counter | | `consul.client.rpc.error.catalog_datacenters.` | This increments whenever a Consul agent receives an RPC error for a request to list datacenters. | errors | counter |

2
website/pages/docs/connect/registration/sidecar-service.mdx
View File

@ -150,7 +150,7 @@ Almost all fields in a [service definition](/docs/agent/services) may be
set on the `connect.sidecar_service` except for the following: set on the `connect.sidecar_service` except for the following:
- `id` - Sidecar services get an ID assigned and it is an error to override - `id` - Sidecar services get an ID assigned and it is an error to override
this. This ensures the agent can correctly de-register the sidecar service this. This ensures the agent can correctly deregister the sidecar service
later when the parent service is removed. later when the parent service is removed.
- `kind` - Kind defaults to `connect-proxy` and there is currently no way to - `kind` - Kind defaults to `connect-proxy` and there is currently no way to
unset this to make the registration be for a regular non-connect-proxy unset this to make the registration be for a regular non-connect-proxy

4
website/pages/docs/guides/production-acls.mdx
View File

@ -190,8 +190,8 @@ rolling restart. After applying the token.
The token creation and application process for services is similar to agents. The token creation and application process for services is similar to agents.
Create a policy. Use that policy to create a token. Add the token to the Create a policy. Use that policy to create a token. Add the token to the
service. Service tokens are necessary for service. Service tokens are necessary for
agent anti-entropy, registering and de-registering the service, and agent anti-entropy, registering and deregistering the service, and
registering and de-registering the service's checks. registering and deregistering the service's checks.
Review the [service Review the [service
rules](/docs/agent/acl-rules#service-rules) before rules](/docs/agent/acl-rules#service-rules) before