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
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 2 contributors
Commits on Jan 22, 2014
Add experimenta btrfs driver
This is an experimental btrfs driver. To use it you must have
/var/lib/docker mounted on a btrfs filesystem and explicitly
specify DOCKER_DRIVER=btrfs in the docker daemon environment.

It works by using subvolumes for the docker image/container layers.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Commits on Jan 28, 2014
btrfs: Add comment to Put()
Document why we don't need to do anything in Put().

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Commits on Jan 30, 2014
Showing with 223 additions and 0 deletions.
  1. +217 −0 graphdriver/btrfs/btrfs.go
  2. +3 −0 graphdriver/btrfs/dummy_unsupported.go
  3. +2 −0 graphdriver/driver.go
  4. +1 −0 runtime.go
View
@@ -0,0 +1,217 @@
// +build linux
package btrfs
/*
#include <stdlib.h>
#include <sys/ioctl.h>
#include <linux/fs.h>
#include <errno.h>
#include <sys/types.h>
#include <dirent.h>
#include <linux/btrfs.h>
*/
import "C"
import (
"fmt"
"github.com/dotcloud/docker/graphdriver"
"os"
"path"
"syscall"
"unsafe"
)
func init() {
graphdriver.Register("btrfs", Init)
}
func Init(home string) (graphdriver.Driver, error) {
rootdir := path.Dir(home)
var buf syscall.Statfs_t
if err := syscall.Statfs(rootdir, &buf); err != nil {
return nil, err
}
if buf.Type != 0x9123683E {
return nil, fmt.Errorf("%s is not a btrfs filesystem", rootdir)
}
return &Driver{
home: home,
}, nil
}
type Driver struct {
home string
}
func (d *Driver) String() string {
return "btrfs"
}
func (d *Driver) Status() [][2]string {
return nil
}
func (d *Driver) Cleanup() error {
return nil
}
func free(p *C.char) {
C.free(unsafe.Pointer(p))
}
func openDir(path string) (*C.DIR, error) {
Cpath := C.CString(path)
defer free(Cpath)
dir := C.opendir(Cpath)
if dir == nil {
return nil, fmt.Errorf("Can't open dir")
}
return dir, nil
}
func closeDir(dir *C.DIR) {
if dir != nil {
C.closedir(dir)
}
}
func getDirFd(dir *C.DIR) uintptr {
return uintptr(C.dirfd(dir))
}
func subvolCreate(path, name string) error {
dir, err := openDir(path)
if err != nil {
return err
}
defer closeDir(dir)
var args C.struct_btrfs_ioctl_vol_args
for i, c := range []byte(name) {
args.name[i] = C.char(c)
}
_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_SUBVOL_CREATE,
uintptr(unsafe.Pointer(&args)))
if errno != 0 {
return fmt.Errorf("Can't create subvolume")
}
return nil
}
func subvolSnapshot(src, dest, name string) error {
srcDir, err := openDir(src)
if err != nil {
return err
}
defer closeDir(srcDir)
destDir, err := openDir(dest)
if err != nil {
return err
}
defer closeDir(destDir)
var args C.struct_btrfs_ioctl_vol_args_v2
args.fd = C.__s64(getDirFd(srcDir))
for i, c := range []byte(name) {
args.name[i] = C.char(c)
}
_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(destDir), C.BTRFS_IOC_SNAP_CREATE_V2,
uintptr(unsafe.Pointer(&args)))
if errno != 0 {
return fmt.Errorf("Can't create subvolume")
}
return nil
}
func subvolDelete(path, name string) error {
dir, err := openDir(path)
if err != nil {
return err
}
defer closeDir(dir)
var args C.struct_btrfs_ioctl_vol_args
for i, c := range []byte(name) {
args.name[i] = C.char(c)
}
_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_SNAP_DESTROY,
uintptr(unsafe.Pointer(&args)))
if errno != 0 {
return fmt.Errorf("Can't create subvolume")
}
return nil
}
func (d *Driver) subvolumesDir() string {
return path.Join(d.home, "subvolumes")
}
func (d *Driver) subvolumesDirId(id string) string {
return path.Join(d.subvolumesDir(), id)
}
func (d *Driver) Create(id string, parent string) error {
subvolumes := path.Join(d.home, "subvolumes")
if err := os.MkdirAll(subvolumes, 0700); err != nil {
return err
}
if parent == "" {
if err := subvolCreate(subvolumes, id); err != nil {
return err
}
} else {
parentDir, err := d.Get(parent)
if err != nil {
return err
}
if err := subvolSnapshot(parentDir, subvolumes, id); err != nil {
return err
}
}
return nil
}
func (d *Driver) Remove(id string) error {
dir := d.subvolumesDirId(id)
if _, err := os.Stat(dir); err != nil {
return err
}
if err := subvolDelete(d.subvolumesDir(), id); err != nil {
return err
}
return os.RemoveAll(dir)
}
func (d *Driver) Get(id string) (string, error) {
dir := d.subvolumesDirId(id)
st, err := os.Stat(dir)
if err != nil {
return "", err
}
if !st.IsDir() {
return "", fmt.Errorf("%s: not a directory", dir)
}
return dir, nil
}
func (d *Driver) Put(id string) {
// Get() creates no runtime resources (like e.g. mounts)
// so this doesn't need to do anything.
}
func (d *Driver) Exists(id string) bool {
dir := d.subvolumesDirId(id)
_, err := os.Stat(dir)
return err == nil
}
@@ -0,0 +1,3 @@
// +build !linux
package btrfs
View
@@ -41,6 +41,8 @@ var (
"aufs",
"devicemapper",
"vfs",
// experimental, has to be enabled manually for now
"btrfs",
}
)
View
@@ -9,6 +9,7 @@ import (
"github.com/dotcloud/docker/execdriver/lxc"
"github.com/dotcloud/docker/graphdriver"
"github.com/dotcloud/docker/graphdriver/aufs"
_ "github.com/dotcloud/docker/graphdriver/btrfs"
_ "github.com/dotcloud/docker/graphdriver/devmapper"
_ "github.com/dotcloud/docker/graphdriver/vfs"
"github.com/dotcloud/docker/networkdriver/portallocator"

No commit comments for this range