You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/06/13 05:44:33 UTC
[1/3] trafficserver git commit: TS-667: Changed disk device paths to
include id/path.
Repository: trafficserver
Updated Branches:
refs/heads/master a6fbcc1f0 -> baed47b17
TS-667: Changed disk device paths to include id/path.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5cc4ae81
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5cc4ae81
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5cc4ae81
Branch: refs/heads/master
Commit: 5cc4ae81906ed34565df519652bce246f3551e40
Parents: a6fbcc1
Author: Crystal Qian <cr...@cable.comcast.net>
Authored: Thu Jun 11 16:01:44 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Jun 12 21:26:27 2015 -0600
----------------------------------------------------------------------
.../configuration/storage.config.en.rst | 31 ++++++++++----------
proxy/config/storage.config.default.in | 10 +++++--
2 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5cc4ae81/doc/reference/configuration/storage.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/storage.config.en.rst b/doc/reference/configuration/storage.config.en.rst
index ef6bc61..5220c46 100644
--- a/doc/reference/configuration/storage.config.en.rst
+++ b/doc/reference/configuration/storage.config.en.rst
@@ -130,19 +130,32 @@ The following example is for the Solaris operating system::
Linux Example
-------------
+.. note::
+ Rather than refer to disk devices like ``/dev/sda``, ``/dev/sdb``, etc.,
+ modern Linux supports `alternative symlinked names for disk devices
+ <https://wiki.archlinux.org/index.php/persistent_block_device_naming#by-id_and_by-path>`_ in the ``/dev/disk``
+ directory structure. As noted for the :ref:`assignment-table` the path used for the disk can effect
+ the cache if it changes. This can be ameloriated in some cases by using one of the alternate paths
+ in via ``/dev/disk``. Note that if the ``by-id`` or ``by-path`` style is used, replacing a failed drive will cause
+ that path to change because the new drive will have a different physical ID or path. The original hash string can be kept by adding :arg:`id` or :arg:`path` with the original path to the storage line.
+
+ If this is not sufficient then the :arg:`id` or :arg:`path` argument should be used to create a more permanent assignment table. An example would be::
+
+ /dev/sde id=cache.disk.0
+ /dev/sdg id=cache.disk.1
The following example will use an entire raw disk in the Linux operating
system::
- /dev/sde volume=1
- /dev/sdf volume=2
+ /dev/disk/by-id/[DiskA_ID] volume=1
+ /dev/disk/by-path/[DiskB_Path] volume=2
In order to make sure :program:`traffic_server` will have access to this disk
you can use :manpage:`udev(7)` to persistently set the right permissions. The
following rules are targeted for an Ubuntu system, and stored in
``/etc/udev/rules.d/51-cache-disk.rules``::
- # Assign /dev/sde and /dev/sdf to the tserver group
+ # Assign DiskA and DiskB to the tserver group
# make the assignment final, no later changes allowed to the group!
SUBSYSTEM=="block", KERNEL=="sd[ef]", GROUP:="tserver"
@@ -150,18 +163,6 @@ In order to apply these settings, trigger a reload with :manpage:`udevadm(8)`:::
udevadm trigger --subsystem-match=block
-As an implementation note, modern Linux supports `alternative symlinked names for disk devices
-<https://wiki.archlinux.org/index.php/persistent_block_device_naming>`_ in the ``/dev/disk``
-directory structure. As noted for the :ref:`assignment-table` the path used for the disk can effect
-the cache if it changes. This can be ameloriated in some cases by using one of the alternate paths
-in via ``/dev/disk``. Note that if the ``by-id`` style is used, replacing a failed drive will cause
-that path to change because the new drive will have a different physical ID. The original hash string can be kept by adding :arg:`id` with the original path to the storage line.
-
-If this is not sufficient then the :arg:`id` argument should be used to create a more permanent assignment table. An
-example would be::
-
- /dev/sde id=cache.disk.0
- /dev/sdg id=cache.disk.1
FreeBSD Example
---------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5cc4ae81/proxy/config/storage.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/storage.config.default.in b/proxy/config/storage.config.default.in
index abde85a..937fe50 100644
--- a/proxy/config/storage.config.default.in
+++ b/proxy/config/storage.config.default.in
@@ -32,12 +32,16 @@
#
# Examples: Using O_DIRECT on disks (Linux kernel >= 2.6.3,
# FreeBSD > 5.3)
+#
+# /dev/disc/by-id/[Insert_ID_Here_12345] # Linux
+# /dev/disc/by-path/[Insert-Path-Here:12:34:56-1.0.0.0] # Linux
#
-# /dev/sdb # Linux
-# /dev/ada1 # FreeBSD
+# /dev/ada1 # FreeBSD
#
+# Note that disks are identified by id or path. This is to prevent changes
+# by the kernel (which could occur if a disk was simply described as /dev/sda, sdb, etc).
#
-# Note that when using these raw devices in O_DIRECT mode, you
+# Also note that when using these raw devices in O_DIRECT mode, you
# do not need to specify the partition size. It's automatically
# detected. For more examples and a complete documentation see
#
[3/3] trafficserver git commit: Fixup CHANGES
Posted by so...@apache.org.
Fixup CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/baed47b1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/baed47b1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/baed47b1
Branch: refs/heads/master
Commit: baed47b176b14b096f1bad11ba6728682cf3a7f9
Parents: 2776840
Author: Phil Sorber <so...@apache.org>
Authored: Fri Jun 12 21:38:50 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Jun 12 21:38:50 2015 -0600
----------------------------------------------------------------------
CHANGES | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/baed47b1/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8503ad3..8ca32fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,9 +3,9 @@ Changes with Apache Traffic Server 6.0.0
*) [TS-667] Update docs to explain how to use alternate disk paths.
- *) [TS-3455]: Fix debug assert in parent proxy scenario.
+ *) [TS-3455] Fix debug assert in parent proxy scenario.
- *) [TS-3126]: Remove the config setting that controls sending of HTTP status
+ *) [TS-3126] Remove the config setting that controls sending of HTTP status
response (408) on a POST failure (e.g timeout) and make the sending of 408
default.
[2/3] trafficserver git commit: TS-667: Add to CHANGES and minor
cleanup
Posted by so...@apache.org.
TS-667: Add to CHANGES and minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/27768402
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/27768402
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/27768402
Branch: refs/heads/master
Commit: 27768402978468ad51b7dee57e1097824e213188
Parents: 5cc4ae8
Author: Phil Sorber <so...@apache.org>
Authored: Fri Jun 12 21:36:00 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Jun 12 21:36:00 2015 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
doc/reference/configuration/storage.config.en.rst | 6 ++++--
proxy/config/storage.config.default.in | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/27768402/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e6720b7..8503ad3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-667] Update docs to explain how to use alternate disk paths.
+
*) [TS-3455]: Fix debug assert in parent proxy scenario.
*) [TS-3126]: Remove the config setting that controls sending of HTTP status
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/27768402/doc/reference/configuration/storage.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/storage.config.en.rst b/doc/reference/configuration/storage.config.en.rst
index 5220c46..1c958ba 100644
--- a/doc/reference/configuration/storage.config.en.rst
+++ b/doc/reference/configuration/storage.config.en.rst
@@ -137,9 +137,11 @@ Linux Example
directory structure. As noted for the :ref:`assignment-table` the path used for the disk can effect
the cache if it changes. This can be ameloriated in some cases by using one of the alternate paths
in via ``/dev/disk``. Note that if the ``by-id`` or ``by-path`` style is used, replacing a failed drive will cause
- that path to change because the new drive will have a different physical ID or path. The original hash string can be kept by adding :arg:`id` or :arg:`path` with the original path to the storage line.
+ that path to change because the new drive will have a different physical ID or path. The original hash string can
+ be kept by adding :arg:`id` or :arg:`path` with the original path to the storage line.
- If this is not sufficient then the :arg:`id` or :arg:`path` argument should be used to create a more permanent assignment table. An example would be::
+ If this is not sufficient then the :arg:`id` or :arg:`path` argument should be used to create a more permanent
+ assignment table. An example would be::
/dev/sde id=cache.disk.0
/dev/sdg id=cache.disk.1
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/27768402/proxy/config/storage.config.default.in
----------------------------------------------------------------------
diff --git a/proxy/config/storage.config.default.in b/proxy/config/storage.config.default.in
index 937fe50..23b547e 100644
--- a/proxy/config/storage.config.default.in
+++ b/proxy/config/storage.config.default.in
@@ -32,7 +32,7 @@
#
# Examples: Using O_DIRECT on disks (Linux kernel >= 2.6.3,
# FreeBSD > 5.3)
-#
+#
# /dev/disc/by-id/[Insert_ID_Here_12345] # Linux
# /dev/disc/by-path/[Insert-Path-Here:12:34:56-1.0.0.0] # Linux
#