]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoGive meaningful error when submodules are not checked out 1978/head
Adam Crume [Tue, 10 Jun 2014 17:47:46 +0000 (10:47 -0700)]
Give meaningful error when submodules are not checked out

Signed-off-by: Adam Crume <adamcrume@gmail.com>
11 years agoosd: Only normalize extent if op uses extent
Adam Crume [Tue, 17 Jun 2014 20:24:45 +0000 (13:24 -0700)]
osd: Only normalize extent if op uses extent

Code in ReplicatedPG was reading and modifying ceph_osd_op.extent,
even though that is a member of a union and only valid for some ops.

Signed-off-by: Adam Crume <adamcrume@gmail.com>
11 years agoMerge pull request #1998 from ceph/wip-disk-ioprio
Samuel Just [Mon, 23 Jun 2014 18:25:55 +0000 (11:25 -0700)]
Merge pull request #1998 from ceph/wip-disk-ioprio

osd: allow io priority for (background) disk threadpool to be set

Backport: firefly, dumpling
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2015 from ceph/wip-8610
Samuel Just [Mon, 23 Jun 2014 18:08:31 +0000 (11:08 -0700)]
Merge pull request #2015 from ceph/wip-8610

osd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately 1972/head 2015/head
Sage Weil [Mon, 23 Jun 2014 17:47:24 +0000 (10:47 -0700)]
osd: ignore CRUSH_ITEM_NONE in compat_must_dispatch_immediately

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1979 from ceph/wip-backfill-priority
Sage Weil [Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)]
Merge pull request #1979 from ceph/wip-backfill-priority

osd: improve backfill prioritization

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: allow io priority to be set for the disk_tp 1998/head
Sage Weil [Thu, 19 Jun 2014 19:34:36 +0000 (12:34 -0700)]
osd: allow io priority to be set for the disk_tp

The disk_tp covers scrubbing, pg deletion, and snap trimming

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/WorkQueue: allow io priority to be set for wq
Sage Weil [Wed, 18 Jun 2014 18:02:09 +0000 (11:02 -0700)]
common/WorkQueue: allow io priority to be set for wq

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/Thread: allow io priority to be set for a Thread
Sage Weil [Wed, 18 Jun 2014 18:01:42 +0000 (11:01 -0700)]
common/Thread: allow io priority to be set for a Thread

Ideally, set this before starting the thread.  If you set it after, we
could potentially race with create() itself.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/io_priority: wrap ioprio_set() and gettid()
Sage Weil [Wed, 18 Jun 2014 18:01:09 +0000 (11:01 -0700)]
common/io_priority: wrap ioprio_set() and gettid()

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/wip-misc-fixes'
Sage Weil [Mon, 23 Jun 2014 15:56:39 +0000 (08:56 -0700)]
Merge remote-tracking branch 'gh/wip-misc-fixes'

Conflicts:
src/mon/Monitor.cc

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #2009 from kevincox/election-int
Sage Weil [Mon, 23 Jun 2014 15:15:33 +0000 (08:15 -0700)]
Merge pull request #2009 from kevincox/election-int

Use sized integer.

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2011 from dachary/wip-osd-bench
Loic Dachary [Mon, 23 Jun 2014 07:57:08 +0000 (09:57 +0200)]
Merge pull request #2011 from dachary/wip-osd-bench

osd: tests for osd bench

Reviewed-by: Huang Jun <hjwsm1989@gmail.com>
11 years agoosd: tests for osd bench 2011/head
Loic Dachary [Sat, 21 Jun 2014 15:03:00 +0000 (17:03 +0200)]
osd: tests for osd bench

Check that the safeguards against timeouts work as expected and that the
default hardcoded values are valid.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1974 from hjwsm1989/osd-bench
Loic Dachary [Sat, 21 Jun 2014 15:06:07 +0000 (17:06 +0200)]
Merge pull request #1974 from hjwsm1989/osd-bench

  Fix EINVAL err when use "ceph tell osd.* bench"

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoUse sized integer. 2009/head
Kevin Cox [Fri, 20 Jun 2014 19:52:20 +0000 (15:52 -0400)]
Use sized integer.

Signed-off-by: Kevin Cox <kevincox@kevincox.ca>
11 years agoMerge pull request #1961 from ceph/wip-6703
Loic Dachary [Fri, 20 Jun 2014 17:45:58 +0000 (19:45 +0200)]
Merge pull request #1961 from ceph/wip-6703

support dmcrypt partitions when activating

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #2007 from GRyall/master
John Wilkins [Fri, 20 Jun 2014 17:05:35 +0000 (10:05 -0700)]
Merge pull request #2007 from GRyall/master

doc: Fixed Typo in pools documentation - replaced '-' with '_' in eg

Reviewed-by: John Wilkins john.wilkins@inktank.com
11 years agodoc: Fixed Typo in pools documentation - replaced '-' with '_' in example set-quota... 2007/head
George Ryall [Fri, 20 Jun 2014 16:45:00 +0000 (17:45 +0100)]
doc: Fixed Typo in pools documentation - replaced '-' with '_' in example set-quota comands.

11 years agoMerge pull request #1997 from ceph/wip-tiermsg
Loic Dachary [Fri, 20 Jun 2014 07:49:32 +0000 (09:49 +0200)]
Merge pull request #1997 from ceph/wip-tiermsg

mon: name instead of id in "has tiers" message

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoosd/osd_types.cc: dump correct pg_log_entry_t member variable 2004/head
Joao Eduardo Luis [Thu, 19 Jun 2014 17:29:31 +0000 (18:29 +0100)]
osd/osd_types.cc: dump correct pg_log_entry_t member variable

We were dumping 'version' twice: for 'version' and 'prior_version'.  We
do have a member variable called 'prior_version', which is assumed to
be the correct one to be dumped.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoosd: use appropriate json types instead of stream when dumping info
Joao Eduardo Luis [Thu, 19 Jun 2014 17:27:49 +0000 (18:27 +0100)]
osd: use appropriate json types instead of stream when dumping info

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: name instead of id in "has tiers" message 1997/head
John Spray [Tue, 3 Jun 2014 09:12:41 +0000 (10:12 +0100)]
mon: name instead of id in "has tiers" message

Instead of "Pool foo has tiers 1 2" print
"Pool foo has tiers bar baz".

Signed-off-by: John Spray <jspray@redhat.com>
11 years agoMerge pull request #1988 from dachary/wip-warnings
Loic Dachary [Thu, 19 Jun 2014 16:06:49 +0000 (18:06 +0200)]
Merge pull request #1988 from dachary/wip-warnings

test: fix -Wsign-compare warnings

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoosd: ECMsgTypes: dump json bools instead of strings
Joao Eduardo Luis [Thu, 19 Jun 2014 15:53:00 +0000 (16:53 +0100)]
osd: ECMsgTypes: dump json bools instead of strings

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoosd: have 'tid' dumped as a json unsigned int where appropriate
Joao Eduardo Luis [Thu, 19 Jun 2014 15:52:06 +0000 (16:52 +0100)]
osd: have 'tid' dumped as a json unsigned int where appropriate

Most of the places dumping it would dump it as a string. Others as an int.
Just a couple would dump it as an unsigned int.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1993 from dachary/fix_ut
Loic Dachary [Thu, 19 Jun 2014 15:41:25 +0000 (17:41 +0200)]
Merge pull request #1993 from dachary/fix_ut

autotools: avoid check_SCRIPTS duplication

Reviewed-by: Wei Luo <luowei@yahoo-inc.com>
11 years agomon: dump 'epoch' as json unsigned instead of int
Joao Eduardo Luis [Thu, 19 Jun 2014 15:31:27 +0000 (16:31 +0100)]
mon: dump 'epoch' as json unsigned instead of int

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: PGMonitor: dump 'epoch' as json int instead of string
Joao Eduardo Luis [Thu, 19 Jun 2014 15:05:07 +0000 (16:05 +0100)]
mon: PGMonitor: dump 'epoch' as json int instead of string

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: OSDMonitor: dump 'up' as json array instead of string
Joao Eduardo Luis [Thu, 19 Jun 2014 14:59:43 +0000 (15:59 +0100)]
mon: OSDMonitor: dump 'up' as json array instead of string

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: OSDMonitor: dump 'acting' as json array instead of string
Joao Eduardo Luis [Thu, 19 Jun 2014 14:56:06 +0000 (15:56 +0100)]
mon: OSDMonitor: dump 'acting' as json array instead of string

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1995 from sjahl/master
John Wilkins [Thu, 19 Jun 2014 12:32:30 +0000 (05:32 -0700)]
Merge pull request #1995 from sjahl/master

