code review 14780043: database/sql: Fix deadlock in test

database/sql: Fix deadlock in test

New test added in CL 14611045 causes a deadlock when
running the tests with GOMAXPROCS > 1 because the fakedb
driver always waits when opening a new connection after
running TestConnectionLeak.

[Hierro, 2013-10-17 14:23:10]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2013-10-17 16:02:08]

LGTM

I'll tweak the commit message for accuracy when submitting.



On Thu, Oct 17, 2013 at 4:23 AM, <alberto.garcia.hierro@gmail.com> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> database/sql: Fix deadlock in test
>
> New test added in CL 14611045 causes a deadlock when
> running the tests with GOMAXPROCS > 1 because the fakedb
> driver always waits when opening a new connection after
> running TestConnectionLeak.
>
> Please review this at
https://codereview.appspot.**com/14780043/<https://codereview.appspot.com/147...
>
> Affected files (+2, -0 lines):
>   M src/pkg/database/sql/fakedb_**test.go
>
>
> Index: src/pkg/database/sql/fakedb_**test.go
> ==============================**==============================**=======
> --- a/src/pkg/database/sql/fakedb_**test.go
> +++ b/src/pkg/database/sql/fakedb_**test.go
> @@ -151,6 +151,8 @@
>         if d.waitCh != nil {
>                 d.waitingCh <- struct{}{}
>                 <-d.waitCh
> +               d.waitCh = nil
> +               d.waitingCh = nil
>         }
>         return conn, nil
>  }
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>

[bradfitz, 2013-10-17 16:02:39]

*** Submitted as https://code.google.com/p/go/source/detail?r=b3d719b62cfb ***

database/sql: make tests repeatable with -cpu=n,n

New test added in CL 14611045 causes a deadlock when
running the tests with -cpu=n,n because the fakedb
driver always waits when opening a new connection after
running TestConnectionLeak.  Reset its state after.

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/14780043

Committer: Brad Fitzpatrick <bradfitz@golang.org>