浏览代码

remove query level timeouts

Having a timeout on the query level introduces some very
subtle race condtions which need to be addressed before enabling.
Chris Bannister 10 年之前
父节点
当前提交
3f4c55c8f6
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. 1 6
      conn.go
  2. 1 0
      conn_test.go

+ 1 - 6
conn.go

@@ -379,12 +379,7 @@ func (c *Conn) exec(req frameWriter, tracer Tracer) (frame, error) {
 		return nil, err
 	}
 
-	select {
-	case err = <-call.resp:
-	case <-time.After(c.timeout):
-		c.handleTimeout()
-		return nil, ErrTimeoutNoResponse
-	}
+	err = <-call.resp
 
 	if err != nil {
 		return nil, err

+ 1 - 0
conn_test.go

@@ -472,6 +472,7 @@ func TestPolicyConnPoolSSL(t *testing.T) {
 }
 
 func TestQueryTimeout(t *testing.T) {
+	t.Skip("skipping until query timeouts are enabled")
 	srv := NewTestServer(t, protoVersion2)
 	defer srv.Stop()