]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agotests: reduce make check verbosity 4703/head
Loic Dachary [Sat, 16 May 2015 08:57:43 +0000 (10:57 +0200)]
tests: reduce make check verbosity

Move check-local scripts

   src/test/run-cli-tests
   encode-decode-non-regression.sh
   test/encoding/readable.sh

to check_SCRIPTS. Their output is captured in .log file when running
with a recent automake. This reduces the output of make check by an
order of magnitude.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4711 from dachary/wip-ceph-detect-init
Loic Dachary [Sun, 17 May 2015 20:55:31 +0000 (22:55 +0200)]
Merge pull request #4711 from dachary/wip-ceph-detect-init

ceph-detect-init typo

Reviewed-by: Michal Jarzabek <stiopa@gmail.com>
10 years agoceph-detect-init: fix pep8 extra space 4711/head
Loic Dachary [Sun, 17 May 2015 19:30:54 +0000 (21:30 +0200)]
ceph-detect-init: fix pep8 extra space

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-detect-init: run-tox.sh always succeeds
Loic Dachary [Sun, 17 May 2015 19:29:25 +0000 (21:29 +0200)]
ceph-detect-init: run-tox.sh always succeeds

Because of the | grep, the status of tox is no longer the status of
run-tox.sh and errors are not reported as they should.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4704 from dachary/wip-ceph-helpers
Kefu Chai [Sun, 17 May 2015 14:25:39 +0000 (22:25 +0800)]
Merge pull request #4704 from dachary/wip-ceph-helpers

{mon,osd}-test-helpers.sh are deprecated

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4706 from stiopaa1/cephdetectinit
Loic Dachary [Sun, 17 May 2015 13:57:42 +0000 (15:57 +0200)]
Merge pull request #4706 from stiopaa1/cephdetectinit

ceph_detect_init: added linux mint

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph_detect_init: added linux mint 4706/head
Michal Jarzabek [Sun, 17 May 2015 11:46:18 +0000 (12:46 +0100)]
ceph_detect_init: added linux mint

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agotests: {mon,osd}-test-helpers.sh are deprecated 4704/head
Loic Dachary [Sat, 16 May 2015 13:52:01 +0000 (15:52 +0200)]
tests: {mon,osd}-test-helpers.sh are deprecated

Remove the helpers because they are not used any longer. They have been
deprecated by ceph-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-helpers.sh remove redundant setup in main
Loic Dachary [Sun, 17 May 2015 10:26:06 +0000 (12:26 +0200)]
tests: ceph-helpers.sh remove redundant setup in main

And add setup/teardown in tests that do not have it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/mon-handle-forward.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:49:39 +0000 (15:49 +0200)]
tests: test/mon/mon-handle-forward.sh uses ceph-helpers.sh

Use ceph-helpers.sh instead of  mon/mon-test-helpers.sh.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * use explicit ports 7300 and 7301 instead of +1 so that grep
    will show that 7301 is used. This reduces the odds of a
    port collision when looking for a port that's not already
    used by an existing test.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/osd-pool-create.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:43:33 +0000 (15:43 +0200)]
tests: test/mon/osd-pool-create.sh uses ceph-helpers.sh

Use ceph-helpers.sh instead of  mon/mon-test-helpers.sh.

  * The expect_false() helper is replaced by a ! statement which is
    simpler and has the same effect.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * trim the --public-addr argument from the run_mon call

  * add || return 1 after run_mon where missing

  * add || return 1 to all commands in TEST_no_pool_delete

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/osd/osd-bench.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:42:44 +0000 (15:42 +0200)]
tests: test/osd/osd-bench.sh uses ceph-helpers.sh

Remove useless inclusion of osd/osd-test-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/osd/osd-config.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:40:51 +0000 (15:40 +0200)]
tests: test/osd/osd-config.sh uses ceph-helpers.sh

The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

  * trim the --public-addr argument from the run_mon call

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/osd/osd-copy-from.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:39:30 +0000 (15:39 +0200)]
tests: test/osd/osd-copy-from.sh uses ceph-helpers.sh

The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/vstart_wrapper.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:38:52 +0000 (15:38 +0200)]
tests: test/vstart_wrapper.sh uses ceph-helpers.sh

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/misc.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 13:36:25 +0000 (15:36 +0200)]
tests: test/mon/misc.sh uses ceph-helpers.sh

Fix grep that assume the pool has id 0, because it may be different
when rbd is redefined to have less PG by the run_mon function.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/erasure-code/test-erasure-code.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 09:26:08 +0000 (11:26 +0200)]
tests: test/erasure-code/test-erasure-code.sh uses ceph-helpers.sh

The ceph-helpers.sh was already included, along with
mon/mon-test-helpers.sh and osd/osd-test-helpers.sh which creates
confusion.

  * replace check_osd_status with wait_for_osd

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/osd-crush.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 09:23:07 +0000 (11:23 +0200)]
tests: test/mon/osd-crush.sh uses ceph-helpers.sh

It is just a conversion and the behavior is not changed. It involves:

  * calling run_mon from inside each test instead of doing it in run

  * modifying the .asok and .log names to match the ceph-helpers.sh
    conventions

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: test/mon/osd-erasure-code-profile.sh uses ceph-helpers.sh
Loic Dachary [Sat, 16 May 2015 09:19:09 +0000 (11:19 +0200)]
tests: test/mon/osd-erasure-code-profile.sh uses ceph-helpers.sh

Instead of using mon-test-helpers.sh, primarily because the kill_daemon
function implemented in mon-test-helpers.sh is not as good as
ceph-helpers.sh.

Instead of having tests that share the same monitor, each test now runs
on a fresh monitor. The test writer no longer has to worry that it will
be re-using the pool or profile from a previous test. That causes
problems that are difficult to diagnose and the overhead of running a
new monitor is not so high.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: kill mon-test-helpers.sh call_TEST_functions
Loic Dachary [Sat, 16 May 2015 09:15:56 +0000 (11:15 +0200)]
tests: kill mon-test-helpers.sh call_TEST_functions

Remove call_TEST_functions because it is too complex and rarely used.
Replace the two instances where it was used by a few lines doing the
same thing.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-helpers.sh do not hardcode id a in run_mon
Loic Dachary [Sat, 16 May 2015 13:32:20 +0000 (15:32 +0200)]
tests: ceph-helpers.sh do not hardcode id a in run_mon

Fix hardcoding of id a in the run_mon function. The directory
in which the mon data is stored must be a sub-directory of the
directory given in argument.

If mon_initial_members is set, the rbd pool cannot be redefined, which
is ok because this is rare and it's only an optimization to reduce the
number of PG.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-helpers.sh shows ceph report if not clean
Loic Dachary [Sat, 16 May 2015 09:28:54 +0000 (11:28 +0200)]
tests: ceph-helpers.sh shows ceph report if not clean

Instead of just pg dump and health detail, the wait_for_clean
function displays ceph report when it times out, to help figure out what
caused it.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-helpers.sh implement wait_for_osd
Loic Dachary [Sat, 16 May 2015 09:12:16 +0000 (11:12 +0200)]
tests: ceph-helpers.sh implement wait_for_osd

The wait_for_osd to wait for an osd to go up and down is needed
internally, after running an osd. Move the inline snippet from run_osd
into a function so that it can be used by scripts as well.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4436 from BCLibCoop/bclibcoop/rgw-content_length
Yehuda Sadeh [Fri, 15 May 2015 21:47:35 +0000 (14:47 -0700)]
Merge pull request #4436 from BCLibCoop/bclibcoop/rgw-content_length

rgw: improve content-length env var handling

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4662 from dachary/wip-11359-tier-tests
Sage Weil [Fri, 15 May 2015 20:36:31 +0000 (13:36 -0700)]
Merge pull request #4662 from dachary/wip-11359-tier-tests

tests: more robust tiering agent tests

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4684 from xinxinsh/wip-fiemap-fix
Haomai Wang [Fri, 15 May 2015 19:19:24 +0000 (03:19 +0800)]
Merge pull request #4684 from xinxinsh/wip-fiemap-fix

do not return non-exist extents when doing sparse read

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4698 from ceph/wip-wn2-comment
Sage Weil [Fri, 15 May 2015 18:40:46 +0000 (11:40 -0700)]
Merge pull request #4698 from ceph/wip-wn2-comment

watch/notify: Clarify comment where notifies are completed

10 years agowatch/notify: Clarify comment where notifies are completed 4698/head
Douglas Fuller [Fri, 15 May 2015 18:37:35 +0000 (11:37 -0700)]
watch/notify: Clarify comment where notifies are completed

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
10 years agoMerge pull request #4653 from ceph/wip-client-misc
Gregory Farnum [Fri, 15 May 2015 17:33:31 +0000 (10:33 -0700)]
Merge pull request #4653 from ceph/wip-client-misc

Wip client misc

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4651 from dachary/wip-erasure-code-benchmark
Loic Dachary [Fri, 15 May 2015 17:13:13 +0000 (19:13 +0200)]
Merge pull request #4651 from dachary/wip-erasure-code-benchmark

erasure-code: add --erased option to ceph_erasure_code_benchmark

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4654 from dachary/wip-erasure-code-bench
Loic Dachary [Fri, 15 May 2015 16:59:22 +0000 (18:59 +0200)]
Merge pull request #4654 from dachary/wip-erasure-code-bench

erasure-code: bench.sh compares isa & jerasure, vandermonde & cauchy

Reviewed-by: Andreas Peters <Andreas.Joachim.Peters@cern.ch>
10 years agoMerge pull request #4694 from ceph/wip-workflow-doc
Kefu Chai [Fri, 15 May 2015 16:56:48 +0000 (00:56 +0800)]
Merge pull request #4694 from ceph/wip-workflow-doc

doc: s/relase/release/

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: s/relase/release/ 4694/head
Loic Dachary [Fri, 15 May 2015 14:44:04 +0000 (16:44 +0200)]
doc: s/relase/release/

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4226 from ceph/wip-11276
Gregory Farnum [Thu, 14 May 2015 23:37:07 +0000 (16:37 -0700)]
Merge pull request #4226 from ceph/wip-11276

#11276: make ceph-fuse well behaved with pool quotas

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4622 from xiaoxichen/wip-rocksdb-conf
Sage Weil [Thu, 14 May 2015 23:22:31 +0000 (16:22 -0700)]
Merge pull request #4622 from xiaoxichen/wip-rocksdb-conf

Wip rocksdb conf

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodo not return non-exist extents when doing sparse read 4684/head
xinxin shu [Thu, 14 May 2015 19:36:37 +0000 (03:36 +0800)]
do not return non-exist extents when doing sparse read

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoMerge pull request #4606 from ceph/wip-rgw-init
Travis Rhoden [Thu, 14 May 2015 17:03:42 +0000 (13:03 -0400)]
Merge pull request #4606 from ceph/wip-rgw-init

init-radosgw: check in /var/lib/ceph/radosgw ; unify w/ sysv version

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
10 years agoinit-radosgw.sysv: remove 4606/head
Sage Weil [Thu, 7 May 2015 22:40:05 +0000 (15:40 -0700)]
init-radosgw.sysv: remove

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoinit-radosgw: unify init-radosgw[.sysv]
Sage Weil [Thu, 7 May 2015 22:39:22 +0000 (15:39 -0700)]
init-radosgw: unify init-radosgw[.sysv]

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoinit-radosgw: look in /var/lib/ceph/radosgw
Sage Weil [Thu, 7 May 2015 22:29:11 +0000 (15:29 -0700)]
init-radosgw: look in /var/lib/ceph/radosgw

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4680 from ceph/wip-fix-group-in-doxygen
Loic Dachary [Thu, 14 May 2015 13:31:17 +0000 (15:31 +0200)]
Merge pull request #4680 from ceph/wip-fix-group-in-doxygen

doc: fix group in doxygen

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: customize css for the group title 4680/head
Kefu Chai [Thu, 14 May 2015 11:08:35 +0000 (19:08 +0800)]
doc: customize css for the group title

Fixes: #9442
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agodoc: use @name to define a group, not @group
Kefu Chai [Thu, 14 May 2015 10:51:22 +0000 (18:51 +0800)]
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>
10 years agoMerge pull request #4671 from dachary/wip-contributing
Loic Dachary [Thu, 14 May 2015 07:04:36 +0000 (09:04 +0200)]
Merge pull request #4671 from dachary/wip-contributing

doc: recommendations related to performances / cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4674 from flaf/master
Loic Dachary [Thu, 14 May 2015 00:08:49 +0000 (02:08 +0200)]
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>
10 years agoMerge pull request #4673 from dachary/wip-bencher
Sage Weil [Thu, 14 May 2015 00:06:46 +0000 (17:06 -0700)]
Merge pull request #4673 from dachary/wip-bencher

tools: remove obsolete aio_bench argument placeholder

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoDoc: add a note about a CRUSH corner case with `ceph osd out` 4674/head
lafont [Thu, 14 May 2015 00:01:01 +0000 (02:01 +0200)]
Doc: add a note about a CRUSH corner case with `ceph osd out`

Signed-off-by: François Lafont <francois.lafont@ac-versailles.fr>
10 years agotools: remove obsolete aio_bench argument placeholder 4673/head
Loic Dachary [Wed, 13 May 2015 23:59:38 +0000 (01:59 +0200)]
tools: remove obsolete aio_bench argument placeholder

It was a noop and has been removed by
1ac727982213bf676beefe9340d6822193dbb700

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4672 from dachary/wip-bencher
Loic Dachary [Wed, 13 May 2015 23:03:32 +0000 (01:03 +0200)]
Merge pull request #4672 from dachary/wip-bencher

common: fix ObjBencher::aio_bench signature

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocommon: fix ObjBencher::aio_bench signature 4672/head
Loic Dachary [Wed, 13 May 2015 22:54:07 +0000 (00:54 +0200)]
common: fix ObjBencher::aio_bench signature

It was broken by 1ac727982213bf676beefe9340d6822193dbb700

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4592 from ceph/wip-7746
Josh Durgin [Wed, 13 May 2015 21:38:58 +0000 (17:38 -0400)]
Merge pull request #4592 from ceph/wip-7746

rbd: add disk usage tool

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4308 from dachary/wip-bencher
Loic Dachary [Wed, 13 May 2015 21:00:05 +0000 (23:00 +0200)]
Merge pull request #4308 from dachary/wip-bencher

common: clarify some obj_bencher code

Reviewed-by: Dmitry Yatsushkevich <dmitry.yatsushkevich@gmail.com>
10 years agoMerge pull request #4650 from stiopaa1/bufferIterator
Loic Dachary [Wed, 13 May 2015 20:52:09 +0000 (22:52 +0200)]
Merge pull request #4650 from stiopaa1/bufferIterator

buffer.h: Removed unnecessary copy constructor, assignment operator a…

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: recommendations related to performances / cleanup 4671/head
Loic Dachary [Wed, 13 May 2015 20:28:14 +0000 (22:28 +0200)]
doc: recommendations related to performances / cleanup

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4668 from ceph/wip-rados-binary-omapsetval
Loic Dachary [Wed, 13 May 2015 20:34:22 +0000 (22:34 +0200)]
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>
10 years agoMerge pull request #4473 from ceph/wip-10809-11135-10290
David Zafman [Wed, 13 May 2015 20:10:39 +0000 (13:10 -0700)]
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>
10 years agotest: Add config changes to all tests to avoid order dependency 4473/head
David Zafman [Tue, 12 May 2015 22:28:07 +0000 (15:28 -0700)]
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>
10 years agoosd: Add admin socket feature set_recovery_delay
David Zafman [Thu, 30 Apr 2015 17:20:24 +0000 (10:20 -0700)]
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>
10 years agoceph-objectstore-tool: For import/export --debug dump the log
David Zafman [Mon, 27 Apr 2015 22:37:14 +0000 (15:37 -0700)]
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>
10 years agotest: Use ceph-objectstore-tool --no-overwrite for import-rados
David Zafman [Tue, 3 Feb 2015 01:41:12 +0000 (17:41 -0800)]
test: Use ceph-objectstore-tool --no-overwrite for import-rados

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Test ceph-objectstore-tool --dry-run in select operations
David Zafman [Fri, 30 Jan 2015 01:15:13 +0000 (17:15 -0800)]
test: Test ceph-objectstore-tool --dry-run in select operations

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Fix ceph-objectstore-tool test missing fd.close()
David Zafman [Fri, 30 Jan 2015 01:14:39 +0000 (17:14 -0800)]
test: Fix ceph-objectstore-tool test missing fd.close()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Fix ceph-objectstore-tool test error message
David Zafman [Fri, 30 Jan 2015 01:13:41 +0000 (17:13 -0800)]
test: Fix ceph-objectstore-tool test error message

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: If object re-appears after removal, just skip it
David Zafman [Sat, 31 Jan 2015 00:56:10 +0000 (16:56 -0800)]
ceph-objectstore-tool: If object re-appears after removal, just skip it

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Add --no-overwrite flag for import-rados
David Zafman [Sat, 31 Jan 2015 00:11:13 +0000 (16:11 -0800)]
ceph-objectstore-tool: Add --no-overwrite flag for import-rados

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Remove list-lost because now we have --dry-run flag
David Zafman [Tue, 3 Feb 2015 00:23:18 +0000 (16:23 -0800)]
ceph-objectstore-tool: Remove list-lost because now we have --dry-run flag

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Add --dry-run option
David Zafman [Fri, 23 Jan 2015 15:34:11 +0000 (07:34 -0800)]
ceph-objectstore-tool: Add --dry-run option

Fixes: #10290
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Add dump-info command to show object info
David Zafman [Thu, 22 Jan 2015 18:07:09 +0000 (10:07 -0800)]
ceph-objectstore-tool: Add dump-info command to show object info

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Use empty string for <object> to specify pgmeta object
David Zafman [Tue, 27 Jan 2015 22:32:42 +0000 (14:32 -0800)]
ceph-objectstore-tool: Use empty string for <object> to specify pgmeta object

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Add a couple of strategically placed prints
John Spray [Mon, 20 Apr 2015 16:28:15 +0000 (17:28 +0100)]
ceph-objectstore-tool: Add a couple of strategically placed prints

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoceph-objectstore-tool: Clean up error handling
David Zafman [Mon, 20 Apr 2015 23:10:18 +0000 (16:10 -0700)]
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>
10 years agoceph-objectstore-tool: Create section around log/missing/divergent_priors of --op log
David Zafman [Wed, 15 Apr 2015 22:40:41 +0000 (15:40 -0700)]
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>
10 years agoceph-objectstore-tool: Add divergent_priors handling
David Zafman [Tue, 14 Apr 2015 20:49:26 +0000 (13:49 -0700)]
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>
10 years agotest: ceph-objectstore-tool: Remove duplicate debug messages, keep cmd/log/call together
David Zafman [Wed, 1 Apr 2015 17:32:32 +0000 (10:32 -0700)]
test: ceph-objectstore-tool: Remove duplicate debug messages, keep cmd/log/call together

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: ceph-objectstore-tool import after split testing
David Zafman [Sat, 28 Mar 2015 02:47:01 +0000 (19:47 -0700)]
test: ceph-objectstore-tool import after split testing

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Use CEPH_DIR where appropriate
David Zafman [Tue, 31 Mar 2015 15:16:03 +0000 (08:16 -0700)]
test: Use CEPH_DIR where appropriate

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Limit how long ceph-objectstore-tool test will wait for health
David Zafman [Tue, 31 Mar 2015 00:35:07 +0000 (17:35 -0700)]
test: Limit how long ceph-objectstore-tool test will wait for health

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Add optional arg to vstart() to provide additional args to vstart
David Zafman [Tue, 31 Mar 2015 00:33:46 +0000 (17:33 -0700)]
test: Add optional arg to vstart() to provide additional args to vstart

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Test ceph-objectstore-tool --op dump-journal output
David Zafman [Fri, 6 Mar 2015 03:35:27 +0000 (19:35 -0800)]
test: Test ceph-objectstore-tool --op dump-journal output

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Pep8 fixes for ceph-objectstore-tool test
David Zafman [Tue, 17 Mar 2015 21:56:06 +0000 (14:56 -0700)]
test: Pep8 fixes for ceph-objectstore-tool test

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Add --force option which is used for import only
David Zafman [Wed, 18 Mar 2015 17:05:24 +0000 (10:05 -0700)]
ceph-objectstore-tool: Add --force option which is used for import only

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Fix pgid scan to skip snapdirs
David Zafman [Fri, 13 Mar 2015 07:41:39 +0000 (00:41 -0700)]
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>
10 years agoceph-objectstore-tool: Add dump-journal op
David Zafman [Mon, 9 Feb 2015 20:24:19 +0000 (12:24 -0800)]
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>
10 years agoosd: FileJournal: Add _fdump() that takes Formatter instead of ostream
David Zafman [Fri, 6 Mar 2015 03:16:45 +0000 (19:16 -0800)]
osd: FileJournal: Add _fdump() that takes Formatter instead of ostream

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: Fix ceph-objectstore-tool test, overwrite OTHERFILE so second check is meaningful
David Zafman [Fri, 6 Mar 2015 02:37:44 +0000 (18:37 -0800)]
test: Fix ceph-objectstore-tool test, overwrite OTHERFILE so second check is meaningful

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: ceph_test_filejournal: Conform to test infrastructure requirements
David Zafman [Fri, 6 Mar 2015 00:37:46 +0000 (16:37 -0800)]
test: ceph_test_filejournal: Conform to test infrastructure requirements

Only call RUN_ALL_TESTS() once

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: ceph_test_filejournal need to force aio because testing with a file
David Zafman [Fri, 6 Mar 2015 00:13:50 +0000 (16:13 -0800)]
test: ceph_test_filejournal need to force aio because testing with a file

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: ceph_test_filejournal fix missing argument to FileJournal constructor
David Zafman [Fri, 6 Mar 2015 00:04:36 +0000 (16:04 -0800)]
test: ceph_test_filejournal fix missing argument to FileJournal constructor

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agotest: ceph_test_filejournal Add check of journalq in WriteTrim test
David Zafman [Fri, 20 Feb 2015 03:48:11 +0000 (19:48 -0800)]
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>
10 years agofilestore: Change int open_journal() to void new_journal()
David Zafman [Wed, 4 Mar 2015 03:51:02 +0000 (19:51 -0800)]
filestore: Change int open_journal() to void new_journal()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: Fix log output in FileJournal::read_entry() coming from do_read_entry()
David Zafman [Fri, 20 Feb 2015 04:17:33 +0000 (20:17 -0800)]
osd: Fix log output in FileJournal::read_entry() coming from do_read_entry()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoos: Add some logging used only by test code
David Zafman [Fri, 20 Feb 2015 03:46:15 +0000 (19:46 -0800)]
os: Add some logging used only by test code

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: Add simple_dump() to FileJournal for unit testing
David Zafman [Wed, 18 Feb 2015 20:34:35 +0000 (12:34 -0800)]
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>
10 years agoosd: FileJournal clean-up
David Zafman [Wed, 18 Feb 2015 20:29:38 +0000 (12:29 -0800)]
osd: FileJournal clean-up

Move aio / directio adjustments to constructor
Indicate functions which only operate before journal is active
Make functions const when possible
Move push_back() of journalq to read_entry()
Change dump() to use do_read_entry() to minimize side effects

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: Dump header in FileJournal::dump()
David Zafman [Fri, 6 Feb 2015 02:48:22 +0000 (18:48 -0800)]
osd: Dump header in FileJournal::dump()

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: FileJournal::read_entry() can't use a zero seq to check for corruption
David Zafman [Fri, 6 Feb 2015 02:40:25 +0000 (18:40 -0800)]
osd: FileJournal::read_entry() can't use a zero seq to check for corruption

Seen when using dump() on a journal which has all entries committed

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosd: Fix flushing in FileJournal::dump()
David Zafman [Fri, 6 Feb 2015 02:36:01 +0000 (18:36 -0800)]
osd: Fix flushing in FileJournal::dump()

Use ostream arg since caller is specifying
Move flush after last section close

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: On any exit release CephContext so logging can flush
David Zafman [Mon, 9 Feb 2015 20:46:20 +0000 (12:46 -0800)]
ceph-objectstore-tool: On any exit release CephContext so logging can flush

Add myexit() which will put() the g_ceph_context if present before exit
Must umount() once the objectstore has been mounted

Fixes: #10809
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Check for keyvaluestore experimental feature
David Zafman [Tue, 10 Feb 2015 01:28:04 +0000 (17:28 -0800)]
ceph-objectstore-tool: Check for keyvaluestore experimental feature

Don't list keyvaluestore as a valid type if feature not enabled

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoceph-objectstore-tool: Eliminate obscure "Invalid params" error
David Zafman [Tue, 10 Feb 2015 01:14:50 +0000 (17:14 -0800)]
ceph-objectstore-tool: Eliminate obscure "Invalid params" error

Will fail later with "No such file or directory" for an empty data-path
because we've already checked for vm.count("data-path")

Signed-off-by: David Zafman <dzafman@redhat.com>