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

make lru_mb optional #3898

Merged
merged 2 commits into from
Sep 3, 2019
Merged

make lru_mb optional #3898

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aab6621
make lru_mb optional
campoy Sep 3, 2019
a90ba00
applied Manish's feedback
campoy Sep 3, 2019
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
22 changes: 19 additions & 3 deletions edgraph/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,15 @@ import (
"path/filepath"
"time"

"github.com/golang/glog"

"github.com/dgraph-io/dgraph/posting"
"github.com/dgraph-io/dgraph/x"
)

// #include <unistd.h>
import "C"

const (
// AllowMutations is the mode allowing all mutations.
AllowMutations int = iota
Expand Down Expand Up @@ -94,9 +99,20 @@ func (opt *Options) validate() {
wd, err := filepath.Abs(opt.WALDir)
x.Check(err)
x.AssertTruef(pd != wd, "Posting and WAL directory cannot be the same ('%s').", opt.PostingDir)
x.AssertTruefNoTrace(opt.AllottedMemory != -1,
"LRU memory (--lru_mb) must be specified. (At least 1024 MB)")
if opt.AllottedMemory < 0 {
bytes := C.sysconf(C._SC_PHYS_PAGES) * C.sysconf(C._SC_PAGE_SIZE)
mb := bytes / 1024 / 1024
if mb > MinAllottedMemory {
opt.AllottedMemory = 0.25 * float64(mb)
glog.Infof(
"LRU memory (--lru_mb) set to %vMB, 25%% of the total RAM found (%vMB)\n"+
"For more information on --lru_mb please read "+
"https://docs.dgraph.io/deploy/#config\n",
opt.AllottedMemory, mb)
}
}
x.AssertTruefNoTrace(opt.AllottedMemory >= MinAllottedMemory,
"LRU memory (--lru_mb) must be at least %.0f MB. Currently set to: %f",
"LRU memory (--lru_mb) must be at least %.0f MB. Currently set to: %f\n"+
"For more information on --lru_mb please read https://docs.dgraph.io/deploy/#config",
MinAllottedMemory, opt.AllottedMemory)
}