Skip to content

Commit

Permalink
doc: sync with mainline
Browse files Browse the repository at this point in the history
Updated to: "2016-11-04"

Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
  • Loading branch information
drunkard committed May 2, 2017
1 parent 6ab5d1c commit 2ed94d7
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 61 deletions.
6 changes: 3 additions & 3 deletions cephfs/fstab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

.. important:: 启用了认证时, ``name`` 及 ``secret`` 或 ``secretfile`` 选项必须加。

详情见\ `认证`_\
详情见\ `用户管理`_\


FUSE
Expand All @@ -42,7 +42,7 @@ FUSE
``admin`` ,不是 ``client.admin`` )。你可以用此方法把任何
``ceph-fuse`` 接受的选项加上。

详情见\ `认证`_\
详情见\ `用户管理`_\


.. _认证: ../../rados/operations/authentication/
.. _用户管理: ../../rados/operations/user-management/
4 changes: 2 additions & 2 deletions cephfs/kernel.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

sudo mount -t ceph 192.168.0.1:6789:/ /mnt/mycephfs -o name=admin,secretfile=/etc/ceph/admin.secret

关于 cephx 参见\ `认证`_\
关于 cephx 参见\ `用户管理`_\

要卸载 Ceph 文件系统,可以用 ``unmount`` 命令,例如: ::

Expand All @@ -28,4 +28,4 @@


.. _mount.ceph: ../../man/8/mount.ceph/
.. _认证: ../../rados/operations/authentication/
.. _用户管理: ../../rados/operations/user-management/
19 changes: 13 additions & 6 deletions cephfs/mantle.rst
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,11 @@ The metrics exposed to the Lua policy are the same ones that are already stored
in mds_load_t: auth.meta_load(), all.meta_load(), req_rate, queue_length,
cpu_load_avg.

Compile/Execute the Balancer
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

.. _Compile/Execute the Balancer:

编译、执行均衡器
~~~~~~~~~~~~~~~~

Here we use `lua_pcall` instead of `lua_call` because we want to handle errors
in the MDBalancer. We do not want the error propagating up the call chain. The
Expand All @@ -203,6 +206,7 @@ we'll fall back to the original balancer.
The performance improvement of using `lua_call` over `lua_pcall` would not be
leveraged here because the balancer is invoked every 10 seconds by default.


Returning Policy Decision to C++
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand All @@ -217,6 +221,7 @@ jargon: a dummy value is pushed onto the stack and the next iterator replaces
the top of the stack with a (k, v) pair. After reading each value, pop that
value but keep the key for the next call to `lua_next`.


Reading from RADOS
~~~~~~~~~~~~~~~~~~

Expand All @@ -238,8 +243,9 @@ and fill in the Lua code in the background. We cannot do this because the MDS
does not support daemon-local fallbacks and the balancer assumes that all MDSs
come to the same decision at the same time (e.g., importers, exporters, etc.).

Debugging
~~~~~~~~~

调试
~~~~

Logging in a Lua policy will appear in the MDS log. The syntax is the same as
the cls logging interface:
Expand All @@ -257,8 +263,9 @@ Warning and Info messages are centralized using the clog/Beacon. Successful
messages are only sent on version changes by the first MDS to avoid spamming
the `ceph -w` utility. These messages are used for the integration tests.

Testing
~~~~~~~

测试
~~~~

Testing is done with the ceph-qa-suite (tasks.cephfs.test_mantle). We do not
test invalid balancer logging and loading the actual Lua VM.
16 changes: 2 additions & 14 deletions install/get-packages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ https://download.ceph.com/rpm-{ceph-release}/ 看看 Ceph 支持哪\
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-noarch]
Expand All @@ -179,7 +178,6 @@ https://download.ceph.com/rpm-{ceph-release}/ 看看 Ceph 支持哪\
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-source]
Expand All @@ -188,7 +186,6 @@ https://download.ceph.com/rpm-{ceph-release}/ 看看 Ceph 支持哪\
enabled=0
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc


Expand All @@ -200,7 +197,6 @@ https://download.ceph.com/rpm-{ceph-release}/ 看看 Ceph 支持哪\
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-noarch]
Expand All @@ -209,7 +205,6 @@ https://download.ceph.com/rpm-{ceph-release}/ 看看 Ceph 支持哪\
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-source]
Expand All @@ -218,7 +213,6 @@ https://download.ceph.com/rpm-{ceph-release}/ 看看 Ceph 支持哪\
enabled=0
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc


Expand Down Expand Up @@ -275,7 +269,6 @@ RPM 二进制包
baseurl=http://gitbuilder.ceph.com/ceph-rpm-{distro}-x86_64-basic/ref/{branch}/SRPMS
enabled=0
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/autobuild.asc


