diff options
| author | karthik nayak <knayak@gitlab.com> | 2023-01-30 14:04:23 +0300 |
|---|---|---|
| committer | karthik nayak <knayak@gitlab.com> | 2023-01-30 14:04:23 +0300 |
| commit | 4d9d7ce306a59f02cda40d279f00fd776fcddb03 (patch) | |
| tree | f32dd056403c02837e1ad4746cd8567f5f89bc3b | |
| parent | 9e9717d60e83bc08e6bcb3ca0e636edf1668a9b3 (diff) | |
| parent | 0a3ea6f8b4b7e1ffefeedfb2e1581f33460e47b5 (diff) | |
Merge branch 'pks-streamcache-improve-pipe-backpressure-test' into 'master'
streamcache: Improve test for pipe backpressure
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5305
Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | internal/streamcache/pipe_test.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/internal/streamcache/pipe_test.go b/internal/streamcache/pipe_test.go index 3917c717c..ffc9f63b3 100644 --- a/internal/streamcache/pipe_test.go +++ b/internal/streamcache/pipe_test.go @@ -135,6 +135,11 @@ func TestPipe_backpressure(t *testing.T) { _, err := io.ReadFull(pr, buf) require.NoError(t, err) output = append(output, buf...) + require.Eventually(t, func() bool { + return atomic.LoadInt64(&wprogress) == 2 + }, time.Minute, time.Millisecond, "writer should have read 2 bytes") + + // We should not see any progress until we try to read more bytes. time.Sleep(10 * time.Millisecond) require.Equal(t, int64(2), atomic.LoadInt64(&wprogress), "writer should be blocked after 2 bytes") |