doc: Fixed an incorrect flag in radosgw admin docs.

11 years agodoc: Fixed an incorrect flag in radosgw admin docs. 1995/head
Stephen Jahl [Thu, 19 Jun 2014 11:44:45 +0000 (07:44 -0400)]
doc: Fixed an incorrect flag in radosgw admin docs.

Example use a "--gen-key" flag, which doesn't exist. Changed it to
"--gen-access-key".

Signed-off-by: Stephen Jahl <stephenjahl@gmail.com>
11 years agoautotools: avoid check_SCRIPTS duplication 1993/head
Loic Dachary [Thu, 19 Jun 2014 07:54:32 +0000 (09:54 +0200)]
autotools: avoid check_SCRIPTS duplication

The check_SCRIPTS content must be added to EXTRA_DIST, otherwise it will
not be included by make dist and it won't be possible to run make check
successfully.

One solution would be to add $(check_SCRIPTS) to EXTRA_DIST to avoid
duplication and help with long term maintenance. However, $(srcdir) is
not supported in the content of the check_SCRIPTS variable.

A GNU Make variable substitution (patsubst) is used to prepend $(srcdir)
to each script, only when used in the EXTRA_DIST variable.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1992 from luowei62/fix_ut
Loic Dachary [Thu, 19 Jun 2014 07:38:19 +0000 (09:38 +0200)]
Merge pull request #1992 from luowei62/fix_ut

Fix dist package run unit test failed.

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1989 from dachary/wip-8622-rados-alignment
Loic Dachary [Thu, 19 Jun 2014 06:13:26 +0000 (08:13 +0200)]
Merge pull request #1989 from dachary/wip-8622-rados-alignment

tests: prevent gitbuilder trigger in test-erasure-code.sh

Reviewed-by: Lluis Pamies-Juarez <lluis@pamies.cat>
11 years agoFix dist package run unit test failed. 1992/head
luowei [Thu, 19 Jun 2014 04:00:33 +0000 (04:00 +0000)]
Fix dist package run unit test failed.

Signed-off-by: Wei Luo <luowei@yahoo-inc.com>
11 years agotests: prevent gitbuilder trigger in test-erasure-code.sh 1989/head
Loic Dachary [Wed, 18 Jun 2014 22:09:14 +0000 (00:09 +0200)]
tests: prevent gitbuilder trigger in test-erasure-code.sh

Use the INFO keywork instead of WARNING so that gitbuilder does not
confuse this with a warning worth fixing.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agotest: fix -Wsign-compare warnings 1988/head
Loic Dachary [Wed, 18 Jun 2014 22:02:21 +0000 (00:02 +0200)]
test: fix -Wsign-compare warnings

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1987 from dachary/wip-8622-rados-alignment
Loic Dachary [Wed, 18 Jun 2014 21:21:20 +0000 (23:21 +0200)]
Merge pull request #1987 from dachary/wip-8622-rados-alignment

erasure-code: verify that rados put enforces alignment

Reviewed-by: Lluis Pamies-Juarez <lluis@pamies.cat>
11 years agoerasure-code: verify that rados put enforces alignment 1987/head
Loic Dachary [Wed, 18 Jun 2014 15:01:54 +0000 (17:01 +0200)]
erasure-code: verify that rados put enforces alignment

http://tracker.ceph.com/issues/8622 refs: #8622

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1983 from dachary/wip-osd-config
Loic Dachary [Wed, 18 Jun 2014 21:12:41 +0000 (23:12 +0200)]
Merge pull request #1983 from dachary/wip-osd-config

tests: remove spurious and harmless find command

Reviewed-by: Florent Flament <florent.flament@cloudwatt.com>
11 years agoMerge pull request #1984 from llpamies/wip-8622
Loic Dachary [Wed, 18 Jun 2014 21:01:07 +0000 (23:01 +0200)]
Merge pull request #1984 from llpamies/wip-8622

enforce rados put aligment

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1943 from athanatos/wip-8507
Samuel Just [Wed, 18 Jun 2014 18:32:23 +0000 (11:32 -0700)]
Merge pull request #1943 from athanatos/wip-8507