Expand Down Expand Up @@ -314,7 +307,6 @@ RPM 二进制包
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/autobuild.asc

[apache2-ceph-source]
Expand All @@ -323,7 +315,6 @@ RPM 二进制包
enabled=0
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/autobuild.asc


Expand All @@ -335,7 +326,6 @@ RPM 二进制包
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/autobuild.asc

[fastcgi-ceph-noarch]
Expand All @@ -344,7 +334,6 @@ RPM 二进制包
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/autobuild.asc

[fastcgi-ceph-source]
Expand All @@ -353,7 +342,6 @@ RPM 二进制包
enabled=0
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/autobuild.asc


Expand Down Expand Up @@ -393,9 +381,9 @@ RPM 二进制包

Ceph 依赖一些第三方库。执行下列命令添加 EPEL 库: ::

su -c 'rpm -Uvh https://download.ceph.com/rpm-firefly/{distro}/noarch/ceph-{version}.{distro}.noarch.rpm'
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm

Ceph依赖下列包
Ceph 依赖下列包

- snappy
- leveldb
Expand Down
3 changes: 0 additions & 3 deletions install/install-storage-cluster.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-noarch]
Expand All @@ -52,7 +51,6 @@
enabled=1
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-source]
Expand All @@ -61,7 +59,6 @@
enabled=0
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc

#. 安装依赖的的软件包: ::
Expand Down
11 changes: 3 additions & 8 deletions install/upgrading-ceph.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Bobtail 版默认启用了认证,而且预置了粒度更细的认证配置选
.. important:: 如果你的集群配置文件之前就有 ``auth supported`` 选项,那就没必要更\
改了。

详情见 `Ceph 认证——向后兼容性`_\
详情见 `用户管理——向后兼容性`_\


监视器线上协议
Expand Down Expand Up @@ -151,7 +151,7 @@ Bobtail 和 Argonaut 监视器将导致旧监视器不能使用新线上协议
升级期间不要等待。详情见\ `升级监视器`_\

.. note:: 关于 Bobtail 的认证及向后兼容性请参考\ `认证`_\ 和
`Ceph 认证——向后兼容性`_\
`用户管理——向后兼容性`_\

把监视器从 Argonaut 升级到 Bobtail 、并重启无误(可以形成法定人\
数)后,还必须从 Bobtail 再升级到 Cuttlefish 。再次升级前,记得\
Expand Down Expand Up @@ -232,7 +232,6 @@ Dumpling ,因为协议有变动。
baseurl=http://download.ceph.com/rpm/el6/$basearch
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc
Expand Down Expand Up @@ -267,7 +266,6 @@ Dumpling (v0.64) 可滚动升级。
baseurl=http://download.ceph.com/rpm-emperor/{distro}/$basearch
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc
Expand Down Expand Up @@ -381,7 +379,6 @@ Firefly 。也就是说,在升级 Ceph 守护进程前,要用 ``ceph`` 命
baseurl=http://download.ceph.com/rpm-firefly/{distro}/$basearch
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc
Expand Down Expand Up @@ -446,7 +443,6 @@ Ceph 配置文件变更
baseurl=http://download.ceph.com/rpm/{distro}/$basearch
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://download.ceph.com/keys/release.asc
Expand Down Expand Up @@ -655,8 +651,7 @@ Ceph 配置文件变更

.. _监视器配置: ../../rados/configuration/mon-config-ref
.. _Joao 的博客文章: http://ceph.com/dev-notes/cephs-new-monitor-changes
.. _Ceph 认证: ../../rados/operations/authentication/
.. _Ceph 认证——向后兼容性: ../../rados/operations/authentication/#backward-compatibility
.. _用户管理——向后兼容性: ../../rados/configuration/auth-config-ref/#backward-compatibility
.. _手动升级: ../install-storage-cluster/
.. _操纵集群: ../../rados/operations/operating
.. _监控集群: ../../rados/operations/monitoring
Expand Down
2 changes: 1 addition & 1 deletion rados/configuration/osd-config-ref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ Ceph 用 30 秒超时和 30 秒抗议时间来把握 2 个线程的运行情\

:描述: 单个 OSD 允许的最大回填操作数。
:类型: 64-bit Unsigned Integer
:默认值: ``10``
:默认值: ``1``


``osd backfill scan min``
Expand Down
1 change: 0 additions & 1 deletion radosgw/federated-config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,6 @@ region 的主域作为二级域。启动 ``radosgw-agent`` 时加上 ``--metadat

