Merge pull request #8845 from bitbandi/multiple-etcd-host

Allow multiple etcd host

Author: guggero

docs/release-notes/release-notes-0.18.3.md

@@ -87,6 +87,9 @@ commitment when the channel was force closed.
 * Commitment fees are now taken into account when [calculating the fee
   exposure threshold](https://github.com/lightningnetwork/lnd/pull/8824).
 
+* [Allow](https://github.com/lightningnetwork/lnd/pull/8845) multiple etcd hosts
+  to be specified in db.etcd.host.
+
 ## RPC Updates
 
 * [`xImportMissionControl`](https://github.com/lightningnetwork/lnd/pull/8779) 

kvdb/etcd/config.go

@@ -14,7 +14,7 @@ type Config struct {
 
 	EmbeddedLogFile string `long:"embedded_log_file" description:"Optional log file to use for embedded instance logs. note: use for testing only."`
 
-	Host string `long:"host" description:"Etcd database host."`
+	Host string `long:"host" description:"Etcd database host. Supports multiple hosts separated by a comma."`
 
 	User string `long:"user" description:"Etcd database user."`
 

kvdb/etcd/db.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"runtime"
+	"strings"
 	"sync"
 	"time"
 
@@ -138,7 +139,7 @@ func NewEtcdClient(ctx context.Context, cfg Config) (*clientv3.Client,
 	context.Context, func(), error) {
 
 	clientCfg := clientv3.Config{
-		Endpoints:          []string{cfg.Host},
+		Endpoints:          strings.Split(cfg.Host, ","),
 		DialTimeout:        etcdConnectionTimeout,
 		Username:           cfg.User,
 		Password:           cfg.Pass,

kvdb/etcd/fixture.go

@@ -5,6 +5,7 @@ package etcd
 
 import (
 	"context"
+	"strings"
 	"testing"
 	"time"
 
@@ -49,7 +50,7 @@ func NewEtcdTestFixture(t *testing.T) *EtcdTestFixture {
 	t.Cleanup(etcdCleanup)
 
 	cli, err := clientv3.New(clientv3.Config{
-		Endpoints: []string{config.Host},
+		Endpoints: strings.Split(config.Host, ","),
 		Username:  config.User,
 		Password:  config.Pass,
 	})

sample-lnd.conf

@@ -1374,7 +1374,7 @@
 
 [etcd]
 
-; Etcd database host.
+; Etcd database host. Supports multiple hosts separated by a comma.
 ; Default:
 ;   db.etcd.host=
 ; Example: