Skip to content
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

Jump to bottom

receive: Overhaul start up sequence #2892

Merged
merged 7 commits into from
Jul 23, 2020
Merged

receive: Overhaul start up sequence #2892

merged 7 commits into from
Jul 23, 2020

Conversation

kakkoyun
Copy link
Member

@kakkoyun kakkoyun commented Jul 14, 2020 •
edited
Loading

Signed-off-by: Kemal Akkoyun [email protected]

  • I added CHANGELOG entry for this change.

Changes

  • Add more logs for receive start and shutdown sequence.
  • Merge uploader routines (on-demand and recurring).
  • Receive now fails if initial upload fails.

Verification

  • make test-local
  • MINIO_ENABLED=1 REMOTE_WRITE_ENABLED=1 ./scripts/quickstart.sh

@kakkoyun
Add timeout for uploads
642b609 
Add more logs fo receive

Signed-off-by: Kemal Akkoyun <[email protected]>
squat
squat reviewed Jul 14, 2020
View reviewed changes
cmd/thanos/receive.go Outdated Show resolved Hide resolved
squat
squat reviewed Jul 14, 2020
View reviewed changes
cmd/thanos/receive.go Outdated Show resolved Hide resolved
bwplotka
bwplotka reviewed Jul 14, 2020
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Generally ok, some comments on details. Upload flag is non trivial, let's be careful - despite it being hidden

cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
squat
squat reviewed Jul 14, 2020
View reviewed changes
cmd/thanos/receive.go Outdated Show resolved Hide resolved
squat
squat approved these changes Jul 14, 2020
View reviewed changes
Copy link
Member

@squat squat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just some small comments and one thing that may be confusing for users

@kakkoyun kakkoyun force-pushed the receive_shutdown_logs branch from bab4e1b to 5d6a04c Compare July 14, 2020 15:24
@kakkoyun
Add timeout for all uploads
437c7b6 
Merge uploader routines

Address review issues

Signed-off-by: Kemal Akkoyun <[email protected]>
@kakkoyun kakkoyun force-pushed the receive_shutdown_logs branch from 5d6a04c to 437c7b6 Compare July 14, 2020 15:26
kakkoyun added 2 commits July 14, 2020 17:40
@kakkoyun
Fix error handling
a3586b2 
Signed-off-by: Kemal Akkoyun <[email protected]>
@kakkoyun
Fix white noise
b977248 
Signed-off-by: Kemal Akkoyun <[email protected]>
@kakkoyun kakkoyun requested a review from bwplotka July 15, 2020 14:15
bwplotka
bwplotka reviewed Jul 15, 2020
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM overall, just some nits. The biggest thing is with the timeout, I think we need to improve it before merge.

Thanks!

pkg/server/http/http.go Outdated Show resolved Hide resolved
pkg/server/grpc/grpc.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Outdated Show resolved Hide resolved
cmd/thanos/receive.go Show resolved Hide resolved
@kakkoyun kakkoyun force-pushed the receive_shutdown_logs branch from 5f8d249 to d9ced69 Compare July 20, 2020 09:41
@kakkoyun kakkoyun changed the title receive: Add timeout for uploads receive: Overhaul start up sequence Jul 20, 2020
@kakkoyun
Trigger CI
40c5e9e 
Signed-off-by: Kemal Akkoyun <[email protected]>
bwplotka
bwplotka approved these changes Jul 23, 2020
View reviewed changes
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you this will help enourmously with clear messages 💪

@bwplotka bwplotka merged commit b4d42ef into thanos-io:master Jul 23, 2020
@kakkoyun kakkoyun deleted the receive_shutdown_logs branch July 23, 2020 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squat squat squat approved these changes

@bwplotka bwplotka bwplotka approved these changes

@brancz brancz brancz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kakkoyun @brancz @bwplotka @squat