Skip to content

receive: Overhaul start up sequence #2892

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
bwplotka merged 7 commits into from
Jul 23, 2020
Merged

receive: Overhaul start up sequence #2892

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
642b609
Add timeout for uploads
kakkoyun Jul 14, 2020
437c7b6
Add timeout for all uploads
kakkoyun Jul 14, 2020
a3586b2
Fix error handling
kakkoyun Jul 14, 2020
b977248
Fix white noise
kakkoyun Jul 15, 2020
6c7457e
Address review issues
kakkoyun Jul 20, 2020
d9ced69
Remove upload timeouts, addreessed in another PR
kakkoyun Jul 20, 2020
40c5e9e
Trigger CI
kakkoyun Jul 21, 2020
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
Prev Previous commit
Next Next commit
Fix error handling 
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
  • Loading branch information
@kakkoyun
kakkoyun committed Jul 14, 2020
commit a3586b2134467cc213a5acd2ba05835583457184
7 changes: 3 additions & 4 deletions cmd/thanos/receive.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,16 +508,15 @@ func runReceive(

if err := dbs.Sync(ctx); err != nil {
level.Warn(logger).Log("msg", "upload failed", "elapsed", time.Since(start), "err", err)
} else {
level.Debug(logger).Log("msg", "upload done", "elapsed", time.Since(start))
return err
}

level.Debug(logger).Log("msg", "upload done", "elapsed", time.Since(start))
return nil
}
{
level.Info(logger).Log("msg", "upload enabled, starting initial sync")
if err := upload(context.Background()); err != nil {
return errors.Wrapf(err, "initial upload failed")
return errors.Wrap(err, "initial upload failed")
}
level.Info(logger).Log("msg", "initial sync done")
}
Expand Down