summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-05-16 13:57:53 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2013-05-16 13:57:53 -0700
commit5737d032bfaca58f1b09fe211b4e6db41fd38cf5 (patch)
treecb96a712c3c643c05b2aa1a049318496140be090 /doc
parent58a880bd14e5c8c79de9584268b5d94240265566 (diff)
downloadceph-5737d032bfaca58f1b09fe211b4e6db41fd38cf5.tar.gz
doc: Added cluster map and CRUSH definitions.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/glossary.rst12
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/glossary.rst b/doc/glossary.rst
index 50ba954153c..526e5b43f53 100644
--- a/doc/glossary.rst
+++ b/doc/glossary.rst
@@ -38,6 +38,11 @@ reflect either technical terms or legacy ways of referring to Ceph systems.
RADOS Cluster
The core set of storage software which stores the user's data (MON+OSD).
+ Ceph Cluster Map
+ cluster map
+ The set of maps comprising the monitor map, OSD map, PG map, MDS map and
+ CRUSH map. See `Cluster Map`_ for details.
+
Ceph Object Storage
The object storage "product", service or capabilities, which consists
essentially of a Ceph Storage Cluster and a Ceph Object Gateway.
@@ -121,6 +126,9 @@ reflect either technical terms or legacy ways of referring to Ceph systems.
Teuthology
The collection of software that performs scripted tests on Ceph.
+ CRUSH
+ Controlled Replication Under Scalable Hashing. It is the algorithm
+ Ceph uses to compute object storage locations.
-
-.. _http://github.com/ceph: http://github.com/ceph \ No newline at end of file
+.. _http://github.com/ceph: http://github.com/ceph
+.. _Cluster Map: ../architecture#cluster-map \ No newline at end of file