Skip to content
New issue

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

#

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

Already on GitHub? # to your account

readdb: close and open readdb on Run #65

Merged
merged 1 commit into from
Jul 26, 2019
Merged

readdb: close and open readdb on Run #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 17 additions & 12 deletions internal/services/configstore/readdb/readdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,10 @@ func NewReadDB(ctx context.Context, logger *zap.Logger, dataDir string, e *etcd.
if err := os.MkdirAll(dataDir, 0770); err != nil {
return nil, err
}
rdb, err := db.NewDB(db.Sqlite3, filepath.Join(dataDir, "db"))
if err != nil {
return nil, err
}

// populate readdb
if err := rdb.Create(ctx, Stmts); err != nil {
return nil, err
}

readDB := &ReadDB{
log: logger.Sugar(),
dataDir: dataDir,
rdb: rdb,
e: e,
ost: ost,
dm: dm,
Expand Down Expand Up @@ -114,7 +104,9 @@ func (r *ReadDB) Initialize(ctx context.Context) error {

func (r *ReadDB) ResetDB(ctx context.Context) error {
// TODO(sgotti) this needs to be protected by a mutex
r.rdb.Close()
if r.rdb != nil {
r.rdb.Close()
}

// drop rdb
if err := os.Remove(filepath.Join(r.dataDir, "db")); err != nil {
Expand Down Expand Up @@ -406,6 +398,20 @@ func (r *ReadDB) SyncRDB(ctx context.Context) error {
}

func (r *ReadDB) Run(ctx context.Context) error {
if r.rdb != nil {
r.rdb.Close()
}
rdb, err := db.NewDB(db.Sqlite3, filepath.Join(r.dataDir, "db"))
if err != nil {
return err
}
r.rdb = rdb

// populate readdb
if err := r.rdb.Create(ctx, Stmts); err != nil {
return err
}

revision, err := r.GetRevision(ctx)
if err != nil {
return err
Expand Down Expand Up @@ -468,7 +474,6 @@ func (r *ReadDB) Run(ctx context.Context) error {
case <-ctx.Done():
r.log.Infof("readdb exiting")
cancel()
r.rdb.Close()
return nil
case <-errCh:
// cancel context and wait for the all the goroutines to exit
Expand Down
30 changes: 18 additions & 12 deletions internal/services/runservice/readdb/readdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,23 +113,13 @@ func NewReadDB(ctx context.Context, logger *zap.Logger, dataDir string, e *etcd.
if err := os.MkdirAll(dataDir, 0770); err != nil {
return nil, err
}
rdb, err := db.NewDB(db.Sqlite3, filepath.Join(dataDir, "db"))
if err != nil {
return nil, err
}

// populate readdb
if err := rdb.Create(ctx, Stmts); err != nil {
return nil, err
}

readDB := &ReadDB{
log: logger.Sugar(),
e: e,
dataDir: dataDir,
ost: ost,
dm: dm,
rdb: rdb,
}

return readDB, nil
Expand Down Expand Up @@ -164,7 +154,9 @@ func (r *ReadDB) Initialize(ctx context.Context) error {

func (r *ReadDB) ResetDB(ctx context.Context) error {
// TODO(sgotti) this needs to be protected by a mutex
r.rdb.Close()
if r.rdb != nil {
r.rdb.Close()
}

// drop rdb
if err := os.Remove(filepath.Join(r.dataDir, "db")); err != nil {
Expand Down Expand Up @@ -256,6 +248,21 @@ func (r *ReadDB) SyncRDB(ctx context.Context) error {
}

func (r *ReadDB) Run(ctx context.Context) error {
if r.rdb != nil {
r.rdb.Close()
}
rdb, err := db.NewDB(db.Sqlite3, filepath.Join(r.dataDir, "db"))
if err != nil {
return err
}

r.rdb = rdb

// populate readdb
if err := r.rdb.Create(ctx, Stmts); err != nil {
return err
}

revision, err := r.GetRevision(ctx)
if err != nil {
return err
Expand Down Expand Up @@ -328,7 +335,6 @@ func (r *ReadDB) Run(ctx context.Context) error {
case <-ctx.Done():
r.log.Infof("readdb exiting")
cancel()
r.rdb.Close()
return nil
case <-errCh:
// cancel context and wait for the all the goroutines to exit
Expand Down