Skip to content

Commit 9941d5b

Browse files
author
Mary Anthony
committed
Small changes to storage driver/commands ref
Entering V's comments Signed-off-by: Mary Anthony <mary@docker.com>
1 parent 249b3a9 commit 9941d5b

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

docs/reference/commandline/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- [metadata]>
22
+++
3-
title = "Using the command line"
3+
title = "Docker Engine Commands"
44
description = "Docker's CLI command description and usage"
55
keywords = ["Docker, Docker documentation, CLI, command line"]
66
[menu.main]
@@ -12,7 +12,7 @@ parent = "mn_reference"
1212

1313
# The Docker commands
1414

15-
This section contains reference information on using Docker's command line client. Each command has a reference page along with samples. If you are unfamiliar with the command line, you should start by reading about how to ["Use the Docker command line"](cli.md).
15+
This section contains reference information on using Docker's command line client. Each command has a reference page along with samples. If you are unfamiliar with the command line, you should start by reading about how to [Use the Docker command line](cli.md).
1616

1717
You start the Docker daemon with the command line. How you start the daemon affects your Docker containers. For that reason you should also make sure to read the [`daemon`](daemon.md) reference page.
1818

docs/userguide/storagedriver/device-mapper-driver.md

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,18 +210,20 @@ The procedure below will create a 90GB data volume and 4GB metadata volume to us
210210

211211
5. Start the Docker daemon with the `devicemapper` storage driver and the `--storage-opt` flags.
212212

213-
The `data` and `metadata` devices that you pass to the `--storage-opt` options were created in the previous steps.
214-
215-
$ sudo docker daemon --storage-driver=devicemapper --storage-opt dm.datadev=/dev/vg-docker/data --storage-opt dm.metadatadev=/dev/vg-docker/metadata &
216-
[1] 2163
217-
[root@ip-10-0-0-75 centos]# INFO[0000] Listening for HTTP on unix (/var/run/docker.sock)
218-
INFO[0027] Option DefaultDriver: bridge
219-
INFO[0027] Option DefaultNetwork: bridge
220-
<output truncated>
221-
INFO[0027] Daemon has completed initialization
222-
INFO[0027] Docker daemon commit=0a8c2e3 execdriver=native-0.2 graphdriver=devicemapper version=1.8.2
223-
224-
It is also possible to set the `--storage-driver` and `--storage-opt` flags in the Docker config file and start the daemon normally using the `service` or `systemd` commands.
213+
The `data` and `metadata` devices that you pass to the `--storage-opt` options were created in the previous steps.
214+
215+
$ sudo docker daemon --storage-driver=devicemapper --storage-opt dm.datadev=/dev/vg-docker/data --storage-opt dm.metadatadev=/dev/vg-docker/metadata &
216+
[1] 2163
217+
[root@ip-10-0-0-75 centos]# INFO[0000] Listening for HTTP on unix (/var/run/docker.sock)
218+
INFO[0027] Option DefaultDriver: bridge
219+
INFO[0027] Option DefaultNetwork: bridge
220+
<output truncated>
221+
INFO[0027] Daemon has completed initialization
222+
INFO[0027] Docker daemon commit=0a8c2e3 execdriver=native-0.2 graphdriver=devicemapper version=1.8.2
223+
224+
It is also possible to set the `--storage-driver` and `--storage-opt` flags in
225+
the Docker config file and start the daemon normally using the `service` or
226+
`systemd` commands.
225227

226228
6. Use the `docker info` command to verify that the daemon is using `data` and `metadata` devices you created.
227229

docs/userguide/storagedriver/zfs-driver.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Once ZFS is installed and loaded, you're ready to configure ZFS for Docker.
137137

138138
$ sudo zpool create -f zpool-docker /dev/xvdb
139139

140-
The command creates the `zpool` and gives it the name "zpool-docker". The name is arbitrary.
140+
The command creates the `zpool` and gives it the name "zpool-docker". The name is arbitrary.
141141

142142
2. Check that the `zpool` exists.
143143

@@ -156,7 +156,7 @@ Once ZFS is installed and loaded, you're ready to configure ZFS for Docker.
156156
zpool-docker 93.5K 3.84G 19K /zpool-docker
157157
zpool-docker/docker 19K 3.84G 19K /var/lib/docker
158158

159-
Now that you have a ZFS filesystem mounted to `/var/lib/docker`, the daemon should automatically load with the `zfs` storage driver.
159+
Now that you have a ZFS filesystem mounted to `/var/lib/docker`, the daemon should automatically load with the `zfs` storage driver.
160160

161161
5. Start the Docker daemon.
162162

@@ -185,9 +185,9 @@ Once ZFS is installed and loaded, you're ready to configure ZFS for Docker.
185185
Execution Driver: native-0.2
186186
[...]
187187

188-
The output of the command above shows that the Docker daemon is using the
189-
`zfs` storage driver and that the parent dataset is the `zpool-docker/docker`
190-
filesystem created earlier.
188+
The output of the command above shows that the Docker daemon is using the
189+
`zfs` storage driver and that the parent dataset is the `zpool-docker/docker`
190+
filesystem created earlier.
191191

192192
Your Docker host is now using ZFS to store to manage its images and containers.
193193

@@ -207,7 +207,7 @@ using them with ZFS.
207207

208208
* **ZFS Caching**. ZFS caches disk blocks in a memory structure called the adaptive replacement cache (ARC). The *Single Copy ARC* feature of ZFS allows a single cached copy of a block to be shared by multiple clones of a filesystem. This means that multiple running containers can share a single copy of cached block. This means that ZFS is a good option for PaaS and other high density use cases.
209209

210-
- **Fragmentation**. Fragmentation is a natural byproduct of copy-on-write filesystems like ZFS. However, ZFS writes in 128K blocks and allocates *slabs* (multiple 128K blocks) to CoW operations in an attempt to reduce fragmentation. The ZFS intent log (ZIL) and the coalescing of writes (delayed writes) also help to reduce fragmentation.
210+
- **Fragmentation**. Fragmentation is a natural byproduct of copy-on-write filesystems like ZFS. However, ZFS writes in 128K blocks and allocates *slabs* (multiple 128K blocks) to CoW operations in an attempt to reduce fragmentation. The ZFS intent log (ZIL) and the coalescing of writes (delayed writes) also help to reduce fragmentation.
211211

212212
- **Use the native ZFS driver for Linux**. Although the Docker `zfs` storage driver supports the ZFS FUSE implementation, it is not recommended when high performance is required. The native ZFS on Linux driver tends to perform better than the FUSE implementation.
213213

0 commit comments

Comments
 (0)