Commit Graph

41608 Commits

Author SHA1 Message Date
Kefu Chai
fdffcc4593 doc: customize css for the group title
Fixes: #9442
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-14 19:33:31 +08:00
Kefu Chai
f59d6e1269 doc: use @name to define a group, not @group
we are able to output a specified group using the directive
of `doxygengroup` in breathe. this directive prints out the
description of the group. but it's not realistic to enumerate
all groups defined in source code in the rst files. but the
doxygen command @name also helps to group functions together.
the downside of this approach is that we can not add more
items to a group later on. but it should be fine with us,
since in our case, all the grouped items are living in a single
header file.

Fixes: #9442
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-05-14 19:09:18 +08:00
Loic Dachary
fbad3df41b Merge pull request #4674 from flaf/master
Doc: add a note about a CRUSH corner case with `ceph osd out`

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-14 02:08:49 +02:00
Sage Weil
700a1643e1 Merge pull request #4673 from dachary/wip-bencher
tools: remove obsolete aio_bench argument placeholder

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-13 17:06:46 -07:00
lafont
dcf8c597c5 Doc: add a note about a CRUSH corner case with ceph osd out
Signed-off-by: François Lafont <francois.lafont@ac-versailles.fr>
2015-05-14 02:02:33 +02:00
Loic Dachary
1bcea5ac10 tools: remove obsolete aio_bench argument placeholder
It was a noop and has been removed by
1ac7279822

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-14 01:59:38 +02:00
Loic Dachary
18a03f5f8f Merge pull request #4672 from dachary/wip-bencher
common: fix ObjBencher::aio_bench signature

Reviewed-by: Sage Weil <sage@redhat.com>
2015-05-14 01:03:32 +02:00
Loic Dachary
fe79babc98 common: fix ObjBencher::aio_bench signature
It was broken by 1ac7279822

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-05-14 00:54:07 +02:00
Josh Durgin
3242a89ba0 Merge pull request #4592 from ceph/wip-7746
rbd: add disk usage tool

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-05-13 17:38:58 -04:00
Loic Dachary
d10631722d Merge pull request #4308 from dachary/wip-bencher
common: clarify some obj_bencher code

Reviewed-by: Dmitry Yatsushkevich <dmitry.yatsushkevich@gmail.com>
2015-05-13 23:00:05 +02:00
Loic Dachary
7865d1dde9 Merge pull request #4650 from stiopaa1/bufferIterator
buffer.h: Removed unnecessary copy constructor, assignment operator a…

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-13 22:52:09 +02:00
Loic Dachary
d82681e6c7 Merge pull request #4668 from ceph/wip-rados-binary-omapsetval
rados cli: setomapval can now read from stdin

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-05-13 22:34:22 +02:00
David Zafman
00c4fc8907 Merge pull request #4473 from ceph/wip-10809-11135-10290
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-05-13 13:10:39 -07:00
David Zafman
9016269a1c test: Add config changes to all tests to avoid order dependency
ReplayCorrupt was crashing because journal_ignore_corruption wasn't set true
Improve ReplayCorrupt by checking setting of bool corrupt and use ASSERT_FALSE()

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:14 -07:00
David Zafman
73b1731937 osd: Add admin socket feature set_recovery_delay
Set the value of osd_recovery_delay_start to specified seconds

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:14 -07:00
David Zafman
545c78c65f ceph-objectstore-tool: For import/export --debug dump the log
Move log dumping code to common function dump_log()

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:14 -07:00
David Zafman
32be302484 test: Use ceph-objectstore-tool --no-overwrite for import-rados
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:14 -07:00
David Zafman
e0627b0e01 test: Test ceph-objectstore-tool --dry-run in select operations
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:14 -07:00
David Zafman
ece630d5a7 test: Fix ceph-objectstore-tool test missing fd.close()
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
11c13eb7c1 test: Fix ceph-objectstore-tool test error message
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
c6e41663e7 ceph-objectstore-tool: If object re-appears after removal, just skip it
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
35cdcabbda ceph-objectstore-tool: Add --no-overwrite flag for import-rados
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
3e7fe7e857 ceph-objectstore-tool: Remove list-lost because now we have --dry-run flag
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
2795161f47 ceph-objectstore-tool: Add --dry-run option
Fixes: #10290

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
244092d034 ceph-objectstore-tool: Add dump-info command to show object info
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
c00290b836 ceph-objectstore-tool: Use empty string for <object> to specify pgmeta object
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
John Spray
fdb1a4b676 ceph-objectstore-tool: Add a couple of strategically placed prints
Signed-off-by: John Spray <john.spray@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
a50679a1a3 ceph-objectstore-tool: Clean up error handling
Use negative errors throughout and positive error to specify exit status
cpp_strerror() handles negative errors
Clean up main() code to use local "ret"
Let end of main() decide how to treat the final value of "ret"

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
548147b412 ceph-objectstore-tool: Create section around log/missing/divergent_priors of --op log
Remove extra new lines in the output

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
6ad7e9b362 ceph-objectstore-tool: Add divergent_priors handling
Add to --op log output
Add to metadata_section for export
Add filtering of divergent_priors in case of splits

Fixes: #11237

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
94b3d7632f test: ceph-objectstore-tool: Remove duplicate debug messages, keep cmd/log/call together
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
d80ce6668c test: ceph-objectstore-tool import after split testing
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
1e18e8a88f test: Use CEPH_DIR where appropriate
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
868cf457a3 test: Limit how long ceph-objectstore-tool test will wait for health
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
dff17a800c test: Add optional arg to vstart() to provide additional args to vstart
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:13 -07:00
David Zafman
9b08bcf95c test: Test ceph-objectstore-tool --op dump-journal output
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
b0141108c0 test: Pep8 fixes for ceph-objectstore-tool test
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
2f4090daae ceph-objectstore-tool: Add --force option which is used for import only
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
24f0659896 ceph-objectstore-tool: Fix pgid scan to skip snapdirs
Long standing bug where it wasn't skipping snapdirs if !debug
For debug output use stderr like all other cases

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
381605e34a ceph-objectstore-tool: Add dump-journal op
Have dump-journal op directly dump a filestore journal without
mounting or try to dump after mounting.

Fixes: #11135

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
130eba4849 osd: FileJournal: Add _fdump() that takes Formatter instead of ostream
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
1b9f85befa test: Fix ceph-objectstore-tool test, overwrite OTHERFILE so second check is meaningful
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
e30efe6c15 test: ceph_test_filejournal: Conform to test infrastructure requirements
Only call RUN_ALL_TESTS() once

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
d540dde1fa test: ceph_test_filejournal need to force aio because testing with a file
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
c94fe8db36 test: ceph_test_filejournal fix missing argument to FileJournal constructor
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
8da4d9f633 test: ceph_test_filejournal Add check of journalq in WriteTrim test
Commit all journal entries and check for empty journalq

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
159f4ccf5c filestore: Change int open_journal() to void new_journal()
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
d580d56883 osd: Fix log output in FileJournal::read_entry() coming from do_read_entry()
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
96c0d076fb os: Add some logging used only by test code
Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00
David Zafman
8d5464c0f8 osd: Add simple_dump() to FileJournal for unit testing
Allow a dump when entries aren't ObjectStore::Transaction's

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-05-13 13:09:12 -07:00