From 53afd77e2dc91e7f5d8aeb6ef45b9f7e42e98c96 Mon Sep 17 00:00:00 2001 From: Ryan Breen Date: Thu, 19 Feb 2015 17:45:47 -0500 Subject: [PATCH] s/data center/datacenter/g --- command/agent/command.go | 2 +- consul/server.go | 4 ++-- consul/util.go | 4 ++-- ui/README.md | 2 +- .../source/docs/agent/options.html.markdown | 20 +++++++++---------- .../docs/guides/bootstrapping.html.markdown | 2 +- .../guides/manual-bootstrap.html.markdown | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/command/agent/command.go b/command/agent/command.go index b1da6751e..dd6cac6bb 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -172,7 +172,7 @@ func (c *Command) readConfig() *Config { } } - // Verify data center is valid + // Verify datacenter is valid if !validDatacenter.MatchString(config.Datacenter) { c.Ui.Error("Datacenter must be alpha-numeric with underscores and hypens only") return nil diff --git a/consul/server.go b/consul/server.go index a95791f0f..e3e25a362 100644 --- a/consul/server.go +++ b/consul/server.go @@ -96,7 +96,7 @@ type Server struct { left bool // localConsuls is used to track the known consuls - // in the local data center. Used to do leader forwarding. + // in the local datacenter. Used to do leader forwarding. localConsuls map[string]*serverParts localLock sync.RWMutex @@ -117,7 +117,7 @@ type Server struct { reconcileCh chan serf.Member // remoteConsuls is used to track the known consuls in - // remote data centers. Used to do DC forwarding. + // remote datacenters. Used to do DC forwarding. remoteConsuls map[string][]*serverParts remoteLock sync.RWMutex diff --git a/consul/util.go b/consul/util.go index 96ee5c327..d0ce256fe 100644 --- a/consul/util.go +++ b/consul/util.go @@ -86,7 +86,7 @@ func ensurePath(path string, dir bool) error { } // Returns if a member is a consul server. Returns a bool, -// the data center, and the rpc port +// the datacenter, and the rpc port func isConsulServer(m serf.Member) (bool, *serverParts) { if m.Tags["role"] != "consul" { return false, nil @@ -132,7 +132,7 @@ func isConsulServer(m serf.Member) (bool, *serverParts) { } // Returns if a member is a consul node. Returns a boo, -// and the data center. +// and the datacenter. func isConsulNode(m serf.Member) (bool, string) { if m.Tags["role"] != "node" { return false, "" diff --git a/ui/README.md b/ui/README.md index 9a25f4448..7c4e03fa4 100644 --- a/ui/README.md +++ b/ui/README.md @@ -14,7 +14,7 @@ health and the nodes they run on. on each and the health of the node. - Key/value view and update -It's aware of multiple data centers, so you can get a quick global +It's aware of multiple datacenters, so you can get a quick global overview before drilling into specific data-centers for detailed views. diff --git a/website/source/docs/agent/options.html.markdown b/website/source/docs/agent/options.html.markdown index 0e0f132d8..1a4810258 100644 --- a/website/source/docs/agent/options.html.markdown +++ b/website/source/docs/agent/options.html.markdown @@ -52,12 +52,12 @@ The options below are all specified on the command-line. using the `ATLAS_TOKEN` environment variable. Required for use with Atlas. * `-bootstrap` - This flag is used to control if a server is in "bootstrap" mode. It is important that - no more than one server *per* data center be running in this mode. Technically, a server in bootstrap mode + no more than one server *per* datacenter be running in this mode. Technically, a server in bootstrap mode is allowed to self-elect as the Raft leader. It is important that only a single node is in this mode; otherwise, consistency cannot be guaranteed as multiple nodes are able to self-elect. It is not recommended to use this flag after a cluster has been bootstrapped. -* `-bootstrap-expect` - This flag provides the number of expected servers in the data center. +* `-bootstrap-expect` - This flag provides the number of expected servers in the datacenter. Either this value should not be provided or the value must agree with other servers in the cluster. When provided, Consul waits until the specified number of servers are available and then bootstraps the cluster. This allows an initial leader to be elected @@ -95,9 +95,9 @@ The options below are all specified on the command-line. the use of filesystem locking, meaning some types of mounted folders (e.g. VirtualBox shared folders) may not be suitable. -* `-dc` - This flag controls the data center in which the agent is running. If not provided, - it defaults to "dc1". Consul has first-class support for multiple data centers, but - it relies on proper configuration. Nodes in the same data center should be on a single +* `-dc` - This flag controls the datacenter in which the agent is running. If not provided, + it defaults to "dc1". Consul has first-class support for multiple datacenters, but + it relies on proper configuration. Nodes in the same datacenter should be on a single LAN. * `-encrypt` - Specifies the secret key to use for encryption of Consul @@ -162,11 +162,11 @@ The options below are all specified on the command-line. * `-server` - This flag is used to control if an agent is in server or client mode. When provided, an agent will act as a Consul server. Each Consul cluster must have at least one server and ideally - no more than 5 per data center. All servers participate in the Raft consensus algorithm to ensure that + no more than 5 per datacenter. All servers participate in the Raft consensus algorithm to ensure that transactions occur in a consistent, linearizable manner. Transactions modify cluster state, which is maintained on all server nodes to ensure availability in the case of node failure. Server nodes also - participate in a WAN gossip pool with server nodes in other data centers. Servers act as gateways - to other data centers and forward traffic as appropriate. + participate in a WAN gossip pool with server nodes in other datacenters. Servers act as gateways + to other datacenters and forward traffic as appropriate. * `-syslog` - This flag enables logging to syslog. This is only supported on Linux and OSX. It will result in an error if provided on Windows. @@ -214,9 +214,9 @@ definitions support being updated during a reload. #### Configuration Key Reference -* `acl_datacenter` - Only used by servers. This designates the data center which +* `acl_datacenter` - Only used by servers. This designates the datacenter which is authoritative for ACL information. It must be provided to enable ACLs. - All servers and data centers must agree on the ACL data center. Setting it on + All servers and datacenters must agree on the ACL datacenter. Setting it on the servers is all you need for enforcement, but for the APIs to forward properly from the clients, it must be set on them too. Future changes may move enforcement to the edges, so it's best to just set `acl_datacenter` on all nodes. diff --git a/website/source/docs/guides/bootstrapping.html.markdown b/website/source/docs/guides/bootstrapping.html.markdown index 4741527bb..3fd38a806 100644 --- a/website/source/docs/guides/bootstrapping.html.markdown +++ b/website/source/docs/guides/bootstrapping.html.markdown @@ -22,7 +22,7 @@ or specify no value at all. Any server that does not specify a value will not at bootstrap the cluster. There is a [deployment table](/docs/internals/consensus.html#toc_4) that covers various options, -but it is recommended to have 3 or 5 total servers per data center. A single server deployment is _**highly**_ +but it is recommended to have 3 or 5 total servers per datacenter. A single server deployment is _**highly**_ discouraged as data loss is inevitable in a failure scenario. Suppose we are starting a 3 server cluster, we can start `Node A`, `Node B` and `Node C` providing diff --git a/website/source/docs/guides/manual-bootstrap.html.markdown b/website/source/docs/guides/manual-bootstrap.html.markdown index 52cb58724..eec322cf5 100644 --- a/website/source/docs/guides/manual-bootstrap.html.markdown +++ b/website/source/docs/guides/manual-bootstrap.html.markdown @@ -34,7 +34,7 @@ something like the following will be logged: Once `Node A` is running, we can start the next set of servers. There is a [deployment table](/docs/internals/consensus.html#toc_4) that covers various -options, but it is recommended to have 3 or 5 total servers per data center. A +options, but it is recommended to have 3 or 5 total servers per datacenter. A single server deployment is _**highly**_ discouraged as data loss is inevitable in a failure scenario. We start the next servers **without** specifying `-bootstrap`. This is critical, since only one server should ever be running in