Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
moby/moby
Acidburn0zzz/docker
AdamOssenford/docker-pi
BrianBland/docker
Chhunlong/docker
ChristianKniep/docker
DCdrone/docker
DarknessBeforeDawn/docker
Gandi/docker
HabtomW/docker
HewlettPackard/docker
ImadBouirmane/docker
Keensyst/moby
KoyoTakenoshita/docker
Kunge/docker
Microsoft/docker
NERSC/docker
Ninir/docker
NunoEdgarGub1/docker
PaulSec/docker
RepmujNetsik/docker
SHAKESMIN/docker
SaiedKazemi/docker
Shopify/docker
StefanScherer/docker
StevenLudwig/docker
WeiZhang555/moby
Xethron/docker
ZJU-SEL/docker
Zekom/docker
ZenikaOuest/docker
aaronkempf/docker
ablox/docker
aboch/docker
aetherical/docker
albers/moby
alexlarsson/docker
alibaba/docker
allencloud/docker
alongyin/docker
amirdaneshvar/docker
anshulr/docker
armbuild/docker
ascii1011/docker
atlassian/docker
bfirsh/docker
bilzat/docker
blakmatrix/docker
boucher/docker
bradfitz/docker
brahmaroutu/docker
brandon-rhodes/docker
brianm/docker
campoy/docker
chenchun/docker
chenweihua/docker
clearlinux/docker
clnperez/moby
cnmxiaobudian/docker
coreos/docker
coreysa/docker
crosbymichael/docker
dansowter/docker
darkain84/docker
dashengSun/docker
dave-tucker/docker
deepglint/docker
delftswa2014/docker
destari/docker
dianping/docker
divya88ssn/docker
djangosporti/docker
docker/engine
dockerparis/docker-pot
dockervlan/docker
dqminh/moby
duglin/docker
edx/docker
ehazlett/moby
elliswuuuuuuuu/docker
ercanucan/docker
favey/docker
fcwu/docker
freebsd-docker/docker
garethr/docker
gdi2290/docker
ghigt/docker-pot
gogradle/moby
gurjeet/docker
hansent/docker
hcu5555/docker
heartlock/docker
hefen1/docker
heroku/docker
hougie/docker
hypriot/docker
hzrandd/docker
ianmiell/docker
is-yangchen/docker
jamtur01/docker
jefby/docker
jeremyeder/docker
jessfraz/docker
jingruhou/docker
jishandong/docker
jlhawn/docker
joanbarros/docker
joeygibson/docker
johngossman/docker
josemonsalve2/docker
jpetazzo/docker
justsml/docker
keithhkcss2015/docker
kongxianghe1234/docker
krishnazure/docker
kstaken/docker
kvasdopil/docker
kzys/docker
lethegit/docker
lfneves/docker
llunved/docker
luxas/docker
marcin-at-taulia/docker
mavenugo/docker
maxwell92/docker
medallia/docker
melchips/docker
mengqingshare/docker
mephux/docker
michaelnju/docker
miminar/docker
montecarlo1/docker
moxiegirl/docker
mpatlasov/docker
mwhudson/docker
nanjj/docker
nathanleclaire/docker
navin70/docker
netmarine/docker
nicklv/docker
ningjh/docker
nosy/docker
odin1314/docker
only4funny/docker
petar/gocircuit-docker
poreotics/docker
princeqjzh/docker
princessd8251/docker
projectatomic/docker
putztzu/docker
qifei8/docker
rastabrane/docker-1
resin-io/docker
resouer/docker
reteptilian/docker
rhatdan/moby1
rhvgoyal/moby
robin-zhou/docker
robryk/docker
roth1002/docker
runcom/docker
rwincewicz/docker
sachin-jayant-joshi/docker
sarar04/docker
sc4599/docker
seblu/docker
sexybear/docker
sh0tt/docker
shinvdu/docker
shravaniv/docker
shykes/docker
slavau/docker
snitm/docker
spf13/docker
splunk/docker
srevereault/docker
sss9991/docker
tagomoris/docker
thieman/docker
tiw/docker
tmc/docker
tomwilkie/docker
tpounds/docker
twosigma/docker-old
victorbriz/docker
vmware/docker
wallaceok/docker
weizhenwei/docker
witcxc/docker
wlan0/docker
xianlubird/docker
xq262144/docker
yang1992/docker
ycaihua/docker
yingmsky/docker
yorkie/docker
yosifkit/docker
zb-basketball/docker
zcnrex/docker
zhli000/docker
Nothing to show
Choose a Head Repository
moby/moby
Acidburn0zzz/docker
AdamOssenford/docker-pi
BrianBland/docker
Chhunlong/docker
ChristianKniep/docker
DCdrone/docker
DarknessBeforeDawn/docker
Gandi/docker
HabtomW/docker
HewlettPackard/docker
ImadBouirmane/docker
Keensyst/moby
KoyoTakenoshita/docker
Kunge/docker
Microsoft/docker
NERSC/docker
Ninir/docker
NunoEdgarGub1/docker
PaulSec/docker
RepmujNetsik/docker
SHAKESMIN/docker
SaiedKazemi/docker
Shopify/docker
StefanScherer/docker
StevenLudwig/docker
WeiZhang555/moby
Xethron/docker
ZJU-SEL/docker
Zekom/docker
ZenikaOuest/docker
aaronkempf/docker
ablox/docker
aboch/docker
aetherical/docker
albers/moby
alexlarsson/docker
alibaba/docker
allencloud/docker
alongyin/docker
amirdaneshvar/docker
anshulr/docker
armbuild/docker
ascii1011/docker
atlassian/docker
bfirsh/docker
bilzat/docker
blakmatrix/docker
boucher/docker
bradfitz/docker
brahmaroutu/docker
brandon-rhodes/docker
brianm/docker
campoy/docker
chenchun/docker
chenweihua/docker
clearlinux/docker
clnperez/moby
cnmxiaobudian/docker
coreos/docker
coreysa/docker
crosbymichael/docker
dansowter/docker
darkain84/docker
dashengSun/docker
dave-tucker/docker
deepglint/docker
delftswa2014/docker
destari/docker
dianping/docker
divya88ssn/docker
djangosporti/docker
docker/engine
dockerparis/docker-pot
dockervlan/docker
dqminh/moby
duglin/docker
edx/docker
ehazlett/moby
elliswuuuuuuuu/docker
ercanucan/docker
favey/docker
fcwu/docker
freebsd-docker/docker
garethr/docker
gdi2290/docker
ghigt/docker-pot
gogradle/moby
gurjeet/docker
hansent/docker
hcu5555/docker
heartlock/docker
hefen1/docker
heroku/docker
hougie/docker
hypriot/docker
hzrandd/docker
ianmiell/docker
is-yangchen/docker
jamtur01/docker
jefby/docker
jeremyeder/docker
jessfraz/docker
jingruhou/docker
jishandong/docker
jlhawn/docker
joanbarros/docker
joeygibson/docker
johngossman/docker
josemonsalve2/docker
jpetazzo/docker
justsml/docker
keithhkcss2015/docker
kongxianghe1234/docker
krishnazure/docker
kstaken/docker
kvasdopil/docker
kzys/docker
lethegit/docker
lfneves/docker
llunved/docker
luxas/docker
marcin-at-taulia/docker
mavenugo/docker
maxwell92/docker
medallia/docker
melchips/docker
mengqingshare/docker
mephux/docker
michaelnju/docker
miminar/docker
montecarlo1/docker
moxiegirl/docker
mpatlasov/docker
mwhudson/docker
nanjj/docker
nathanleclaire/docker
navin70/docker
netmarine/docker
nicklv/docker
ningjh/docker
nosy/docker
odin1314/docker
only4funny/docker
petar/gocircuit-docker
poreotics/docker
princeqjzh/docker
princessd8251/docker
projectatomic/docker
putztzu/docker
qifei8/docker
rastabrane/docker-1
resin-io/docker
resouer/docker
reteptilian/docker
rhatdan/moby1
rhvgoyal/moby
robin-zhou/docker
robryk/docker
roth1002/docker
runcom/docker
rwincewicz/docker
sachin-jayant-joshi/docker
sarar04/docker
sc4599/docker
seblu/docker
sexybear/docker
sh0tt/docker
shinvdu/docker
shravaniv/docker
shykes/docker
slavau/docker
snitm/docker
spf13/docker
splunk/docker
srevereault/docker
sss9991/docker
tagomoris/docker
thieman/docker
tiw/docker
tmc/docker
tomwilkie/docker
tpounds/docker
twosigma/docker-old
victorbriz/docker
vmware/docker
wallaceok/docker
weizhenwei/docker
witcxc/docker
wlan0/docker
xianlubird/docker
xq262144/docker
yang1992/docker
ycaihua/docker
yingmsky/docker
yorkie/docker
yosifkit/docker
zb-basketball/docker
zcnrex/docker
zhli000/docker
Nothing to show
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 28, 2014
Remount /var/lib/docker as --private to fix scaling issue
If an admin mounts all file systems as -rshared (Default on RHEL and Fedora)
we see a scaling problem as the number of container increase.

