Merge pull request #184 from SiaFoundation/christopher/fix-timeout-v1-scan

Prevent scanning functions from hanging on some v1 hosts

Author: n8maninger

cmd/explored/main.go

@@ -46,7 +46,7 @@ var cfg = config.Config{
 	},
 	Scanner: config.Scanner{
 		Threads:             10,
-		Timeout:             30 * time.Second,
+		Timeout:             1 * time.Minute,
 		MaxLastScan:         1 * time.Hour,
 		MinLastAnnouncement: 365 * 24 * time.Hour,
 	},

explorer/scan.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	crhpv2 "go.sia.tech/core/rhp/v2"
+	crhpv3 "go.sia.tech/core/rhp/v3"
 	"go.sia.tech/core/types"
 	crhpv4 "go.sia.tech/coreutils/rhp/v4"
 	"go.sia.tech/coreutils/rhp/v4/siamux"
@@ -53,53 +54,91 @@ func (e *Explorer) waitForSync() error {
 	return nil
 }
 
-func (e *Explorer) scanV1Host(locator geoip.Locator, host UnscannedHost) (HostScan, error) {
-	ctx, cancel := context.WithTimeout(e.ctx, e.scanCfg.Timeout)
-	defer cancel()
+func rhpv2Settings(ctx context.Context, publicKey types.PublicKey, netAddress string) (crhpv2.HostSettings, error) {
+	conn, err := (&net.Dialer{}).DialContext(ctx, "tcp", netAddress)
+	if err != nil {
+		return crhpv2.HostSettings{}, fmt.Errorf("failed to connect to host: %w", err)
+	}
+	defer conn.Close()
+
+	// default timeout if context doesn't have one
+	deadline := time.Now().Add(30 * time.Second)
+	if dl, ok := ctx.Deadline(); ok && !dl.IsZero() {
+		deadline = dl
+	}
+	if err := conn.SetDeadline(deadline); err != nil {
+		return crhpv2.HostSettings{}, fmt.Errorf("failed to set deadline: %w", err)
+	}
 
-	dialer := (&net.Dialer{})
+	t, err := crhpv2.NewRenterTransport(conn, publicKey)
+	if err != nil {
+		return crhpv2.HostSettings{}, fmt.Errorf("failed to establish rhpv2 transport: %w", err)
+	}
+	defer t.Close()
 
-	conn, err := dialer.DialContext(ctx, "tcp", host.NetAddress)
+	settings, err := rhpv2.RPCSettings(ctx, t)
 	if err != nil {
-		return HostScan{}, fmt.Errorf("scanHost: failed to connect to host: %w", err)
+		return crhpv2.HostSettings{}, fmt.Errorf("failed to call settings RPC: %w", err)
+	}
+	return settings, nil
+}
+
+func rhpv3PriceTable(ctx context.Context, publicKey types.PublicKey, netAddress string) (priceTable crhpv3.HostPriceTable, err error) {
+	conn, err := (&net.Dialer{}).DialContext(ctx, "tcp", netAddress)
+	if err != nil {
+		return crhpv3.HostPriceTable{}, fmt.Errorf("failed to connect to siamux port: %w", err)
 	}
 	defer conn.Close()
 
-	transport, err := crhpv2.NewRenterTransport(conn, host.PublicKey)
+	// default timeout if context doesn't have one
+	deadline := time.Now().Add(30 * time.Second)
+	if dl, ok := ctx.Deadline(); ok && !dl.IsZero() {
+		deadline = dl
+	}
+	if err := conn.SetDeadline(deadline); err != nil {
+		return crhpv3.HostPriceTable{}, fmt.Errorf("failed to set deadline: %w", err)
+	}
+
+	v3Session, err := rhpv3.NewSession(ctx, conn, publicKey, nil, nil)
 	if err != nil {
-		return HostScan{}, fmt.Errorf("scanHost: failed to establish v2 transport: %w", err)
+		return crhpv3.HostPriceTable{}, fmt.Errorf("failed to establish rhpv3 transport: %w", err)
 	}
-	defer transport.Close()
+	defer v3Session.Close()
 
-	settings, err := rhpv2.RPCSettings(ctx, transport)
+	table, err := v3Session.ScanPriceTable()
 	if err != nil {
-		return HostScan{}, fmt.Errorf("scanHost: failed to get host settings: %w", err)
+		return crhpv3.HostPriceTable{}, fmt.Errorf("failed to scan price table: %w", err)
 	}
+	return table, nil
+}
 
-	hostIP, _, err := net.SplitHostPort(settings.NetAddress)
+func (e *Explorer) scanV1Host(locator geoip.Locator, host UnscannedHost) (HostScan, error) {
+	ctx, cancel := context.WithTimeout(e.ctx, e.scanCfg.Timeout)
+	defer cancel()
+
+	settings, err := rhpv2Settings(ctx, host.PublicKey, host.NetAddress)
 	if err != nil {
-		return HostScan{}, fmt.Errorf("scanHost: failed to parse net address: %w", err)
+		return HostScan{}, fmt.Errorf("scanV1Host: failed to get host settings: %w", err)
 	}
 
-	resolved, err := net.ResolveIPAddr("ip", hostIP)
+	hostIP, _, err := net.SplitHostPort(settings.NetAddress)
 	if err != nil {
-		return HostScan{}, fmt.Errorf("scanHost: failed to resolve host address: %w", err)
+		return HostScan{}, fmt.Errorf("scanV1Host: failed to parse net address: %w", err)
 	}
 
-	location, err := locator.Locate(resolved)
+	table, err := rhpv3PriceTable(ctx, host.PublicKey, net.JoinHostPort(hostIP, settings.SiaMuxPort))
 	if err != nil {
-		e.log.Debug("Failed to resolve IP geolocation, not setting country code", zap.String("addr", host.NetAddress))
+		return HostScan{}, fmt.Errorf("scanV1Host: failed to get price table: %w", err)
 	}
 
-	v3Addr := net.JoinHostPort(hostIP, settings.SiaMuxPort)
-	v3Session, err := rhpv3.NewSession(ctx, host.PublicKey, v3Addr, e.cm, nil)
+	resolved, err := net.ResolveIPAddr("ip", hostIP)
 	if err != nil {
-		return HostScan{}, fmt.Errorf("scanHost: failed to establish v3 transport: %w", err)
+		return HostScan{}, fmt.Errorf("scanV1Host: failed to resolve host address: %w", err)
 	}
 
-	table, err := v3Session.ScanPriceTable()
+	location, err := locator.Locate(resolved)
 	if err != nil {
-		return HostScan{}, fmt.Errorf("scanHost: failed to scan price table: %w", err)
+		e.log.Debug("Failed to resolve IP geolocation, not setting country code", zap.String("addr", host.NetAddress))
 	}
 
 	return HostScan{

internal/rhp/v3/rhp.go

@@ -799,11 +799,7 @@ func AccountPayment(account rhp3.Account, privateKey types.PrivateKey) PaymentMe
 }
 
 // NewSession creates a new session with a host
-func NewSession(ctx context.Context, hostKey types.PublicKey, hostAddr string, cm ChainManager, w Wallet) (*Session, error) {
-	conn, err := (&net.Dialer{}).DialContext(ctx, "tcp", hostAddr)
-	if err != nil {
-		return nil, fmt.Errorf("failed to dial host: %w", err)
-	}
+func NewSession(ctx context.Context, conn net.Conn, hostKey types.PublicKey, cm ChainManager, w Wallet) (*Session, error) {
 	t, err := rhp3.NewRenterTransport(conn, hostKey)
 	if err != nil {
 		conn.Close()