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

nsqd: adds delayed retry to TestDiskQueueSyncAfterRead #783

Merged
merged 1 commit into from
Aug 5, 2016
Merged

nsqd: adds delayed retry to TestDiskQueueSyncAfterRead #783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 16 additions & 3 deletions nsqd/diskqueue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,16 @@ type md struct {
writePos int64
}

func readMetaDataFile(fileName string) md {
func readMetaDataFile(fileName string, retried int) md {
f, err := os.OpenFile(fileName, os.O_RDONLY, 0600)
if err != nil {
// provide a simple retry that results in up to
// another 250ms for the file to be written.
if retried < 5 {
retried++
time.Sleep(50 * time.Millisecond)
return readMetaDataFile(fileName, retried)
}
panic(err)
}
defer f.Close()
Expand Down Expand Up @@ -221,9 +228,15 @@ func TestDiskQueueSyncAfterRead(t *testing.T) {
msg := make([]byte, 1000)
dq.Put(msg)

// sync loop is every 50ms so wait 3x to make sure the file has time
// to actually get written prior to attempting to read it.
time.Sleep(150 * time.Millisecond)

d := readMetaDataFile(dq.(*diskQueue).metaDataFileName())
// attempt to read and load metadata of the file; initialize the number
// of retry attempts to 0; the max retries is 5 with a delay of 50ms each
// meaning that a total of 400ms between message put and message metadata
// read should be sufficient for heavy write disks on the travis servers.
d := readMetaDataFile(dq.(*diskQueue).metaDataFileName(), 0)
equal(t, d.depth, int64(1))
equal(t, d.readFileNum, int64(0))
equal(t, d.writeFileNum, int64(0))
Expand All @@ -235,7 +248,7 @@ func TestDiskQueueSyncAfterRead(t *testing.T) {

time.Sleep(150 * time.Millisecond)

d = readMetaDataFile(dq.(*diskQueue).metaDataFileName())
d = readMetaDataFile(dq.(*diskQueue).metaDataFileName(), 0)
equal(t, d.depth, int64(1))
equal(t, d.readFileNum, int64(0))
equal(t, d.writeFileNum, int64(0))
Expand Down