Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Documentation Fixes for http://tracker.ceph.com/issues/19879 #15606

Merged
merged 1 commit into from Jun 9, 2017
+14 −1
Merged

Documentation Fixes for http://tracker.ceph.com/issues/19879 #15606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion doc/man/8/ceph-osd.rst
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ Synopsis
========

| **ceph-osd** -i *osdnum* [ --osd-data *datapath* ] [ --osd-journal
*journal* ] [ --mkfs ] [ --mkjournal ] [ --mkkey ]
*journal* ] [ --mkfs ] [ --mkjournal ] [--flush-journal] [--check-allows-journal] [--check-wants-journal] [--check-needs-journal] [ --mkkey ]

Description
Expand Down Expand Up @@ -57,6 +57,18 @@ Options

Journal updates to *journal*.

.. option:: --check-allows-journal

Check whether a journal is desired.

.. option:: --check-wants-journal

Check whether a journal is allowed.

.. option:: --check-needs-journal

Check whether a journal is required.

.. option:: --mkfs

Create an empty object repository. This also initializes the journal
Expand Down
1 change: 1 addition & 0 deletions src/ceph_osd.cc
View file
Open in desktop
Expand Up @@ -78,6 +78,7 @@ static void usage()
<< " --osd-journal PATH\n"
<< " journal file or block device\n"
<< " --mkfs create a [new] data directory\n"
<< " --mkkey generate a new secret key. This is normally used in combination with --mkfs\n"
<< " --convert-filestore\n"
<< " run any pending upgrade operations\n"
<< " --flush-journal flush all data out of journal\n"
Expand Down