Add DB connection retries

contrib/analyze-local-images/vendor/github.com/coreos/clair/database/pgsql/pgsql.go

@@ -98,6 +98,18 @@ func (pgSQL *pgSQL) Ping() bool {
 func Open(config *config.DatabaseConfig) (database.Datastore, error) {
 	// Run migrations.
 	if err := migrate(config.Source); err != nil {
+		try.Do(func(attempt int) (retry bool, err error) {
+			retry = attempt < 5 // try 5 times
+			defer func() {
+				if r := recover(); r != nil {
+					err = errors.New(fmt.Sprintf("panic: %v", r))
+				}
+			}()
+			value, err = SomeFunction()
+			return
+		})
+	}
+	if err != nil {
 		log.Error(err)
 		return nil, database.ErrCantOpen
 	}
@@ -105,8 +117,21 @@ func Open(config *config.DatabaseConfig) (database.Datastore, error) {
 	// Open database.
 	db, err := sql.Open("postgres", config.Source)
 	if err != nil {
-		log.Error(err)
+		try.Do(func(attempt int) (retry bool, err error) {
-		return nil, database.ErrCantOpen
+		retry = attempt < 5 // try 5 times
+		defer func() {
+			if r := recover(); r != nil {
+				err = errors.New(fmt.Sprintf("panic: %v", r))
+			}
+		}()
+		value, err = SomeFunction()
+		return
+	})
+	}
+
+	if err != nil {
+	log.Error(err)
+	return nil, database.ErrCantOpen
 	}
 
 	// Initialize cache.
@@ -220,13 +245,37 @@ func OpenForTest(name string, withTestData bool) (*pgSQLTest, error) {
 
 	// Create database.
 	if err := createDatabase(dataSourceDefaultDatabase, dbName); err != nil {
+		try.Do(func(attempt int) (retry bool, err error) {
+			retry = attempt < 5 // try 5 times
+			defer func() {
+				if r := recover(); r != nil {
+					err = errors.New(fmt.Sprintf("panic: %v", r))
+				}
+			}()
+			value, err = SomeFunction()
+			return
+		})
+		}
+		if err != nil {
 		log.Error(err)
 		return nil, database.ErrCantOpen
-	}
+		}
 
 	// Open database.
 	db, err := Open(&config.DatabaseConfig{Source: dataSourceTestDatabase, CacheSize: 0})
-	if err != nil {
+	try.Do(func(attempt int) (retry bool, err error) {
+		retry = attempt < 5 // try 5 times
+		defer func() {
+			if r := recover(); r != nil {
+				err = errors.New(fmt.Sprintf("panic: %v", r))
+			}
+		}()
+		value, err = SomeFunction()
+		return
+	})
+}
+
+if err != nil {
 		dropDatabase(dataSourceDefaultDatabase, dbName)
 		log.Error(err)
 		return nil, database.ErrCantOpen
@@ -237,11 +286,20 @@ func OpenForTest(name string, withTestData bool) (*pgSQLTest, error) {
 		_, filename, _, _ := runtime.Caller(0)
 		d, _ := ioutil.ReadFile(path.Join(path.Dir(filename)) + "/testdata/data.sql")
 		_, err = db.(*pgSQL).Exec(string(d))
-		if err != nil {
+		try.Do(func(attempt int) (retry bool, err error) {
-			dropDatabase(dataSourceDefaultDatabase, dbName)
+			retry = attempt < 5 // try 5 times
-			log.Error(err)
+			defer func() {
-			return nil, database.ErrCantOpen
+				if r := recover(); r != nil {
-		}
+					err = errors.New(fmt.Sprintf("panic: %v", r))
+				}
+			}()
+			value, err = SomeFunction()
+			return
+		})
+	}
+	if err != nil {
+		log.Error(err)
+		return nil, database.ErrCantOpen
 	}
 
 	return &pgSQLTest{

contrib/analyze-local-images/vendor/src/github.com/coreos/clair

@@ -0,0 +1 @@
+Subproject commit 97347ec44d927c854b93d6722964aa459e42a106

contrib/analyze-local-images/vendor/src/github.com/coreos/go-systemd

@@ -0,0 +1 @@
+Subproject commit a63dfec412dc3675ec36888f359f8a1e5c3f740d

contrib/analyze-local-images/vendor/src/github.com/coreos/pkg

@@ -0,0 +1 @@
+Subproject commit 3ac0863d7acf3bc44daf49afef8919af12f704ef

contrib/analyze-local-images/vendor/src/github.com/fatih/color

@@ -0,0 +1 @@
+Subproject commit 87d4004f2ab62d0d255e0a38f1680aa534549fe3

contrib/analyze-local-images/vendor/src/github.com/kr/text

@@ -0,0 +1 @@
+Subproject commit 7cafcd837844e784b526369c9bce262804aebc60

contrib/analyze-local-images/vendor/src/github.com/mattn/go-colorable

@@ -0,0 +1 @@
+Subproject commit ed8eb9e318d7a84ce5915b495b7d35e0cfe7b5a8

contrib/analyze-local-images/vendor/src/github.com/mattn/go-isatty

@@ -0,0 +1 @@
+Subproject commit 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8