Basically every new container needs to have it new mounts in /var/lib/docker
shared to all other containers, this ends up with us only able to scale to
around 100 containers, before the system slows down.

By simply bind mounting /var/lib/docker on its and then setting it private,
the scaling issue goes away.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Commits on Mar 29, 2014
Merge pull request #4884 from rhatdan/remount-var-lib-docker
Remount /var/lib/docker as --private to fix scaling issue
Showing with 21 additions and 0 deletions.
  1. +21 −0 runtime/runtime.go
View
@@ -10,6 +10,7 @@ import (
"github.com/dotcloud/docker/graph"
"github.com/dotcloud/docker/image"
"github.com/dotcloud/docker/pkg/graphdb"
"github.com/dotcloud/docker/pkg/mount"
"github.com/dotcloud/docker/pkg/sysinfo"
"github.com/dotcloud/docker/runconfig"
"github.com/dotcloud/docker/runtime/execdriver"
@@ -59,6 +60,22 @@ type Runtime struct {
execDriver execdriver.Driver
}
// Mountpoints should be private to the container
func remountPrivate(mountPoint string) error {
mounted, err := mount.Mounted(mountPoint)
if err != nil {
return err
}
if !mounted {
if err := mount.Mount(mountPoint, mountPoint, "none", "bind,rw"); err != nil {
return err
}
}
return mount.ForceMount("", mountPoint, "none", "private")
}
// List returns an array of all containers registered in the runtime.
func (runtime *Runtime) List() []*Container {
containers := new(History)
@@ -654,6 +671,10 @@ func NewRuntimeFromDirectory(config *daemonconfig.Config, eng *engine.Engine) (*
}
utils.Debugf("Using graph driver %s", driver)
if err := remountPrivate(config.Root); err != nil {
return nil, err
}
runtimeRepo := path.Join(config.Root, "containers")
if err := os.MkdirAll(runtimeRepo, 0700); err != nil && !os.IsExist(err) {

No commit comments for this range