ReadTimeout => ReadTimeoutSeconds

Author: pooknull

cmd/bootstrap/async_replication.go

@@ -87,7 +87,7 @@ func bootstrapAsyncReplication(ctx context.Context) error {
 	if err != nil {
 		return errors.Wrap(err, "get read timeout")
 	}
-	params.ReadTimeout = readTimeout
+	params.ReadTimeoutSeconds = readTimeout
 
 	db, err := database.NewDatabase(ctx, params)
 	if err != nil {
@@ -219,7 +219,7 @@ func getTopology(ctx context.Context, fqdn string, peers sets.Set[string]) (stri
 		if err != nil {
 			return "", nil, errors.Wrap(err, "get read timeout")
 		}
-		params.ReadTimeout = readTimeout
+		params.ReadTimeoutSeconds = readTimeout
 
 		db, err := database.NewDatabase(ctx, params)
 		if err != nil {
@@ -285,7 +285,7 @@ func selectDonor(ctx context.Context, fqdn, primary string, replicas []string) (
 		if err != nil {
 			return "", errors.Wrap(err, "get read timeout")
 		}
-		params.ReadTimeout = readTimeout
+		params.ReadTimeoutSeconds = readTimeout
 
 		db, err := database.NewDatabase(ctx, params)
 		if err != nil {

cmd/db/db.go

@@ -29,16 +29,16 @@ type DBParams struct {
 	Host string
 	Port int32
 
-	ReadTimeout uint32 // in seconds
+	ReadTimeoutSeconds uint32
 }
 
 func (p *DBParams) setDefaults() {
 	if p.Port == 0 {
 		p.Port = defs.DefaultAdminPort
 	}
 
-	if p.ReadTimeout == 0 {
-		p.ReadTimeout = 10
+	if p.ReadTimeoutSeconds == 0 {
+		p.ReadTimeoutSeconds = 10
 	}
 }
 
@@ -55,7 +55,7 @@ func (p *DBParams) DSN() string {
 	config.Params = map[string]string{
 		"interpolateParams": "true",
 		"timeout":           "10s",
-		"readTimeout":       fmt.Sprintf("%ds", p.ReadTimeout),
+		"readTimeout":       fmt.Sprintf("%ds", p.ReadTimeoutSeconds),
 		"writeTimeout":      "10s",
 		"tls":               "preferred",
 	}