Commit Graph

176 Commits

Author SHA1 Message Date
Ilya Dryomov
b1d3f918fb rbd: allow unmapping by spec
Make use of krbd_unmap_by_spec() and allow unmapping by <image-name>
(i.e. pool/image@snap spec) with a bunch of careful adjustments to the
fragile command args/options parsing process to make --pool, --image
and --snap options work as expected for rbd unmap <image-name> case.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-04-19 14:45:37 +03:00
Jason Dillaman
6ce79ab008 rbd: add object map rebuild command
An invalid object map can now be rebuilt via the rbd CLI.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-10 14:10:05 -04:00
Nilamdyuti Goswami
1cc0181326 doc: Corrects rgw.conf file path for Debian-based and RPM-based distros
in radosgw man page.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2015-04-08 15:48:39 +05:30
Kefu Chai
251ae614ba doc: ref 9/ceph-mon using relative path
sphinx complains when it failed to find the referenced file using the
absolute path whose root is the $(top_srcdir)/doc/man when rendering
man pages. but it is able to find it when rendering the html, because
build-doc specifies $(top_srcdir)/doc/ as the source directory.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-04-07 23:26:50 +08:00
Kefu Chai
a0bdf6932b doc: add ":orphan:" field to avoid sphinx warnings
when building man pages from rst files, sphinx complains if any
rst file is not referenced by a doctree.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-04-07 23:26:50 +08:00
Kefu Chai
0e07ccc197 man: move man/8/*.rst back to doc/man/8
sphinx requires that a document tree to be in a single directory,
and the man pages are references by our document. so a simple solution
would be to put all the rst file under a single directory.

Fixes: #11320
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-04-07 23:26:49 +08:00
Kefu Chai
301fe6cbf2 doc: generate man pages in man/Makefile
* move rst files from doc/man/8 into man/8
* extract man_pages setting for sphinx from doc/conf.py to man/conf.py
* generate all man pages in `make install`
* add python-sphinx to Build-Depends
* check for sphinx-build in `configure`
* run changed rst files through sphinx-build in `make check`

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-03-24 12:36:41 +08:00
Loic Dachary
0a3e47d778 Merge pull request #4148 from dobbler123/master
doc: Fixes spelling and grammatical errors

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-03-23 22:30:59 +01:00
Vartika Rai
8471f927c8 doc: Fixes spelling and grammatical errors
Signed-off-by: Vartika Rai <vartikarai17@gmail.com>
2015-03-24 02:11:34 +05:30
Sage Weil
0bee27461d Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
2015-03-23 12:45:16 -07:00
Loic Dachary
c5e9a214e4 Merge pull request #3371 from nilamdyuti/wip-doc-ceph-object-gateway
Updates radosgw man page with configuration for mod_proxy_fcgi

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
2015-03-23 18:25:41 +01:00
Nilamdyuti Goswami
e62ff4dbf6 doc: Updates radosgw-admin man page.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2015-03-23 16:39:18 +05:30
Nilamdyuti Goswami
e5bc64bfa6 doc: Updates radosgw man page.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2015-03-23 16:35:27 +05:30
Nilamdyuti Goswami
7a1984db41 doc: Updates radosgw man page with configuration for mod_proxy_fcgi .
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2015-03-23 16:35:27 +05:30
Kefu Chai
c7826567c0 doc: update .rst file with their .8 counterparts
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-03-23 17:56:33 +08:00
David Zafman
eb890b1bdc doc: Break ceph osd pool get into sections based on pool type
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-22 15:28:17 -07:00
Sage Weil
2a5ad8e3f7 Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
	src/msg/xio/XioPortal.h
2015-03-17 10:57:13 -07:00
David Zafman
f4bc48d954 doc: Fix ceph command manpage to match ceph -h (hammer)
Include rebuilt man/ceph.8

Fixes: #10678

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-13 17:00:10 -07:00
David Zafman
9495de4726 doc: Fix ceph command manpage to match ceph -h (firefly)
Improve synopsis section
Fixes: #10676

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9ac488c1eb)

Conflicts:

	doc/man/8/ceph.rst
	man/ceph.8
2015-03-13 16:59:39 -07:00
David Zafman
416cbff0b4 doc: Fix typo in ceph pg dump_stuck usage in man page
Cause by 9db596974c

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-03-12 14:33:52 -07:00
Ilya Dryomov
2769da40d7 rbd: recognize cephx_require_signatures and tcp_nodelay options
Support for these went into 3.19 and 4.0 kernels respectively.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2015-03-12 14:27:32 +03:00
Sage Weil
faa1f2741c Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
2015-03-10 06:24:59 -07:00
Jason Dillaman
6c2d92948c rbd: permit v2 striping for clones and imports
rbd did not previously support specifying striping params
for cloned and imported images.  Extend the behavior to
these other CLI commands.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-03-02 18:46:56 -05:00
Florian Haas
14315cf25f doc: trivial: fix missing newlines in rbd man page
As it were, the order, stripe_unit and stripe_count options were
followed by descriptions rendered in the same monospace font as the
options themselves. Insert newlines so they are rendered as regular
text, as was the original intention.

Signed-off-by: Florian Haas <florian@hastexo.com>
2015-02-27 11:21:03 +01:00
Jason Dillaman
0ed296b1e3 rbd: disable RBD exclusive locking by default
Utilize the existing rbd_default_features config option to
control whether or not to enable RBD exclusive locking and
object map features by default.  Also added a new option to
the rbd cli to specify the image features when creating images.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-02-23 10:47:05 -05:00
Kefu Chai
fffa5e201a osd,mon: add norebalance osdmap flag
Fixes: #10559

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-05 13:52:17 +08:00
Yunchuan Wen
4aa9f3f745 man: add rbd status to doc/man/8/rbd.rst
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
2015-02-02 10:32:23 +01:00
Loic Dachary
1798803292 Merge pull request #3455 from bveuille/wip-documentation
doc: Change Availability text in all of the man pages

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-26 12:42:32 +01:00
Yuan Zhou
9ad9ba8d10 doc: Fix a typo in radosgw-admin doc
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2015-01-22 13:31:47 +08:00
Baptiste Veuillez
008698b37c doc: Change Availability text in all of the man pages
http://tracker.ceph.com/issues/5834 fixes:#5834
signed-off-by: Baptiste Veuillez--Mainard <baptiste.veuillez--mainard@telecom-bretagne.eu>
2015-01-22 03:16:35 +01:00
Sage Weil
8318a2e5e2 Merge pull request #3382 from xinxinsh/wip-fix
fix command 'ceph pg dump_stuck degraded'

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-19 12:35:58 -08:00
Josh Durgin
a845139d1f Merge pull request #3292 from kylinstorage/rbd-merge-diff-v2
rbd: merge diff files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-16 12:08:02 -08:00
xinxin shu
9db596974c fix command 'ceph pg dump_stuck degraded'
undersized not valid:  undersized not in inactive|unclean|stale
undersized not valid:  undersized doesn't represent an int
Invalid command:  unused arguments: ['undersized']
pg dump_stuck {inactive|unclean|stale [inactive|unclean|stale...]} {<int>} :  show information about stuck pgs

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2015-01-16 01:33:07 +08:00
Yunchuan Wen
9748655921 man: add help for rbd merge-diff command
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
2015-01-15 02:31:41 +00:00
Jason Dillaman
4297e3bf8e rbd: Allow CLI to optionally create shared images
Images that are flagged as shared cannot use the RBD
object map nor RBD mirroring features.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 20:01:21 -05:00
Loic Dachary
154497c695 Merge pull request #3227 from nilamdyuti/wip-doc-ceph-deploy
Fixes a typo in ceph-deploy man page

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-12-20 09:40:08 +01:00
Nilamdyuti Goswami
8c38cc6bc5 doc: Fixes a typo in ceph-deploy man page.
Lack of a single space was restricting the proper rendering of an option in
html. Fixes the error.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-20 13:47:55 +05:30
Loic Dachary
11fa1dfbcb Merge pull request #3193 from nilamdyuti/wip-doc-ceph-disk
Changes format style in ceph-disk to improve readability as html

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-12-19 15:36:39 +01:00
John Wilkins
3b46995c97 Merge pull request #3195 from nilamdyuti/wip-doc-ceph-deploy
doc: Changes format style in ceph-deploy to improve readability as html.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
2014-12-18 15:01:50 -08:00
Nilamdyuti Goswami
8b79617306 doc: Changes format style in ceph to improve readability as html.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-18 17:11:22 +05:30
Nilamdyuti Goswami
62b3fcdd24 doc: Updates man page for ceph-disk with suggested changes.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-18 16:48:50 +05:30
Nilamdyuti Goswami
3f6be22f64 doc: Updates man page for ceph-disk.
Changes format style to improve readability as html.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-18 16:31:35 +05:30
Nilamdyuti Goswami
e638469b58 doc: Updates man page for ceph-deploy.
Changes format style in ceph-deploy to improve readability as html.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-18 13:51:46 +05:30
John Wilkins
8241f114d1 Merge pull request #3165 from nilamdyuti/wip-doc-ceph
doc: Updates man page for Ceph

Reviewed-by: John Wilkins <jowilkin@redhat.com>
2014-12-16 08:13:53 -08:00
Nilamdyuti Goswami
76da87a64c doc: Adds man page for ceph.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-13 02:24:41 +05:30
Nilamdyuti Goswami
9191005cca doc: Adds man page for ceph-deploy.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-06 00:07:44 +05:30
Loic Dachary
f1296fd87a Merge pull request #3019 from theanalyst/doc/typo/ceph-auth
doc: minor fix in ceph-authtool man page

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2014-11-30 10:23:43 +01:00
Abhishek Lekshmanan
faa4cbbef2 doc: minor fix in ceph-authtool man page
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2014-11-30 11:20:59 +05:30
Nilamdyuti Goswami
8a48847cd4 doc: Updates the man page for ceph-disk utility with some changes.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-11-26 22:19:01 +05:30
Nilamdyuti Goswami
242dd1c0bb doc: Removes ceph-deploy usage instances from ceph-disk man page.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-11-25 21:16:16 +05:30