Wip 8507

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1986 from ceph/wip-scrub-sleep
Samuel Just [Wed, 18 Jun 2014 18:16:18 +0000 (11:16 -0700)]
Merge pull request #1986 from ceph/wip-scrub-sleep

osd: introduce simple sleep during scrub

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1985 from concubidated/master
Sage Weil [Wed, 18 Jun 2014 18:09:14 +0000 (11:09 -0700)]
Merge pull request #1985 from concubidated/master

ReplicatedPG: Fix 'ajusted' typo

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoReplicatedPG: 'ajusted' typo 1985/head
Concubidated [Wed, 18 Jun 2014 17:56:25 +0000 (10:56 -0700)]
ReplicatedPG: 'ajusted' typo

Signed-off-by: <Tyler Brekke> tyler.brekke@inktank.com
11 years agorgw-admin: Fix the 'show log' command
Sylvain Munaut [Mon, 1 Jul 2013 11:32:50 +0000 (13:32 +0200)]
rgw-admin: Fix the 'show log' command

Fixes: #8553
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Sylvain Munaut <s.munaut@whatever-company.com>
11 years agoenforce rados put aligment 1984/head
Lluis Pamies-Juarez [Wed, 18 Jun 2014 17:00:09 +0000 (10:00 -0700)]
enforce rados put aligment

Signed-off-by: Lluis Pamies-Juarez <lluis.pamies-juarez@hgst.com>
11 years agotests: remove spurious and harmless find command 1983/head
Loic Dachary [Wed, 18 Jun 2014 13:58:28 +0000 (15:58 +0200)]
tests: remove spurious and harmless find command

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoosd: prioritize backfill based on *how* degraded 1979/head
Sage Weil [Tue, 17 Jun 2014 20:49:44 +0000 (13:49 -0700)]
osd: prioritize backfill based on *how* degraded

Instead of prioritizing all degraded PGs equally, prioritize those that
have the fewest acting members (the most degraded).

Drop the priority constants.

Define our max priority independently of AsyncReserver, which uses a host
unsigned.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: add osd_min_recovery_priority tunable
Sage Weil [Tue, 17 Jun 2014 20:06:57 +0000 (13:06 -0700)]
osd: add osd_min_recovery_priority tunable

Add a tunable to control the minimum priority recovery item that we will
grant a reservation for.  The priority is lower for less-degraded PGs.
This allows a saavy admin to only backfill the least-redundant PGs.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/AsyncReserver: add a min_priority knob
Sage Weil [Tue, 17 Jun 2014 20:04:18 +0000 (13:04 -0700)]
common/AsyncReserver: add a min_priority knob

To do reserve items that are < the min priority.  Default to 0.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: fix word sizes in MBackfillReserve
Sage Weil [Tue, 17 Jun 2014 19:10:21 +0000 (12:10 -0700)]
osd: fix word sizes in MBackfillReserve

Fix these fields to 32 bits.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: introduce simple sleep during scrub 1986/head
Sage Weil [Tue, 17 Jun 2014 17:47:24 +0000 (10:47 -0700)]
osd: introduce simple sleep during scrub

This option is similar to osd_snap_trim_sleep: simply inject an optional
sleep in the thread that is doing scrub work.  This is a very kludgey and
coarse knob for limiting the impact of scrub on the cluster, but can help
until we have a more robust and elegant solution.

Only sleep if we are in the NEW_CHUNK state to avoid delaying processing of
an in-progress chunk.  In this state nothing is blocked on anything.
Conveniently, chunky_scrub() requeues itself for each new chunk.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1968 from ceph/wip-ceph-isatty
Sage Weil [Tue, 17 Jun 2014 17:39:25 +0000 (10:39 -0700)]
Merge pull request #1968 from ceph/wip-ceph-isatty

