Make connection to ETCD blocking - otherwise it hangs if ETCD can't b…

…e contacted
livepeer · Jun 9, 2021 · e23cef3 · e23cef3
1 parent 161537e
commit e23cef3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/go.mod b/go.mod
@@ -29,6 +29,7 @@ require (
 	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
 	golang.org/x/text v0.3.6
 	google.golang.org/api v0.46.0
+	google.golang.org/grpc v1.38.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 

diff --git a/internal/app/mistapiconnector/mistapiconnector_app.go b/internal/app/mistapiconnector/mistapiconnector_app.go
@@ -23,6 +23,7 @@ import (
 	"go.etcd.io/etcd/client/pkg/v3/transport"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/client/v3/concurrency"
+	"google.golang.org/grpc"
 )
 
 const streamPlaybackPrefix = "playback_"
@@ -108,6 +109,7 @@ func NewMac(mistHost string, mapi *mist.API, lapi *livepeer.API, balancerHost st
 			DialTimeout:      etcdDialTimeout,
 			AutoSyncInterval: etcdAutoSyncInterval,
 			TLS:              tcfg,
+			DialOptions:      []grpc.DialOption{grpc.WithBlock()},
 		})
 		if err != nil {
 			err = fmt.Errorf("mist-api-connector: Error connecting ETCD err=%w", err)