Skip to content

Read correct number of messages from end of file #7

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

Merged
leonzz merged 2 commits into from
Jul 23, 2021
Merged

Read correct number of messages from end of file #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7b4a31
trivial improvement of some checks
leonzz Jul 16, 2021
65e8ba1
use file instead of bufio.Reader in readNumOfMessages from file end
leonzz Jul 16, 2021
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
16 changes: 5 additions & 11 deletions diskqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ func NewWithDiskSpace(name string, dataPath string,

// Get the last known state of DiskQueue from metadata and start ioLoop
func (d *diskQueue) start() error {
// ensure that DiskQueue has enough space to write the metadata file
if d.enableDiskLimitation && d.maxBytesDiskSpace <= maxMetaDataFileSize {
// ensure that DiskQueue has enough space to write the metadata file + at least one data file with max size + message size
if d.enableDiskLimitation && (d.maxBytesDiskSpace <= maxMetaDataFileSize+d.maxBytesPerFile) {
errorMsg := fmt.Sprintf(
"disk size limit too small(%d): not enough space for MetaData file size(%d)",
d.maxBytesDiskSpace, maxMetaDataFileSize)
"disk size limit too small(%d): not enough space for MetaData file (size=%d) and at least one data file with max size (maxBytesPerFile=%d).",
d.maxBytesDiskSpace, maxMetaDataFileSize, d.maxBytesPerFile)
d.logf(ERROR, "DISKQUEUE(%s) - %s", errorMsg)
return errors.New(errorMsg)
}
Expand Down Expand Up @@ -463,8 +463,6 @@ func (d *diskQueue) readNumOfMessages(fileName string) (int64, error) {
if err != nil {
return 0, err
}

d.reader = bufio.NewReader(d.readFile)
}

closeReadFile := func() {
Expand All @@ -480,7 +478,7 @@ func (d *diskQueue) readNumOfMessages(fileName string) (int64, error) {
}

var totalMessages int64
err = binary.Read(d.reader, binary.BigEndian, &totalMessages)
err = binary.Read(d.readFile, binary.BigEndian, &totalMessages)
if err != nil {
return 0, err
}
Expand Down Expand Up @@ -580,10 +578,6 @@ func (d *diskQueue) freeDiskSpace(expectedBytesIncrease int64) error {
d.logf(ERROR, "DISKQUEUE(%s) failed to retrieve all .bad file info - %s", d.name, err)
}

if expectedBytesIncrease > d.maxBytesDiskSpace {
return fmt.Errorf("could not make space for expectedBytesIncrease = %d, with maxBytesDiskSpace = %d ", expectedBytesIncrease, d.maxBytesDiskSpace)
}

// keep freeing up disk space until we have enough space to write this message
for _, badFileInfo := range badFileInfos {
if d.totalDiskSpaceUsed+expectedBytesIncrease <= d.maxBytesDiskSpace {
Expand Down