Merge pull request etcd-io#2 from etcd-team/raft-replace

new etcd package
bmizerany · Jul 18, 2014 · 93ea6af · 93ea6af
2 parents 03a756d + 5d0bbfe
commit 93ea6af
Show file tree

Hide file tree

Showing 87 changed files with 5,013 additions and 3,087 deletions.
diff --git a/Documentation/clients-matrix.md b/Documentation/clients-matrix.md
@@ -1,20 +1,6 @@
 # Client libraries support matrix for etcd
 
 As etcd features support is really uneven between client libraries, a compatibility matrix can be important.
-We will consider in detail only the features of clients supporting the v2 API. Clients still supporting the v1 API *only* are listed below.
-
-## v1-only clients
-
-Clients supporting only the API version 1
-
-- [justinsb/jetcd](https://github.com/justinsb/jetcd) Java
-- [transitorykris/etcd-py](https://github.com/transitorykris/etcd-py) Python
-- [russellhaering/txetcd](https://github.com/russellhaering/txetcd) Python
-- [iconara/etcd-rb](https://github.com/iconara/etcd-rb) Ruby
-- [jpfuentes2/etcd-ruby](https://github.com/jpfuentes2/etcd-ruby) Ruby
-- [aterreno/etcd-clojure](https://github.com/aterreno/etcd-clojure) Clojure
-- [marshall-lee/etcd.erl](https://github.com/marshall-lee/etcd.erl) Erlang
-
 
 ## v2 clients
 
@@ -29,16 +15,16 @@ The v2 API has a lot of features, we will categorize them in a few categories:
 
 ### Supported features matrix
 
-| Client| [go-etcd](https://github.com/coreos/go-etcd) | [jetcd](https://github.com/diwakergupta/jetcd) | [python-etcd](https://github.com/jplana/python-etcd) | [python-etcd-client](https://github.com/dsoprea/PythonEtcdClient) | [node-etcd](https://github.com/stianeikeland/node-etcd) | [nodejs-etcd](https://github.com/lavagetto/nodejs-etcd) | [etcd-ruby](https://github.com/ranjib/etcd-ruby) | [etcd-api](https://github.com/jdarcy/etcd-api) | [cetcd](https://github.com/dwwoelfel/cetcd) |  [clj-etcd](https://github.com/rthomas/clj-etcd) | [etcetera](https://github.com/drusellers/etcetera)| [Etcd.jl](https://github.com/forio/Etcd.jl) | [p5-etcd](https://metacpan.org/release/Etcd)
-| --- | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| **HTTPS Auth**    | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - |
-| **Reconnect**     | Y | - | Y | Y | - | - | - | Y | - | - | - | - | - |
-| **Mod/Lock**      | - | - | Y | Y | - | - | - | - | - | - | - | Y | - |
-| **Mod/Leader**    | - | - | - | Y | - | - | - | - | - | - | - | Y | - |
-| **GET Features**  | F | B | F | F | F | F | F | B | F | G | F | F | F |
-| **PUT Features**  | F | B | F | F | F | F | F | G | F | G | F | F | F |
-| **POST Features** | F | - | F | F | - | F | F | - | - | - | F | F | F |
-| **DEL Features**  | F | B | F | F | F | F | F | B | G | B | F | F | F |
+| Client| [go-etcd](https://github.com/coreos/go-etcd) | [jetcd](https://github.com/diwakergupta/jetcd) | [python-etcd](https://github.com/jplana/python-etcd) | [python-etcd-client](https://github.com/dsoprea/PythonEtcdClient) | [node-etcd](https://github.com/stianeikeland/node-etcd) | [nodejs-etcd](https://github.com/lavagetto/nodejs-etcd) | [etcd-ruby](https://github.com/ranjib/etcd-ruby) | [etcd-api](https://github.com/jdarcy/etcd-api) | [cetcd](https://github.com/dwwoelfel/cetcd) |  [clj-etcd](https://github.com/rthomas/clj-etcd) | [etcetera](https://github.com/drusellers/etcetera)| [Etcd.jl](https://github.com/forio/Etcd.jl) | [p5-etcd](https://metacpan.org/release/Etcd) | [justinsb/jetcd](https://github.com/justinsb/jetcd) | [txetcd](https://github.com/russellhaering/txetcd)
+| --- | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| **HTTPS Auth**    | Y | Y | Y | Y | Y | Y | - | - | - | - | - | - | - | - | - |
+| **Reconnect**     | Y | - | Y | Y | - | - | - | Y | - | - | - | - | - | - | - |
+| **Mod/Lock**      | - | - | Y | Y | - | - | - | - | - | - | - | Y | - | - | - |
+| **Mod/Leader**    | - | - | - | Y | - | - | - | - | - | - | - | Y | - | - | - |
+| **GET Features**  | F | B | F | F | F | F | F | B | F | G | F | F | F | B | G |
+| **PUT Features**  | F | B | F | F | F | F | F | G | F | G | F | F | F | B | G |
+| **POST Features** | F | - | F | F | - | F | F | - | - | - | F | F | F | - | F |
+| **DEL Features**  | F | B | F | F | F | F | F | B | G | B | F | F | F | B | G |
 
 **Legend**
 

diff --git a/README.md b/README.md
@@ -120,10 +120,10 @@ curl -L http://127.0.0.1:4001/version
 
 #### API Versioning
 
-Clients are encouraged to use the `v2` API. The `v1` API will not change.
-
 The `v2` API responses should not change after the 0.2.0 release but new features will be added over time.
 
+The `v1` API has been deprecated and will not be supported.
+
 During the pre-v1.0.0 series of releases we may break the API as we fix bugs and get feedback.
 
 #### 32bit systems

diff --git a/config/cluster_config.go b/config/cluster_config.go
@@ -0,0 +1,37 @@
+package config
+
+// ClusterConfig represents cluster-wide configuration settings.
+type ClusterConfig struct {
+	// ActiveSize is the maximum number of node that can join as Raft followers.
+	// Nodes that join the cluster after the limit is reached are standbys.
+	ActiveSize int `json:"activeSize"`
+
+	// RemoveDelay is the amount of time, in seconds, after a node is
+	// unreachable that it will be swapped out as a standby node.
+	RemoveDelay float64 `json:"removeDelay"`
+
+	// SyncInterval is the amount of time, in seconds, between
+	// cluster sync when it runs in standby mode.
+	SyncInterval float64 `json:"syncInterval"`
+}
+
+// NewClusterConfig returns a cluster configuration with default settings.
+func NewClusterConfig() *ClusterConfig {
+	return &ClusterConfig{
+		ActiveSize:   DefaultActiveSize,
+		RemoveDelay:  DefaultRemoveDelay,
+		SyncInterval: DefaultSyncInterval,
+	}
+}
+
+func (c *ClusterConfig) Sanitize() {
+	if c.ActiveSize < MinActiveSize {
+		c.ActiveSize = MinActiveSize
+	}
+	if c.RemoveDelay < MinRemoveDelay {
+		c.RemoveDelay = MinRemoveDelay
+	}
+	if c.SyncInterval < MinSyncInterval {
+		c.SyncInterval = MinSyncInterval
+	}
+}
diff --git a/config/config.go b/config/config.go
@@ -18,35 +18,11 @@ import (
 
 	"github.com/coreos/etcd/log"
 	ustrings "github.com/coreos/etcd/pkg/strings"
-	"github.com/coreos/etcd/server"
 )
 
 // The default location for the etcd configuration file.
 const DefaultSystemConfigPath = "/etc/etcd/etcd.conf"
 
-// A lookup of deprecated flags to their new flag name.
-var newFlagNameLookup = map[string]string{
-	"C":                      "peers",
-	"CF":                     "peers-file",
-	"n":                      "name",
-	"c":                      "addr",
-	"cl":                     "bind-addr",
-	"s":                      "peer-addr",
-	"sl":                     "peer-bind-addr",
-	"d":                      "data-dir",
-	"m":                      "max-result-buffer",
-	"r":                      "max-retry-attempts",
-	"maxsize":                "max-cluster-size",
-	"clientCAFile":           "ca-file",
-	"clientCert":             "cert-file",
-	"clientKey":              "key-file",
-	"serverCAFile":           "peer-ca-file",
-	"serverCert":             "peer-cert-file",
-	"serverKey":              "peer-key-file",
-	"snapshotCount":          "snapshot-count",
-	"peer-heartbeat-timeout": "peer-heartbeat-interval",
-}
-
 // Config represents the server configuration.
 type Config struct {
 	SystemPath string
@@ -103,14 +79,14 @@ func New() *Config {
 	c.Snapshot = true
 	c.SnapshotCount = 10000
 	c.Peer.Addr = "127.0.0.1:7001"
-	c.Peer.HeartbeatInterval = defaultHeartbeatInterval
-	c.Peer.ElectionTimeout = defaultElectionTimeout
+	c.Peer.HeartbeatInterval = DefaultHeartbeatInterval
+	c.Peer.ElectionTimeout = DefaultElectionTimeout
 	rand.Seed(time.Now().UTC().UnixNano())
 	// Make maximum twice as minimum.
-	c.RetryInterval = float64(50+rand.Int()%50) * defaultHeartbeatInterval / 1000
-	c.Cluster.ActiveSize = server.DefaultActiveSize
-	c.Cluster.RemoveDelay = server.DefaultRemoveDelay
-	c.Cluster.SyncInterval = server.DefaultSyncInterval
+	c.RetryInterval = float64(50+rand.Int()%50) * DefaultHeartbeatInterval / 1000
+	c.Cluster.ActiveSize = DefaultActiveSize
+	c.Cluster.RemoveDelay = DefaultRemoveDelay
+	c.Cluster.SyncInterval = DefaultSyncInterval
 	return c
 }
 
@@ -278,38 +254,10 @@ func (c *Config) LoadFlags(arguments []string) error {
 	f.StringVar(&path, "config", "", "")
 	// BEGIN IGNORED FLAGS
 
-	// BEGIN DEPRECATED FLAGS
-	f.StringVar(&peers, "C", "", "(deprecated)")
-	f.StringVar(&c.PeersFile, "CF", c.PeersFile, "(deprecated)")
-	f.StringVar(&c.Name, "n", c.Name, "(deprecated)")
-	f.StringVar(&c.Addr, "c", c.Addr, "(deprecated)")
-	f.StringVar(&c.BindAddr, "cl", c.BindAddr, "(deprecated)")
-	f.StringVar(&c.Peer.Addr, "s", c.Peer.Addr, "(deprecated)")
-	f.StringVar(&c.Peer.BindAddr, "sl", c.Peer.BindAddr, "(deprecated)")
-	f.StringVar(&c.Peer.CAFile, "serverCAFile", c.Peer.CAFile, "(deprecated)")
-	f.StringVar(&c.Peer.CertFile, "serverCert", c.Peer.CertFile, "(deprecated)")
-	f.StringVar(&c.Peer.KeyFile, "serverKey", c.Peer.KeyFile, "(deprecated)")
-	f.StringVar(&c.CAFile, "clientCAFile", c.CAFile, "(deprecated)")
-	f.StringVar(&c.CertFile, "clientCert", c.CertFile, "(deprecated)")
-	f.StringVar(&c.KeyFile, "clientKey", c.KeyFile, "(deprecated)")
-	f.StringVar(&c.DataDir, "d", c.DataDir, "(deprecated)")
-	f.IntVar(&c.MaxResultBuffer, "m", c.MaxResultBuffer, "(deprecated)")
-	f.IntVar(&c.MaxRetryAttempts, "r", c.MaxRetryAttempts, "(deprecated)")
-	f.IntVar(&c.SnapshotCount, "snapshotCount", c.SnapshotCount, "(deprecated)")
-	f.IntVar(&c.Peer.HeartbeatInterval, "peer-heartbeat-timeout", c.Peer.HeartbeatInterval, "(deprecated)")
-	// END DEPRECATED FLAGS
-
 	if err := f.Parse(arguments); err != nil {
 		return err
 	}
 
-	// Print deprecation warnings on STDERR.
-	f.Visit(func(f *flag.Flag) {
-		if len(newFlagNameLookup[f.Name]) > 0 {
-			fmt.Fprintf(os.Stderr, "[deprecated] use -%s, not -%s\n", newFlagNameLookup[f.Name], f.Name)
-		}
-	})
-
 	// Convert some parameters to lists.
 	if peers != "" {
 		c.Peers = ustrings.TrimSplit(peers, ",")
@@ -406,17 +354,17 @@ func (c *Config) Sanitize() error {
 }
 
 // EtcdTLSInfo retrieves a TLSInfo object for the etcd server
-func (c *Config) EtcdTLSInfo() *server.TLSInfo {
-	return &server.TLSInfo{
+func (c *Config) EtcdTLSInfo() *TLSInfo {
+	return &TLSInfo{
 		CAFile:   c.CAFile,
 		CertFile: c.CertFile,
 		KeyFile:  c.KeyFile,
 	}
 }
 
 // PeerRaftInfo retrieves a TLSInfo object for the peer server.
-func (c *Config) PeerTLSInfo() *server.TLSInfo {
-	return &server.TLSInfo{
+func (c *Config) PeerTLSInfo() *TLSInfo {
+	return &TLSInfo{
 		CAFile:   c.Peer.CAFile,
 		CertFile: c.Peer.CertFile,
 		KeyFile:  c.Peer.KeyFile,
@@ -434,8 +382,8 @@ func (c *Config) Trace() bool {
 	return c.strTrace == "*"
 }
 
-func (c *Config) ClusterConfig() *server.ClusterConfig {
-	return &server.ClusterConfig{
+func (c *Config) ClusterConfig() *ClusterConfig {
+	return &ClusterConfig{
 		ActiveSize:   c.Cluster.ActiveSize,
 		RemoveDelay:  c.Cluster.RemoveDelay,
 		SyncInterval: c.Cluster.SyncInterval,

diff --git a/config/config_test.go b/config/config_test.go
@@ -607,150 +607,6 @@ func TestConfigCLIArgsOverrideEnvVar(t *testing.T) {
 	assert.Equal(t, c.Addr, "127.0.0.1:2000", "")
 }
 
-//--------------------------------------
-// DEPRECATED (v1)
-//--------------------------------------
-
-func TestConfigDeprecatedAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-c", "127.0.0.1:4002"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Addr, "127.0.0.1:4002")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -addr, not -c\n")
-}
-
-func TestConfigDeprecatedBindAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-cl", "127.0.0.1:4003"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.BindAddr, "127.0.0.1:4003", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -bind-addr, not -cl\n", "")
-}
-
-func TestConfigDeprecatedCAFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-clientCAFile", "/tmp/file.ca"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.CAFile, "/tmp/file.ca", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -ca-file, not -clientCAFile\n", "")
-}
-
-func TestConfigDeprecatedCertFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-clientCert", "/tmp/file.cert"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.CertFile, "/tmp/file.cert", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -cert-file, not -clientCert\n", "")
-}
-
-func TestConfigDeprecatedKeyFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-clientKey", "/tmp/file.key"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.KeyFile, "/tmp/file.key", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -key-file, not -clientKey\n", "")
-}
-
-func TestConfigDeprecatedPeersFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-C", "coreos.com:4001,coreos.com:4002"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peers, []string{"coreos.com:4001", "coreos.com:4002"}, "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peers, not -C\n", "")
-}
-
-func TestConfigDeprecatedPeersFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-CF", "/tmp/machines"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.PeersFile, "/tmp/machines", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peers-file, not -CF\n", "")
-}
-
-func TestConfigDeprecatedMaxRetryAttemptsFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-r", "10"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.MaxRetryAttempts, 10, "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -max-retry-attempts, not -r\n", "")
-}
-
-func TestConfigDeprecatedNameFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-n", "test-name"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Name, "test-name", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -name, not -n\n", "")
-}
-
-func TestConfigDeprecatedPeerAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-s", "localhost:7002"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.Addr, "localhost:7002", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-addr, not -s\n", "")
-}
-
-func TestConfigDeprecatedPeerBindAddrFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-sl", "127.0.0.1:4003"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.BindAddr, "127.0.0.1:4003", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-bind-addr, not -sl\n", "")
-}
-
-func TestConfigDeprecatedPeerCAFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-serverCAFile", "/tmp/peer/file.ca"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.CAFile, "/tmp/peer/file.ca", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-ca-file, not -serverCAFile\n", "")
-}
-
-func TestConfigDeprecatedPeerCertFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-serverCert", "/tmp/peer/file.cert"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.CertFile, "/tmp/peer/file.cert", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-cert-file, not -serverCert\n", "")
-}
-
-func TestConfigDeprecatedPeerKeyFileFlag(t *testing.T) {
-	_, stderr := capture(func() {
-		c := New()
-		err := c.LoadFlags([]string{"-serverKey", "/tmp/peer/file.key"})
-		assert.NoError(t, err)
-		assert.Equal(t, c.Peer.KeyFile, "/tmp/peer/file.key", "")
-	})
-	assert.Equal(t, stderr, "[deprecated] use -peer-key-file, not -serverKey\n", "")
-}
-
 //--------------------------------------
 // Helpers
 //--------------------------------------