ceph: output prompt only if stdin is tty

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agomon: Monitor: complex code deduplication algorithm applied to tick()
Joao Eduardo Luis [Tue, 17 Jun 2014 16:27:55 +0000 (17:27 +0100)]
mon: Monitor: complex code deduplication algorithm applied to tick()

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: Monitor: rework tick() so we don't calculate the same thing over and again
Joao Eduardo Luis [Tue, 17 Jun 2014 16:19:34 +0000 (17:19 +0100)]
mon: Monitor: rework tick() so we don't calculate the same thing over and again

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agosupport dmcrypt partitions when activating 1961/head
Alfredo Deza [Fri, 13 Jun 2014 13:37:33 +0000 (09:37 -0400)]
support dmcrypt partitions when activating

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
11 years ago Fix EINVAL err when use "ceph tell osd.* bench" 1974/head
huangjun [Tue, 17 Jun 2014 05:12:58 +0000 (13:12 +0800)]
  Fix EINVAL err when use "ceph tell osd.* bench"

Signed-off-by: huangjun <hjwsm1989@gmail.com>
11 years agoMerge pull request #1947 from ceph/wip-import-purge
Gregory Farnum [Mon, 16 Jun 2014 22:08:17 +0000 (15:08 -0700)]
Merge pull request #1947 from ceph/wip-import-purge

Wip import purge

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #1970 from dachary/wip-erasure-code-profile-default
Loic Dachary [Mon, 16 Jun 2014 20:04:03 +0000 (22:04 +0200)]
Merge pull request #1970 from dachary/wip-erasure-code-profile-default

Revert "erasure-code: create default profile if necessary"

11 years agoRevert "erasure-code: create default profile if necessary" 1970/head
Loic Dachary [Mon, 16 Jun 2014 19:41:00 +0000 (21:41 +0200)]
Revert "erasure-code: create default profile if necessary"

This reverts commit 360de6adf24ef9a1287d169416d5e9bbb72afbec.

Conflicts:
src/mon/OSDMonitor.cc

11 years agomon/OSDMonitor: fix build error
Sage Weil [Mon, 16 Jun 2014 19:28:07 +0000 (12:28 -0700)]
mon/OSDMonitor: fix build error

This broke with 360de6adf24ef9a1287d169416d5e9bbb72afbec.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: verify osd config sanity checks
Loic Dachary [Sun, 15 Jun 2014 09:12:15 +0000 (11:12 +0200)]
osd: verify osd config sanity checks

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1951 from sahid/ut-lru
Loic Dachary [Mon, 16 Jun 2014 17:16:13 +0000 (19:16 +0200)]
Merge pull request #1951 from sahid/ut-lru

Adds tests to include/lru.h + fixes small issues

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1954 from dachary/wip-8307-erasure-code-profile-implicit-creation
Sage Weil [Mon, 16 Jun 2014 16:35:05 +0000 (09:35 -0700)]
Merge pull request #1954 from dachary/wip-8307-erasure-code-profile-implicit-creation

erasure code profile implicit creation

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1964 from ceph/wip-osd-configs
Sage Weil [Mon, 16 Jun 2014 16:30:34 +0000 (09:30 -0700)]
Merge pull request #1964 from ceph/wip-osd-configs

osd: add sanity check/warning on a few key configs

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1966 from dachary/wip-erasure-code-profile-default
Sage Weil [Mon, 16 Jun 2014 16:29:28 +0000 (09:29 -0700)]
Merge pull request #1966 from dachary/wip-erasure-code-profile-default

DNM: erasure-code: create default profile if necessary

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoPendingReleaseNotes: note about keyvaluestore-dev on-disk format change
Sage Weil [Mon, 16 Jun 2014 16:17:36 +0000 (09:17 -0700)]
PendingReleaseNotes: note about keyvaluestore-dev on-disk format change

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1941 from yuyuyu101/wip-8564
Sage Weil [Mon, 16 Jun 2014 16:13:49 +0000 (09:13 -0700)]
Merge pull request #1941 from yuyuyu101/wip-8564

Fix write operation on a deleted object in the same transaction(KeyValueStore)

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agocommon: Enforces the methods lru_pin() and lru_unpin() 1951/head
Sahid Orentino Ferdjaoui [Wed, 11 Jun 2014 13:40:38 +0000 (15:40 +0200)]
common: Enforces the methods lru_pin() and lru_unpin()

If lru_*pin() is called twice, the counter will be incr/decr
incorrectly since it will count more/less pinned objects than
there is and so corrupts the balancing (lru_adjust()).

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agocommon: Fixes issue with lru_clear() + add new test
Sahid Orentino Ferdjaoui [Wed, 11 Jun 2014 13:37:45 +0000 (15:37 +0200)]
common: Fixes issue with lru_clear() + add new test