.. _CRUSH 图: ../../rados/operations/crush-map
.. _安装 Ceph 对象网关: ../../install/install-ceph-gateway
.. _Cephx 管理: ../../rados/operations/authentication/#cephx-administration
.. _Ceph 配置文件: ../../rados/configuration/ceph-conf
.. _配置参考——存储池: ../config-ref#pools
.. _配置参考——region: ../config-ref#regions
Expand Down
2 changes: 1 addition & 1 deletion radosgw/s3/java.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ modified date.
do {
for (S3ObjectSummary objectSummary : objects.getObjectSummaries()) {
System.out.println(objectSummary.getKey() + "\t" +
ObjectSummary.getSize() + "\t" +
objectSummary.getSize() + "\t" +
StringUtils.fromDate(objectSummary.getLastModified()));
}
objects = conn.listNextBatchOfObjects(objects);
Expand Down
8 changes: 5 additions & 3 deletions rbd/qemu-rbd.rst
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,11 @@ QEMU 的缓存选项对应下列的 Ceph `RBD 缓存`_\ 选项。

rbd_cache = false

QEMU 的缓存选项会覆盖 Ceph 的默认选项(就是那些 Ceph 配置文件里没有的选项);如果\
你在 Ceph 配置文件内设置了 `RBD 缓存`_\ 选项,那么它们会覆盖 QEMU 缓存选项。如果你\
在 QEMU 命令行上设置缓存选项,它们会覆盖 Ceph 配置文件里的选项。
QEMU 的缓存选项会覆盖 Ceph 的缓存配置(包括 Ceph 配置文件里明\
确设置过的)。

.. note:: 在 QEMU v2.4.0 版以前,如果你在 Ceph 配置文件里明确\
设置了 `RBD 缓存`_\ 选项,这些配置会覆盖 QEMU 的缓存选项。


.. _QEMU 开源处理器仿真器: http://wiki.qemu.org/Main_Page
Expand Down
2 changes: 1 addition & 1 deletion rbd/rbd-ko.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@
sudo rbd unmap /dev/rbd/rbd/foo


.. _cephx: ../../rados/operations/authentication/
.. _cephx: ../../rados/operations/user-management/
22 changes: 14 additions & 8 deletions rbd/rbd-openstack.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,24 @@ OpenStack 里有三个地方和 Ceph 块设备结合:
Create a Pool
=============

默认情况下, Ceph 块设备使用 ``rbd`` 存储池,你可以用任何可用存储池。但我们建议分别\
为 Cinder 和 Glance 创建存储池。确保 Ceph 集群在运行,然后创建存储池。 ::
默认情况下, Ceph 块设备使用 ``rbd`` 存储池,你可以用任何可用\
存储池。但我们建议分别为 Cinder 和 Glance 创建存储池。确保 Ceph
集群在运行,然后创建存储池。 ::

ceph osd pool create volumes 128
ceph osd pool create images 128
ceph osd pool create backups 128
ceph osd pool create vms 128

参考\ `创建存储池`_\ 为存储池指定归置组数量,参考\ `归置组`_\ 确定应该为存储池分配\
多少归置组
参考\ `创建存储池`_\ 为存储池指定归置组数量,参考\ `归置组`_\
确定应该为存储池分配多少归置组

.. _创建存储池: ../../rados/operations/pools#createpool
.. _归置组: ../../rados/operations/placement-groups


.. _Configure OpenStack Ceph Clients:

配置 OpenStack 的 Ceph 客户端
=============================

Expand All @@ -102,7 +105,8 @@ Create a Pool
安装 Ceph 客户端软件包
----------------------

在运行 ``glance-api`` 的节点上你得安装 ``librbd`` 的 Python 绑定: ::
在运行 ``glance-api`` 的节点上你得安装 ``librbd`` 的 Python 绑\
定: ::

sudo apt-get install python-rbd
sudo yum install python-rbd
Expand Down Expand Up @@ -141,8 +145,8 @@ Create a Pool

ceph auth get-or-create client.cinder | ssh {your-nova-compute-server} sudo tee /etc/ceph/ceph.client.cinder.keyring

还得把 ``client.cinder`` 用户的密钥存进 ``libvirt`` , libvirt 进程从 \
Cinder 挂载块设备时要用它访问集群。
还得把 ``client.cinder`` 用户的密钥存进 ``libvirt`` , libvirt
进程从 Cinder 挂载块设备时要用它访问集群。

在运行 ``nova-compute`` 的节点上创建一个密钥的临时副本: ::

Expand Down Expand Up @@ -171,8 +175,10 @@ Cinder 挂载块设备时要用它访问集群。
However from a platform consistency perspective, it's better to keep the
same UUID.

.. _cephx 认证: ../../rados/operations/authentication
.. _cephx 认证: ../../rados/configuration/auth-config-ref/#enabling-disabling-cephx


.. _Configure OpenStack to use Ceph:

让 OpenStack 使用 Ceph
=======================
Expand Down
Loading

0 comments on commit 2ed94d7

Please sign in to comment.