simulator: drop isDialError() alltogether

Will come up with a workable approach.
alphasoc · Oct 27, 2021 · 270f8fe · 270f8fe
1 parent a382821
commit 270f8fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/simulator/miner.go b/simulator/miner.go
@@ -44,8 +44,7 @@ func (s *StratumMiner) Simulate(ctx context.Context, dst string) error {
 		conn.Close()
 	}
 
-	// TODO Dropping isDialError() as an error as it's causing too many io-timeout messages.
-	if isSoftError(err, "connect: connection refused") || isDialError(err) {
+	if isSoftError(err, "connect: connection refused") {
 		return nil
 	}
 	return err

diff --git a/simulator/simulator.go b/simulator/simulator.go
@@ -72,8 +72,8 @@ func (s *TCPConnectSimulator) Simulate(ctx context.Context, dst string) error {
 	if conn != nil {
 		conn.Close()
 	}
-	// TODO: Dropping isDialError() check, as it's causing too many io-timeout messages.
-	if err != nil && !isSoftError(err, "connect: connection refused") && !isDialError(err) {
+	// Ignore "connection refused" and timeouts.
+	if err != nil && !isSoftError(err, "connect: connection refused") {
 		return err
 	}
 	return nil
@@ -110,25 +110,14 @@ func (s *DNSResolveSimulator) Simulate(ctx context.Context, dst string) error {
 	host = utils.FQDN(host)
 
 	_, err := r.LookupHost(ctx, host)
-	// Ignore "no such host".  Will ignore timeouts as well, so check for dial errors.
-	// TODO: Dropping isDialError() check, as it's causing too many io-timeout messages.
-	if err != nil && !isSoftError(err, "no such host") && !isDialError(err) {
+	// Ignore "no such host" and timeouts.
+	if err != nil && !isSoftError(err, "no such host") {
 		return err
 	}
 
 	return nil
 }
 
-// isDialError scans an error message for signs of a dial error, returning a boolean.
-func isDialError(err error) bool {
-	// Errors we're after are of the form:
-	// lookup abc.sandbox.alphasoc.xyz. on A.B.C.D:53: dial udp E.F.G.H:0->A.B.C.D:53: i/o timeout
-	// TODO: something more robust?  I don't want to double-dial though.
-	return isTimeout(err) &&
-		strings.Contains(err.Error(), "dial") &&
-		strings.Count(err.Error(), "->") == 1
-}
-
 func isTimeout(err error) bool {
 	netErr, ok := err.(net.Error)
 	if !ok {

diff --git a/simulator/tunnel-dns.go b/simulator/tunnel-dns.go
@@ -56,8 +56,8 @@ func (s *Tunnel) Simulate(ctx context.Context, host string) error {
 		defer cancelFn()
 		_, err := r.LookupTXT(ctx, fmt.Sprintf("%s.%s", label, host))
 
-		// Ignore "no such host".  Will ignore timeouts as well, so check for dial errors.
-		if err != nil && !isSoftError(err, "no such host") && !isDialError(err) {
+		// Ignore "no such host".  Will ignore timeouts as well.
+		if err != nil && !isSoftError(err, "no such host") {
 			return err
 		}