The method lru_clear() must set attribute lru_num to zero
after lru_top, lru_bot and lru_mid are reseted. indeed, lru_num
is the total number of elements found in all of them.

Also the test insures the good behavior of the method
lru_adjust() - lru_touch() calls lru_adjust every time
to balance lru_top and lru_bot by the value of lru_midpoint.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agocommon: Adds simple tests to verify good behavior
Sahid Orentino Ferdjaoui [Wed, 11 Jun 2014 13:33:09 +0000 (15:33 +0200)]
common: Adds simple tests to verify good behavior

Adds new tests to the lib include/lru.h to verify methods
insert_*.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoceph: output prompt only if stdin is tty 1968/head
Ilya Dryomov [Fri, 13 Jun 2014 08:08:45 +0000 (12:08 +0400)]
ceph: output prompt only if stdin is tty

In loop mode, output prompt only if stdin is tty, i.e. if we are
interactive.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoerasure-code: create default profile if necessary 1966/head
Loic Dachary [Sun, 15 Jun 2014 14:54:02 +0000 (16:54 +0200)]
erasure-code: create default profile if necessary

http://tracker.ceph.com/issues/8601

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1960 from dachary/wip-test-kill-race
Loic Dachary [Sun, 15 Jun 2014 09:56:54 +0000 (11:56 +0200)]
Merge pull request #1960 from dachary/wip-test-kill-race

tests: prevent kill race condition

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoosd: add sanity check/warning on a few key configs 1964/head
Sage Weil [Sat, 14 Jun 2014 17:30:50 +0000 (10:30 -0700)]
osd: add sanity check/warning on a few key configs

Warn when certain config values are set to bad values.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1949 from ceph/wip-7774-3
Josh Durgin [Sat, 14 Jun 2014 01:24:19 +0000 (18:24 -0700)]
Merge pull request #1949 from ceph/wip-7774-3

Wip 7774 3

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1915 from ceph/wip-8452-2
Josh Durgin [Fri, 13 Jun 2014 23:30:37 +0000 (16:30 -0700)]
Merge pull request #1915 from ceph/wip-8452-2

rgw: set meta object in extra flag when initializing it

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoosd: remove non const get_erasure_code_profile 1954/head
Loic Dachary [Fri, 13 Jun 2014 11:01:15 +0000 (13:01 +0200)]
osd: remove non const get_erasure_code_profile

It is not used and will unexpectedly create a new entry if selected when
the const version is intended.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agotests: prevent kill race condition 1960/head
Loic Dachary [Fri, 13 Jun 2014 12:41:39 +0000 (14:41 +0200)]
tests: prevent kill race condition

When trying to kill a daemon, keep its pid in a variable instead of
retrieving it from the pidfile multiple times. It prevents the following
race condition:

  * try to kill ceph-mon
  * ceph-mon is in the process of dying and removed its pidfile
  * try to kill ceph-mon fails because the pidfile is not found
  * another ceph-mon is spawned and fails to bind the port
    because the previous ceph-mon is still holding it

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoosd: improve osd pool create error message readability
Loic Dachary [Wed, 11 Jun 2014 20:53:43 +0000 (22:53 +0200)]
osd: improve osd pool create error message readability

Add std::endl to separate independent error messages related to erasure
code.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoerasure-code: consistent argument parsing for profiles
Loic Dachary [Wed, 11 Jun 2014 20:50:43 +0000 (22:50 +0200)]
erasure-code: consistent argument parsing for profiles

Remove the = from the goodchars of the erasure_code_profile argument of
osd pool create so that it is consistent with the goodchars of osd
erasure-code-profile set / rm.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoerasure-code: OSDMonitor::get_erasure_code is a const
Loic Dachary [Wed, 11 Jun 2014 20:47:49 +0000 (22:47 +0200)]
erasure-code: OSDMonitor::get_erasure_code is a const

If it is not, the non const version of OSDMap::get_erasure_code_profile
is called and a profile is created as a side effect, which is not
intended.

http://tracker.ceph.com/issues/8307 refs: #8307

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoerasure-code: pool create must not create profiles
Loic Dachary [Wed, 11 Jun 2014 20:44:57 +0000 (22:44 +0200)]
erasure-code: pool create must not create profiles

