docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make default 60s timeout for rethindkb (default is 0) 

Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
This commit is contained in:
Riyaz Faizullabhoy 2016-05-06 17:39:23 -07:00
parent 61ac085a26
commit a69f9b85e4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/rethinkdb/bootstrap.go
View File

@ -3,11 +3,15 @@ package rethinkdb
import ( import (
"fmt" "fmt"
"strings" "strings"
"time"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"gopkg.in/dancannon/gorethink.v2" "gopkg.in/dancannon/gorethink.v2"
) )
// Wait for 60 seconds maximum on Wait() calls for rethink
var timeoutOpt = gorethink.WaitOpts{Timeout: time.Minute.Seconds()}
func makeDB(session *gorethink.Session, name string) error { func makeDB(session *gorethink.Session, name string) error {
_, err := gorethink.DBCreate(name).RunWrite(session) _, err := gorethink.DBCreate(name).RunWrite(session)
if err != nil { if err != nil {
@ -17,7 +21,7 @@ func makeDB(session *gorethink.Session, name string) error {
return err return err
} }
resp, err := gorethink.DB(name).Wait().Run(session) resp, err := gorethink.DB(name).Wait(timeoutOpt).Run(session)
if resp != nil { if resp != nil {
resp.Close() resp.Close()
} }
@ -41,7 +45,7 @@ func (t Table) term(dbName string) gorethink.Term {
} }
func (t Table) wait(session *gorethink.Session, dbName string) error { func (t Table) wait(session *gorethink.Session, dbName string) error {
resp, err := t.term(dbName).Wait().Run(session) resp, err := t.term(dbName).Wait(timeoutOpt).Run(session)
if resp != nil { if resp != nil {
resp.Close() resp.Close()