Skip to content
This repository has been archived by the owner on Aug 23, 2023. It is now read-only.

Use non-blocking write to flushed #1837

Merged
merged 2 commits into from
Jun 4, 2020
Merged

Conversation

shanson7
Copy link
Collaborator

Fix #1836

Simplest change is to use a non-blocking write to the flushed chan. Possibly more ideal would be for the Queueing thread to trigger a flush, rather than flush manually, but that would be a larger change that would need more proof of correctness.

@shanson7
Copy link
Collaborator Author

Tests are hitting the timeout. Just running the memory tests locally takes over a minute, almost entirely in memory_find_test.go.

With additional testing, perhaps we should raise the timeouts or run some tests in parallel. Either way, succeeded in 9 min 51 sec (9 whole seconds to spare!) on the second run.

Copy link
Contributor

@replay replay left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@robert-milan robert-milan merged commit 74ba401 into grafana:master Jun 4, 2020
@shanson7 shanson7 deleted the fix_1836 branch October 22, 2021 16:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deadlock in memory/write_queue
3 participants