Merge feat-remote-write-metadata to 2.18.1-grafana #6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Similarly to the WAL watcher, its purpose is to observe the scrape manager and pull metadata. Then, send it to a remote storage. Signed-off-by: gotjosh <josue@grafana.com>
Signed-off-by: gotjosh <josue@grafana.com>
The client is now protected by a lock. Use the function instead of the attribute directly to ensure we take and release the lock. Signed-off-by: gotjosh <josue@grafana.com>
gotjosh
changed the title
gotjosh
commented
May 15, 2020
| return nil | ||
| } | ||
|
|
||
| func sendWriteRequestWithBackoff(ctx context.Context, cfg config.QueueConfig, s func() StorageClient, l log.Logger, req []byte, reportFailureFunc func()) (elapsed float64, err error) { |
There was a problem hiding this comment.
The conflict I had came from this function - before, it was receiving a StorageClient directly. Now, it takes a function which is client() that returns the StorageClient but with a lock.
rfratto
approved these changes
May 15, 2020
gotjosh
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The 2.18 version of #4
The biggest change I could see is that we now protect the remote-write client with a lock, I'll need to do a bit more testing before merging.