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.

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

add support to set MemorySwap #9603

Merged
merged 1 commit into from
Jan 6, 2015
Merged

add support to set MemorySwap #9603

merged 1 commit into from
Jan 6, 2015

Conversation

hqhq
Copy link
Contributor

@hqhq hqhq commented Dec 11, 2014

Signed-off-by: Qiang Huang h.huangqiang@huawei.com

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
@jessfraz
Copy link
Contributor

Why wouldn't you send this with -m you set it as that variable anyways?

@jessfraz
Copy link
Contributor

It's implementing the exact same function as --memory, if anything one should really set memory and the other should really set swap

@jessfraz
Copy link
Contributor

never mind my bad, missed the one important line

@@ -136,6 +137,15 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
flMemory = parsedMemory
}

var MemorySwap int64
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be flMemorySwap

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I considered this before, we already used flMemorySwap above, normally
this should be flMemorySwapString, but it's a bit too long.
If it's OK, I can change it to flMemorySwapString, what do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't worry about it, just keep it as is

@jessfraz
Copy link
Contributor

LGTM

@crosbymichael crosbymichael self-assigned this Dec 16, 2014
@crosbymichael
Copy link
Contributor

This still has a dep on libcontainer being updated in docker. I'm working on that right now and will merge after we have the libcontainer change merged in.

@crosbymichael crosbymichael added this to the 1.5.0 milestone Dec 17, 2014
@LK4D4
Copy link
Contributor

LK4D4 commented Jan 6, 2015

LGTM

@jessfraz
Copy link
Contributor

jessfraz commented Jan 6, 2015

I think this was the commit @crosbymichael was referring to: docker-archive/libcontainer@e8f5b54 and it was merged

LK4D4 added a commit that referenced this pull request Jan 6, 2015
@LK4D4 LK4D4 merged commit 748b745 into moby:master Jan 6, 2015
@hqhq hqhq deleted the hq_add_memory_swap branch January 12, 2015 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants