]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoos : remove unused GenericObjectMap::sync() funtion since no caller invoke this function 4757/head
xinxin shu [Mon, 25 May 2015 00:15:00 +0000 (08:15 +0800)]
os : remove unused GenericObjectMap::sync() funtion since no caller invoke this function

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoMerge pull request #4745 from jmunhoz/object-copy-bug
Yehuda Sadeh [Mon, 25 May 2015 07:05:11 +0000 (00:05 -0700)]
Merge pull request #4745 from jmunhoz/object-copy-bug

rgw: Use attrs from source bucket on copy

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4709 from dachary/wip-shec-corpus
Loic Dachary [Sat, 23 May 2015 08:54:12 +0000 (10:54 +0200)]
Merge pull request #4709 from dachary/wip-shec-corpus

erasure-code: update ceph-erasure-code-corpus for shec

10 years agoMerge pull request #4751 from islepnev/wip-11612
Loic Dachary [Sat, 23 May 2015 07:05:03 +0000 (09:05 +0200)]
Merge pull request #4751 from islepnev/wip-11612

Support NVMe device partitions by ceph-disk

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoceph-disk: support NVMe device partitions 4751/head
islepnev [Fri, 17 Apr 2015 19:33:01 +0000 (22:33 +0300)]
ceph-disk: support NVMe device partitions

Linux nvme kernel module v0.9 enumerate devices as following:

/dev/nvme0 - characted revice
/dev/nvme0n1 - whole block device
/dev/nvme0n1p1 - first partition
/dev/nvme0n1p2 - second partition

http://tracker.ceph.com/issues/11612 Fixes: #11612

Signed-off-by: Ilja Slepnev <islepnev@gmail.com>
10 years agoMerge pull request #4736 from tchaikov/wip-11693-only-restart-crashed-osds
Kefu Chai [Fri, 22 May 2015 19:56:34 +0000 (03:56 +0800)]
Merge pull request #4736 from tchaikov/wip-11693-only-restart-crashed-osds

test/test-erasure-code: spin off EIO tests to avoid lingering OSDs after tests finish

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4748 from ceph/wip-11562
Josh Durgin [Fri, 22 May 2015 19:43:46 +0000 (12:43 -0700)]
Merge pull request #4748 from ceph/wip-11562

dev/rbd-diff: clarify encoding of image size

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agotests/test-erasure-code: spin off eio tests into another testsuite 4736/head
Kefu Chai [Fri, 22 May 2015 07:54:22 +0000 (15:54 +0800)]
tests/test-erasure-code: spin off eio tests into another testsuite

* since the eio tests crashes some of the OSD nodes, before the
  change, the tests try to undo the crash before moving on, so it
  won't interfere with following tests. a more robust/clean way to
  do this is to isolate individual tests in a sandbox, so each eio
  test will have its own:
    setup + inject + verify crash + teardown
  cycle. this change helps to remove the cleanup/undo steps in
  invidual test.
* update the disabled tests accordingly.
* use a minimum set of OSDs and R-S(2,1) for the testing to speed
  up the test.
* add the new testsuite to check_SCRIPTS

Fixes: #11693
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agotests: fix the get_config()
Kefu Chai [Fri, 22 May 2015 07:58:10 +0000 (15:58 +0800)]
tests: fix the get_config()

* the "daemon" parameter was not respected.
* update the test_get_config() to check the overrided option instead of
  the default one.
* add set_config()

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4749 from ddiss/ceph_disk_test_fix
Loic Dachary [Fri, 22 May 2015 18:45:16 +0000 (20:45 +0200)]
Merge pull request #4749 from ddiss/ceph_disk_test_fix

tests: don't choke on deleted losetup paths

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: don't choke on deleted losetup paths 4749/head
David Disseldorp [Fri, 22 May 2015 15:22:51 +0000 (17:22 +0200)]
tests: don't choke on deleted losetup paths

If a file has been deleted with a loopback device attached, then the
`losetup --all` output will carry:
/dev/loopX: [0032]:344213 (/.../src/test-ceph-disk/vdf.disk (deleted))

This causes the losetup parsing in reset_leftover_dev() to throw an
error, e.g.:
rreset_leftover_dev: 430: test
'(/home/ddiss/ceph/src/test-ceph-disk/vdf.disk' '(deleted))' =
'(/home/ddiss/ceph/src/test-ceph-disk/vdf.disk)'
test/ceph-disk.sh: line 430: test: too many arguments

Fix this by quoting the path variable for the string comparison.

Signed-off-by: David Disseldorp <ddiss@suse.de>
10 years agodev/rbd-diff: clarify encoding of image size 4748/head
Jason Dillaman [Fri, 22 May 2015 15:18:09 +0000 (11:18 -0400)]
dev/rbd-diff: clarify encoding of image size

Fixes: #11562
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4512 from hjwsm1989/init-ceph
Loic Dachary [Fri, 22 May 2015 14:19:28 +0000 (16:19 +0200)]
Merge pull request #4512 from hjwsm1989/init-ceph

  init-ceph.in: Create osd data dir if don't exists.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4740 from ktdreyer/wip-11688-doc-firewall-ports
Loic Dachary [Fri, 22 May 2015 12:32:04 +0000 (14:32 +0200)]
Merge pull request #4740 from ktdreyer/wip-11688-doc-firewall-ports

#11688: doc: update OSD/MDS firewall port list

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4734 from wonzhq/aio-completion
Kefu Chai [Fri, 22 May 2015 09:57:48 +0000 (17:57 +0800)]
Merge pull request #4734 from wonzhq/aio-completion

test/aio: fix the leak of aio completion

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4738 from dachary/wip-11618-osd-create-dup
Kefu Chai [Fri, 22 May 2015 08:55:04 +0000 (16:55 +0800)]
Merge pull request #4738 from dachary/wip-11618-osd-create-dup

tests: ceph create may consume more than one id

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agotests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh 4738/head
Loic Dachary [Thu, 21 May 2015 14:45:07 +0000 (16:45 +0200)]
tests: CEPH_CLI_TEST_DUP_COMMAND=1 for qa/workunits/cephtool/test.sh

Run cephtool-test-{mon,osd,mds}.sh with CEPH_CLI_TEST_DUP_COMMAND=1 to
detect idempotency related problems during make check. This is how
ceph-qa-suite/tasks/workunit.py will run
suites/rados/singleton/all/cephtool.yaml and it's easier to fix when
make check fails rather than later on when a fully populated rados suite
has one failed job.

http://tracker.ceph.com/issues/11618 Refs: #11618

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph create may consume more than one id
Loic Dachary [Thu, 21 May 2015 14:39:30 +0000 (16:39 +0200)]
tests: ceph create may consume more than one id

When CEPH_CLI_TEST_DUP_COMMAND=1 is set, ceph osd create will consume
two osd id and return the later. Fix the test to account for that and
not assume the osd id being allocated by osd create is always the
next available osd id.

The other osd create tests do not suffer from the same variation because
they provide a UUID argument that guarantees the same osd id is going to
be returned every time.

http://tracker.ceph.com/issues/11618 Fixes: #11618

Signed-off-by: Loic Dachary <ldachary@redhdat.com>
10 years agorgw: Use attrs from source bucket on copy 4745/head
Javier M. Mellid [Fri, 15 May 2015 12:22:29 +0000 (14:22 +0200)]
rgw: Use attrs from source bucket on copy

On copy objects, when bucket source is the same as the destination, use attrs
from source bucket.

Fixes: #11639
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
10 years agoMerge pull request #4617 from aakso/wip-11367-pki-token-expire
Yehuda Sadeh [Thu, 21 May 2015 21:09:38 +0000 (14:09 -0700)]
Merge pull request #4617 from aakso/wip-11367-pki-token-expire

rgw: always check if token is expired

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agodoc: recommend opening entire 6800-7300 port range 4740/head
Ken Dreyer [Thu, 21 May 2015 18:54:30 +0000 (12:54 -0600)]
doc: recommend opening entire 6800-7300 port range

Prior to this commit, the Network Configuration Reference guide and
Troubleshooting guide recommended opening a number of ports that were
unique to the number of daemons that we ran.

This doesn't really cover all use cases. Users can easily restart
daemons in ways that cause the daemons to bind to higher ports. This
leads to OSDs or MDSs binding to ports that are firewalled.

Update the Network Configuration Reference guide and Troubleshooting
guides to simply recommend that users open all the ports between 6800
and 7300 on their OSDs and MDSs.

http://tracker.ceph.com/issues/11688 Refs: #11688

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodoc: update OSD port range to 6800-7300
Ken Dreyer [Thu, 21 May 2015 18:53:43 +0000 (12:53 -0600)]
doc: update OSD port range to 6800-7300

The upper limit for OSD/MDS ports changed from 7100 to 7300 in commit
f9ec5a7945518089ffae540649b77ac06f98df5f. Update the Quick Start
Preflight documentation to reflect this change.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4391 from nilamdyuti/wip-doc-ceph-object-gateway
Yehuda Sadeh [Thu, 21 May 2015 17:00:20 +0000 (13:00 -0400)]
Merge pull request #4391 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Removes references to s3gw.fcgi in simple gateway configuration file...

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agotest/aio: aio completion is not released 4734/head
Zhiqiang Wang [Thu, 21 May 2015 06:58:20 +0000 (14:58 +0800)]
test/aio: aio completion is not released

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agoMerge pull request #4517 from ceph/wip-11388-debian-argparse
Dan Mick [Wed, 20 May 2015 21:54:16 +0000 (14:54 -0700)]
Merge pull request #4517 from ceph/wip-11388-debian-argparse

#11388 debian: move ceph_argparse into ceph-common

Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agoMerge pull request #4721 from ceph/wip-fix-concurrent.sh
Ilya Dryomov [Wed, 20 May 2015 17:54:55 +0000 (20:54 +0300)]
Merge pull request #4721 from ceph/wip-fix-concurrent.sh

Fix ceph.conf path in concurrent.sh - krbd qa suite

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
10 years agodebian: move ceph_argparse into ceph-common 4517/head
Ken Dreyer [Tue, 14 Apr 2015 13:58:17 +0000 (07:58 -0600)]
debian: move ceph_argparse into ceph-common

Prior to this commit, if a user installed the "ceph-common" Debian
package without installing "ceph", then /usr/bin/ceph would crash
because it was missing the ceph_argparse library.

Ship the ceph_argparse library in "ceph-common" instead of "ceph". (This
was the intention of the original commit that moved argparse to "ceph",
2a23eac54957e596d99985bb9e187a668251a9ec)

http://tracker.ceph.com/issues/11388 Refs: #11388

Reported-by: Jens Rosenboom <j.rosenboom@x-ion.de>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4720 from athanatos/wip-clarify-DBObjectMap-sync
Kefu Chai [Wed, 20 May 2015 13:28:28 +0000 (21:28 +0800)]
Merge pull request #4720 from athanatos/wip-clarify-DBObjectMap-sync

DBObjectMap::sync: add comment clarifying locking

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3946 from tchaikov/randomize-scrub-time
Kefu Chai [Wed, 20 May 2015 13:21:13 +0000 (21:21 +0800)]
Merge pull request #3946 from tchaikov/randomize-scrub-time

osd: Randomize scrub time

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoosd: use another name for randomize scrub option 3946/head
Kefu Chai [Fri, 15 May 2015 16:07:27 +0000 (00:07 +0800)]
osd: use another name for randomize scrub option

s/osd_scrub_interval_limit/osd_scrub_interval_randomize_ratio/

Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd: randomize scrub times to avoid scrub wave
Kefu Chai [Mon, 9 Mar 2015 08:42:34 +0000 (16:42 +0800)]
osd: randomize scrub times to avoid scrub wave

- to avoid the scrub wave when the osd_scrub_max_interval reaches in a
  high-load OSD, the scrub time is randomized.