If a non existent profile is provided as an argument to osd pool create,
it must exit on error and not create the profile as a side effect.

http://tracker.ceph.com/issues/8307 refs: #8307

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoqa: extend cephfs_journal_tool_smoke 1947/head
John Spray [Thu, 12 Jun 2014 13:44:04 +0000 (14:44 +0100)]
qa: extend cephfs_journal_tool_smoke

To provide coverage for the 'import' command
resulting in the same contents as before an
export/import cycle.

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agoqa: set +x on cephfs_journal_tool_smoke
John Spray [Thu, 12 Jun 2014 11:05:44 +0000 (12:05 +0100)]
qa: set +x on cephfs_journal_tool_smoke

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agotools/cephfs: Purge trailing objects during import
John Spray [Wed, 21 May 2014 13:07:45 +0000 (14:07 +0100)]
tools/cephfs: Purge trailing objects during import

Reviewed-by: Gregory Farnum <greg@inktank.com>
Signed-off-by: John Spray <john.spray@inktank.com>
11 years agotools/cephfs: error handling in journal_export
John Spray [Wed, 21 May 2014 12:36:26 +0000 (13:36 +0100)]
tools/cephfs: error handling in journal_export

Was failing on unreadable journal even if
only trying to do an import.

Was calling messenger destructor without init
on early failures due to early instantiation
of Dumper.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agotools/cephfs: Clean up waits in Dumper
John Spray [Wed, 21 May 2014 11:54:31 +0000 (12:54 +0100)]
tools/cephfs: Clean up waits in Dumper

Remove some LOC by using C_SaferCond.

Signed-off-by: John Spray <john.spray@inktank.com>
11 years agoMerge pull request #1955 from ceph/wip-8585
Josh Durgin [Fri, 13 Jun 2014 01:02:46 +0000 (18:02 -0700)]
Merge pull request #1955 from ceph/wip-8585

rgw: set a default data extra pool name

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1933 from ceph/wip-8556
Sage Weil [Thu, 12 Jun 2014 23:45:31 +0000 (16:45 -0700)]
Merge pull request #1933 from ceph/wip-8556

osd: do not require EC feature bit from clients.

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoosd/OSDMap: do not require ERASURE_CODE feature of clients 1933/head
Sage Weil [Fri, 6 Jun 2014 20:31:29 +0000 (13:31 -0700)]
osd/OSDMap: do not require ERASURE_CODE feature of clients

Just because an EC pool exists in the cluster does not mean tha tthe client
has to support the feature:

1) The way client IO is initiated is no different for EC pools than for
   replicated pools.
2) People may add an EC pool to an existing cluster with old clients and
   locking those old clients out is very rude when they are not using the
   new pool.
3) The only direct client user of EC pools right now is rgw, and the new
   versions already need to support various other features like CRUSH_V2
   in order to work.  These features are present in new kernels.

Fixes: #8556
Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd/OSDMap: make get_features() take an entity type
Sage Weil [Thu, 12 Jun 2014 23:44:53 +0000 (16:44 -0700)]
osd/OSDMap: make get_features() take an entity type

Make the helper that returns what features are required of the OSDMap take
an entity type argument, as the required features may vary between
components in the cluster.

Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1957 from ceph/wip-doc-os-recommendations
Josh Durgin [Thu, 12 Jun 2014 20:14:13 +0000 (13:14 -0700)]
Merge pull request #1957 from ceph/wip-doc-os-recommendations

doc: Updated the OS Recommendations for Firefly.

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agodoc: Updated the OS Recommendations for Firefly. 1957/head
John Wilkins [Thu, 12 Jun 2014 19:48:29 +0000 (12:48 -0700)]
doc: Updated the OS Recommendations for Firefly.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Updated the example configuration.
John Wilkins [Thu, 12 Jun 2014 18:35:27 +0000 (11:35 -0700)]
doc: Updated the example configuration.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Updated doc for more recent versions.
John Wilkins [Thu, 12 Jun 2014 18:34:41 +0000 (11:34 -0700)]
doc: Updated doc for more recent versions.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoMerge pull request #1939 from ceph/wip-mon
Sage Weil [Thu, 12 Jun 2014 17:37:15 +0000 (10:37 -0700)]
Merge pull request #1939 from ceph/wip-mon

mon: a few basic perfcounter guages

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>