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

fix(readonly): fix the file opening mode #1592

Merged
merged 4 commits into from
Nov 12, 2020
+9 −8
Merged

fix(readonly): fix the file opening mode #1592

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15f0cfe
fix the file opening mode
NamanJain8 Nov 11, 2020
05fa124
fix test
NamanJain8 Nov 11, 2020
e219e07
remove ErrTruncateNeeded
NamanJain8 Nov 11, 2020
f24311e
address comments
NamanJain8 Nov 12, 2020
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
17 changes: 9 additions & 8 deletions memtable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ func (db *DB) openMemTables(opt Options) error {
return fids[i] < fids[j]
})
for _, fid := range fids {
mt, err := db.openMemTable(fid)
flags := os.O_RDWR
if db.opt.ReadOnly {
flags = os.O_RDONLY
}
mt, err := db.openMemTable(fid, flags)
if err != nil {
return y.Wrapf(err, "while opening fid: %d", fid)
}
Expand All @@ -103,7 +107,7 @@ func (db *DB) openMemTables(opt Options) error {

const memFileExt string = ".mem"

func (db *DB) openMemTable(fid int) (*memTable, error) {
func (db *DB) openMemTable(fid, flags int) (*memTable, error) {
filepath := db.mtFilePath(fid)
s := skl.NewSkiplist(arenaSize(db.opt))
mt := &memTable{
Expand All @@ -122,7 +126,7 @@ func (db *DB) openMemTable(fid int) (*memTable, error) {
registry: db.registry,
writeAt: vlogHeaderSize,
}
lerr := mt.wal.open(filepath, os.O_RDWR|os.O_CREATE, db.opt)
lerr := mt.wal.open(filepath, flags, db.opt)
if lerr != z.NewFile && lerr != nil {
return nil, y.Wrapf(lerr, "While opening memtable: %s", filepath)
}
Expand All @@ -145,7 +149,7 @@ func (db *DB) openMemTable(fid int) (*memTable, error) {
var errExpectingNewFile = errors.New("Expecting to create a new file, but found an existing file")

func (db *DB) newMemTable() (*memTable, error) {
mt, err := db.openMemTable(db.nextMemFid)
mt, err := db.openMemTable(db.nextMemFid, os.O_CREATE|os.O_RDWR)
if err == z.NewFile {
db.nextMemFid++
return mt, nil
Expand Down Expand Up @@ -268,10 +272,7 @@ func (lf *logFile) Truncate(end int64) error {
} else if fi.Size() == end {
return nil
}
if lf.opt.ReadOnly {
return y.Wrapf(ErrTruncateNeeded,
"truncate to %d from %d for file: %s", end, lf.size, lf.path)
}
y.AssertTrue(!lf.opt.ReadOnly)
lf.size = uint32(end)
return lf.MmapFile.Truncate(end)
}
Expand Down