Skip to content

fix(init): try ping postgres to check if it is ready #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 17, 2022
Merged

fix(init): try ping postgres to check if it is ready #586

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44bd017
fix(init): try ping postgres to check if it is ready
cnlangzi Mar 15, 2022
45262d6
fix(init): try ping postgres to check if it is ready
cnlangzi Mar 15, 2022
b8fe2b0
fix(datastore):fixed IsMigrated
cnlangzi Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions code/go/0chain.net/blobbercore/datastore/postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ func (store *postgresStore) Open() error {
return common.NewErrorf("db_open_error", "Error opening the DB connection: %v", err)
}

if err := sqldb.Ping(); err != nil {
return common.NewErrorf("db_open_error", "Error opening the DB connection: %v", err)
}

sqldb.SetMaxIdleConns(100)
sqldb.SetMaxOpenConns(200)
sqldb.SetConnMaxLifetime(30 * time.Second)
Expand Down Expand Up @@ -86,10 +90,8 @@ func (store *postgresStore) AutoMigrate() error {
for i := 0; i < len(releases); i++ {
v := releases[i]
fmt.Print("\r + ", v.Version, " ")
isMigrated, err := store.IsMigrated(v)
if err != nil {
return err
}
isMigrated := store.IsMigrated(v)

if isMigrated {
fmt.Print(" [SKIP]\n")
continue
Expand All @@ -108,20 +110,11 @@ func (store *postgresStore) AutoMigrate() error {
return nil
}

func (store *postgresStore) IsMigrated(m Migration) (bool, error) {
var version string
err := store.db.
Raw(`select version from "migrations" where version=?`, m.Version).
Pluck("version", &version).
Error
func (store *postgresStore) IsMigrated(m Migration) bool {

if err == nil {
return false, nil
}

if err == gorm.ErrRecordNotFound {
return false, nil
}
var c int64
store.db.
Raw(`SELECT 1 FROM "migrations" WHERE version=?`, m.Version).Count(&c)

return false, err
return c > 0
}