gorums.WithDialTimeout no longer has any effect and can be removed

relab · Jan 7, 2025 · f134d48 · f134d48
1 parent dde5c0e
commit f134d48
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 38 deletions.
diff --git a/cmd/benchmark/main.go b/cmd/benchmark/main.go
@@ -193,7 +193,6 @@ func main() {
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),
-		gorums.WithDialTimeout(10 * time.Second),
 		gorums.WithSendBufferSize(*sendBuffer),
 	}
 

diff --git a/doc/user-guide.md b/doc/user-guide.md
@@ -229,7 +229,6 @@ import (
 
 func ExampleStorageClient() {
   mgr := NewManager(
-    gorums.WithDialTimeout(500*time.Millisecond),
     gorums.WithGrpcDialOptions(
       grpc.WithTransportCredentials(insecure.NewCredentials()),
     ),
@@ -403,7 +402,6 @@ func ExampleStorageClient() {
   }
 
   mgr := NewManager(
-    gorums.WithDialTimeout(50*time.Millisecond),
     gorums.WithGrpcDialOptions(
       grpc.WithTransportCredentials(insecure.NewCredentials()),
     ),

diff --git a/examples/storage/client.go b/examples/storage/client.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"log"
-	"time"
 
 	"github.com/relab/gorums"
 	"github.com/relab/gorums/examples/storage/proto"
@@ -17,7 +16,6 @@ func runClient(addresses []string) {
 
 	// init gorums manager
 	mgr := proto.NewManager(
-		gorums.WithDialTimeout(1*time.Second),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()), // disable TLS
 		),

diff --git a/mgr_test.go b/mgr_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"log"
 	"testing"
-	"time"
 
 	"github.com/relab/gorums"
 	"github.com/relab/gorums/tests/dummy"
@@ -73,7 +72,6 @@ func TestManagerAddNodeWithConn(t *testing.T) {
 	})
 	defer teardown()
 	mgr := gorums.NewRawManager(
-		gorums.WithDialTimeout(100*time.Millisecond),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),

diff --git a/opts.go b/opts.go
@@ -10,21 +10,19 @@ import (
 )
 
 type managerOptions struct {
-	grpcDialOpts    []grpc.DialOption
-	nodeDialTimeout time.Duration
-	logger          *log.Logger
-	noConnect       bool
-	backoff         backoff.Config
-	sendBuffer      uint
-	metadata        metadata.MD
-	perNodeMD       func(uint32) metadata.MD
+	grpcDialOpts []grpc.DialOption
+	logger       *log.Logger
+	noConnect    bool
+	backoff      backoff.Config
+	sendBuffer   uint
+	metadata     metadata.MD
+	perNodeMD    func(uint32) metadata.MD
 }
 
 func newManagerOptions() managerOptions {
 	return managerOptions{
-		backoff:         backoff.DefaultConfig,
-		sendBuffer:      0,
-		nodeDialTimeout: 50 * time.Millisecond,
+		backoff:    backoff.DefaultConfig,
+		sendBuffer: 0,
 	}
 }
 
@@ -34,9 +32,7 @@ type ManagerOption func(*managerOptions)
 // WithDialTimeout returns a ManagerOption which is used to set the dial
 // context timeout to be used when initially connecting to each node in its pool.
 func WithDialTimeout(timeout time.Duration) ManagerOption {
-	return func(o *managerOptions) {
-		o.nodeDialTimeout = timeout
-	}
+	return func(o *managerOptions) {}
 }
 
 // WithGrpcDialOptions returns a ManagerOption which sets any gRPC dial options

diff --git a/rpc_test.go b/rpc_test.go
@@ -105,7 +105,6 @@ func initServer() *gorums.Server {
 
 func gorumsTestMgr() *dummy.Manager {
 	mgr := dummy.NewManager(
-		gorums.WithDialTimeout(time.Second),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),

diff --git a/server_test.go b/server_test.go
@@ -36,7 +36,6 @@ func TestServerCallback(t *testing.T) {
 	md := metadata.New(map[string]string{"message": "hello"})
 
 	mgr := gorums.NewRawManager(
-		gorums.WithDialTimeout(time.Second),
 		gorums.WithMetadata(md),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),

diff --git a/tests/config/config_test.go b/tests/config/config_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	fmt "fmt"
 	"testing"
-	"time"
 
 	gorums "github.com/relab/gorums"
 	"google.golang.org/grpc"
@@ -86,7 +85,6 @@ func TestConfig(t *testing.T) {
 		}
 	}
 	mgr := NewManager(
-		gorums.WithDialTimeout(100*time.Millisecond),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),

diff --git a/tests/correctable/correctable_test.go b/tests/correctable/correctable_test.go
@@ -23,7 +23,6 @@ func run(t *testing.T, n int, div int, corr func(context.Context, *Configuration
 	defer teardown()
 
 	mgr := NewManager(
-		gorums.WithDialTimeout(time.Second),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),

diff --git a/tests/metadata/metadata_test.go b/tests/metadata/metadata_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strconv"
 	"testing"
-	"time"
 
 	"github.com/relab/gorums"
 	"google.golang.org/grpc"
@@ -61,7 +60,6 @@ func TestMetadata(t *testing.T) {
 
 	mgr := NewManager(
 		gorums.WithMetadata(md),
-		gorums.WithDialTimeout(time.Second),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),
@@ -94,7 +92,6 @@ func TestPerNodeMetadata(t *testing.T) {
 
 	mgr := NewManager(
 		gorums.WithPerNodeMetadata(perNodeMD),
-		gorums.WithDialTimeout(time.Second),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),
@@ -121,7 +118,6 @@ func TestCanGetPeerInfo(t *testing.T) {
 	defer teardown()
 
 	mgr := NewManager(
-		gorums.WithDialTimeout(time.Second),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),

diff --git a/tests/oneway/oneway_test.go b/tests/oneway/oneway_test.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/relab/gorums"
 	"github.com/relab/gorums/tests/oneway"
@@ -63,7 +62,6 @@ func setup(t testing.TB, cfgSize int) (cfg *oneway.Configuration, srvs []*oneway
 	}
 
 	mgr := oneway.NewManager(
-		gorums.WithDialTimeout(100*time.Millisecond),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),

diff --git a/tests/ordering/order_test.go b/tests/ordering/order_test.go
@@ -87,7 +87,6 @@ func setup(t *testing.T, cfgSize int) (cfg *Configuration, teardown func()) {
 		return srv
 	})
 	mgr := NewManager(
-		gorums.WithDialTimeout(100*time.Millisecond),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),

diff --git a/tests/qf/qf_test.go b/tests/qf/qf_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"testing"
-	"time"
 
 	"github.com/relab/gorums"
 	"google.golang.org/grpc"
@@ -196,7 +195,6 @@ func BenchmarkFullStackQF(b *testing.B) {
 			return srv
 		})
 		mgr := NewManager(
-			gorums.WithDialTimeout(10*time.Second),
 			gorums.WithGrpcDialOptions(
 				grpc.WithTransportCredentials(insecure.NewCredentials()),
 			),

diff --git a/tests/tls/tls_test.go b/tests/tls/tls_test.go
@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"testing"
-	"time"
 
 	"github.com/relab/gorums"
 	"google.golang.org/grpc"
@@ -47,7 +46,6 @@ func TestTLS(t *testing.T) {
 	defer teardown()
 
 	mgr := NewManager(
-		gorums.WithDialTimeout(100*time.Millisecond),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(credentials.NewClientTLSFromCert(cp, "")),
 		),

diff --git a/tests/unresponsive/unreponsive_test.go b/tests/unresponsive/unreponsive_test.go
@@ -29,7 +29,6 @@ func TestUnresponsive(t *testing.T) {
 	defer teardown()
 
 	mgr := NewManager(
-		gorums.WithDialTimeout(100*time.Millisecond),
 		gorums.WithGrpcDialOptions(
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		),