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

Jump to bottom

feature:add --include-buffer-cache flag for mem experiment ram model #37

Merged
merged 1 commit into from
Jul 30, 2020
Merged

feature:add --include-buffer-cache flag for mem experiment ram model #37

Show file tree
Hide file tree
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
17 changes: 10 additions & 7 deletions exec/bin/burnmem/burnmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,16 @@ const PAGE_COUNTER_MAX uint64 = 9223372036854770000
type Block [32 * 1024]int32

var (
burnMemStart, burnMemStop, burnMemNohup bool
memPercent, memReserve, memRate int
burnMemMode string
burnMemStart, burnMemStop, burnMemNohup, excludeBufferCache bool
memPercent, memReserve, memRate int
burnMemMode string
)

func main() {
flag.BoolVar(&burnMemStart, "start", false, "start burn memory")
flag.BoolVar(&burnMemStop, "stop", false, "stop burn memory")
flag.BoolVar(&burnMemNohup, "nohup", false, "nohup to run burn memory")
flag.BoolVar(&excludeBufferCache, "exclude-buffer-cache", false, "ram model mem-percent is exclude buffer/cache")
flag.IntVar(&memPercent, "mem-percent", 0, "percent of burn memory")
flag.IntVar(&memReserve, "reserve", 0, "reserve to burn memory, unit is M")
flag.IntVar(&memRate, "rate", 100, "burn memory rate, unit is M/S, only support for ram mode")
Expand Down Expand Up @@ -170,12 +171,12 @@ func startBurnMem() {
bin.PrintErrAndExit(response.Error())
}
}
runBurnMemFunc(ctx, memPercent, memReserve, memRate, burnMemMode)
runBurnMemFunc(ctx, memPercent, memReserve, memRate, burnMemMode, excludeBufferCache)
}

func runBurnMem(ctx context.Context, memPercent, memReserve, memRate int, burnMemMode string) {
args := fmt.Sprintf(`%s --nohup --mem-percent %d --reserve %d --rate %d --mode %s`,
path.Join(util.GetProgramPath(), burnMemBin), memPercent, memReserve, memRate, burnMemMode)
func runBurnMem(ctx context.Context, memPercent, memReserve, memRate int, burnMemMode string, excludeBufferCache bool) {
args := fmt.Sprintf(`%s --nohup --mem-percent %d --reserve %d --rate %d --mode %s --exclude-buffer-cache=%t`,
path.Join(util.GetProgramPath(), burnMemBin), memPercent, memReserve, memRate, burnMemMode, excludeBufferCache)
args = fmt.Sprintf(`%s > /dev/null 2>&1 &`, args)
response := cl.Run(ctx, "nohup", args)
if !response.Success {
Expand Down Expand Up @@ -242,6 +243,8 @@ func calculateMemSize(percent, reserve int) (int64, int64, error) {
available = int64(virtualMemory.Available)
if burnMemMode == "cache" {
available = int64(virtualMemory.Free)
} else if burnMemMode == "ram" && excludeBufferCache {
available = total - int64(virtualMemory.Used)
}
} else {
total = int64(memoryStat.Usage.Limit)
Expand Down
13 changes: 11 additions & 2 deletions exec/mem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ func NewMemCommandModelSpec() spec.ExpModelCommandSpec {
Desc: "burn memory mode, cache or ram.",
Required: false,
},
&spec.ExpFlag{
Name: "exclude-buffer-cache",
Desc: "Ram mode mem-percent is exclude buffer/cache",
NoArgs: true,
},
},
},
}
Expand Down Expand Up @@ -142,6 +147,7 @@ func (ce *memExecutor) Exec(uid string, ctx context.Context, model *spec.ExpMode
memReserveStr := model.ActionFlags["reserve"]
memRateStr := model.ActionFlags["rate"]
burnMemModeStr := model.ActionFlags["mode"]
excludeBufferCache := model.ActionFlags["exclude-buffer-cache"] == "true"
if memPercentStr != "" {
var err error
memPercent, err = strconv.Atoi(memPercentStr)
Expand Down Expand Up @@ -169,20 +175,23 @@ func (ce *memExecutor) Exec(uid string, ctx context.Context, model *spec.ExpMode
"--rate value must be a positive integer")
}
}
return ce.start(ctx, memPercent, memReserve, memRate, burnMemModeStr)
return ce.start(ctx, memPercent, memReserve, memRate, burnMemModeStr, excludeBufferCache)
}

const burnMemBin = "chaos_burnmem"

// start burn mem
func (ce *memExecutor) start(ctx context.Context, memPercent, memReserve, memRate int, burnMemMode string) *spec.Response {
func (ce *memExecutor) start(ctx context.Context, memPercent, memReserve, memRate int, burnMemMode string, excludeBufferCache bool) *spec.Response {
args := fmt.Sprintf("--start --mem-percent %d --reserve %d --debug=%t", memPercent, memReserve, util.Debug)
if memRate != 0 {
args = fmt.Sprintf("%s --rate %d", args, memRate)
}
if burnMemMode != "" {
args = fmt.Sprintf("%s --mode %s", args, burnMemMode)
}
if excludeBufferCache {
args = fmt.Sprintf("%s --exclude-buffer-cache=%t", args, excludeBufferCache)
}
return ce.channel.Run(ctx, path.Join(ce.channel.GetScriptPath(), burnMemBin), args)
}

Expand Down