- extract scrub_load_below_threshold() out of scrub_should_schedule()
- schedule an automatic scrub job at a time which is uniformly distributed
  over [now+osd_scrub_min_interval,
        now+osd_scrub_min_interval*(1+osd_scrub_time_limit]. before
  this change this sort of scrubs will be performed once the hard interval
  is end or system load is below the threshold, but with this change, the
  jobs will be performed as long as the load is low or the interval of
  the scheduled scrubs is longer than conf.osd_scrub_max_interval. all
  automatic jobs should be performed in the configured time period, otherwise
  they are postponed.
- the requested scrub job will be scheduled right away, before this change
  it is queued with the timestamp of `now` and postponed after
  osd_scrub_min_interval.

Fixes: #10973
Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd: use __func__ in log messages
Kefu Chai [Mon, 9 Mar 2015 08:47:30 +0000 (16:47 +0800)]
osd: use __func__ in log messages

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd: simplify OSD::scrub_load_below_threshold() a little bit
Kefu Chai [Wed, 15 Apr 2015 04:04:05 +0000 (12:04 +0800)]
osd: simplify OSD::scrub_load_below_threshold() a little bit

avoid unnecessary comparison

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4691 from varadakari/wip-kvs-objheader
Haomai Wang [Wed, 20 May 2015 08:29:21 +0000 (16:29 +0800)]
Merge pull request #4691 from varadakari/wip-kvs-objheader

KeyValueStore: optimize the object header writes

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoqa: unbreak concurrent.sh workunit 4721/head
Vasu Kulkarni [Mon, 18 May 2015 21:25:47 +0000 (17:25 -0400)]
qa: unbreak concurrent.sh workunit

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
10 years agoMerge pull request #4658 from ceph/wip-11481
Yan, Zheng [Tue, 19 May 2015 08:03:52 +0000 (16:03 +0800)]
Merge pull request #4658 from ceph/wip-11481

#11481: MDS resilience to weird mdsmaps

10 years agoMerge pull request #4722 from ceph/wip-rbd-xfstests-20150518
Josh Durgin [Tue, 19 May 2015 06:13:35 +0000 (23:13 -0700)]
Merge pull request #4722 from ceph/wip-rbd-xfstests-20150518

rbd: expunge xfstests generic/078

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agorbd: expunged xfstests generic/078 4722/head
Douglas Fuller [Tue, 19 May 2015 00:37:00 +0000 (17:37 -0700)]
rbd: expunged xfstests generic/078

This tests RENAME_WHITEOUT, which was enabled for xfs in kernel commit
7dcf5c3e4527cfa2807567b00387cf2ed5e07f00. At first execution, it throws a BUG.
Subsequent executions appear to work correctly. This issue manifests for disks
and RBD instances.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
10 years agoMerge pull request #4705 from stiopaa1/exit
David Zafman [Mon, 18 May 2015 20:27:14 +0000 (13:27 -0700)]
Merge pull request #4705 from stiopaa1/exit

cryptic error message in ceph interactive mode

Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoDBObjectMap::sync: add comment clarifying locking 4720/head
Samuel Just [Mon, 18 May 2015 19:29:05 +0000 (12:29 -0700)]
DBObjectMap::sync: add comment clarifying locking

Signed-off-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #4715 from ceph/wip-11641
Yan, Zheng [Mon, 18 May 2015 16:28:01 +0000 (00:28 +0800)]
Merge pull request #4715 from ceph/wip-11641

mds: fix handling missing mydir dirfrag

10 years agomds: fix handling missing mydir dirfrag 4715/head
John Spray [Mon, 18 May 2015 15:15:07 +0000 (16:15 +0100)]
mds: fix handling missing mydir dirfrag

This was broken by 96992466 aka "mds: handle missing mydir dirfrag"

The previous code was mistakenly treating a not-yet-loaded
dirfrag as a non-existent dirfrag, resulting in
inconsistent fragstats even when no objects had
actually been lost.

Fixes: #11641
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4693 from varadakari/wip-kvdb-prefix
Haomai Wang [Mon, 18 May 2015 13:58:10 +0000 (21:58 +0800)]
Merge pull request #4693 from varadakari/wip-kvdb-prefix

KeyValueStore: Fix the prefix comparion to avoid object leaks.

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4692 from varadakari/wip-kvs-iterator
Haomai Wang [Mon, 18 May 2015 13:56:11 +0000 (21:56 +0800)]
Merge pull request #4692 from varadakari/wip-kvs-iterator

wip-kvs-iterator

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #4703 from dachary/wip-make-check-verbose
Kefu Chai [Mon, 18 May 2015 02:14:29 +0000 (10:14 +0800)]
Merge pull request #4703 from dachary/wip-make-check-verbose

tests: reduce make check verbosity

Reviewed-by: Kefu Chai <kchai@redhat.com>
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 agoerasure-code: update ceph-erasure-code-corpus for shec 4709/head
Loic Dachary [Sun, 17 May 2015 15:00:50 +0000 (17:00 +0200)]
erasure-code: update ceph-erasure-code-corpus for shec

Update the ceph-erasure-code-corpus submodule to include the hammer shec
checks.

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 agocryptic error message in ceph interactive mode 4705/head
Michal Jarzabek [Sun, 17 May 2015 14:22:44 +0000 (15:22 +0100)]
cryptic error message in ceph interactive mode

Fixes: #11459
Signed-off-by: Michal Jarzabek <stiopa@gmail.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 ago init-ceph.in: Create osd data dir before fs_type check. 4512/head
huangjun [Thu, 30 Apr 2015 03:35:13 +0000 (11:35 +0800)]
  init-ceph.in: Create osd data dir before fs_type check.
  One host in cluster crashed and rebuilded, but failed to start osds
  because the data dir not exist.

Signed-off-by: huangjun <hjwsm1989@gmail.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 agomds: fix handle_mds_map in standby_replay 4658/head
John Spray [Fri, 15 May 2015 14:53:13 +0000 (15:53 +0100)]
mds: fix handle_mds_map in standby_replay

Broken by "mds: validate the state+rank in MDS map"

Signed-off-by: John Spray <john.spray@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 agoKeyValueStore: Fix the prefix comparion to avoid object leaks. 4693/head
Varada Kari [Fri, 15 May 2015 14:16:26 +0000 (19:46 +0530)]
KeyValueStore: Fix the prefix comparion to avoid object leaks.

Iterator becomes invalid due to a partial prefix comparision in
rmkeys_by_prefix, resulting in not deleting the objects from backend.
Modified the comparision to the given prefix.

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
10 years agoKeyValueStore: Initialize the iterator 4692/head
Varada Kari [Fri, 15 May 2015 14:07:30 +0000 (19:37 +0530)]
KeyValueStore: Initialize the iterator

Initialize the iterator in get_keys and get_keys_with_header.
This fixes the issues with ceph_test_rados_api_aio.

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
10 years agoKeyValueStore: optimize the object header writes 4691/head
Varada Kari [Fri, 15 May 2015 13:09:10 +0000 (18:39 +0530)]
KeyValueStore: optimize the object header writes

Don't write the object header when any strip is overwritten.
write header when new strip is added or any header fields are modified.

Signed-off-by: Varada Kari <varada.kari@sandisk.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 agomds: validate the state+rank in MDS map
John Spray [Tue, 12 May 2015 16:24:58 +0000 (17:24 +0100)]
mds: validate the state+rank in MDS map

Especially:
 * once I have been assigned a rank, it
can't be taken away without restarting
the daemon.
 * once I have entered standby, I can
only go upwards through the states.

Fixes: #11481
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: respawn instead of suicide on blacklist
John Spray [Tue, 12 May 2015 14:17:20 +0000 (15:17 +0100)]
mds: respawn instead of suicide on blacklist

This was already the case in general, but the case
in RecoveryQueue slipped through.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomon: handle DNE beacon from MDS
John Spray [Tue, 12 May 2015 13:57:17 +0000 (14:57 +0100)]
mon: handle DNE beacon from MDS

...by calling fail_mds_gid for that MDS.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: on suicide(), send a DNE beacon to MDSMonitor
John Spray [Tue, 12 May 2015 13:56:44 +0000 (14:56 +0100)]
mds: on suicide(), send a DNE beacon to MDSMonitor

...using the same timeout beacon send routine that
was created for damaged().

Signed-off-by: John Spray <john.spray@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>