Merge pull request #36 from storageos/feature/DEV-1867-cli-should-sup…

…port-multiple-endpoint add timeouts for dial requests
storageos · Jan 26, 2018 · 3a40323 · 3a40323
2 parents e06f2d8 + e8fe902
commit 3a40323
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/netutil/multidialer.go b/netutil/multidialer.go
@@ -86,7 +86,11 @@ func (m *MultiDialer) DialContext(ctx context.Context, network, ignoredAddress s
 			return nil, ctx.Err()
 
 		default:
-			conn, err := m.Dialer.DialContext(ctx, network, addr)
+			// Create new child context for a single dial
+			dctx, cancel := context.WithTimeout(ctx, time.Second)
+			defer cancel()
+
+			conn, err := m.Dialer.DialContext(dctx, network, addr)
 			if err != nil {
 				continue
 			}