]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Fri, 11 Jul 2014 21:56:40 +0000 (14:56 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agoMerge pull request #2071 from somnathr/wip-sd-cpu-optimized
Samuel Just [Fri, 11 Jul 2014 21:42:48 +0000 (14:42 -0700)]
Merge pull request #2071 from somnathr/wip-sd-cpu-optimized

Wip sd cpu optimized

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2094 from ceph/wip-8815
Gregory Farnum [Fri, 11 Jul 2014 20:13:31 +0000 (13:13 -0700)]
Merge pull request #2094 from ceph/wip-8815

mon: avoid scrub noise due to divering OSDMap encoding versions

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoosd/osd_types: be pedantic about encoding last_force_op_resend without feature bit 2094/head
Sage Weil [Fri, 11 Jul 2014 18:31:22 +0000 (11:31 -0700)]
osd/osd_types: be pedantic about encoding last_force_op_resend without feature bit

The addition of the value is completely backward compatible, but if the
mon feature bits don't match it can cause monitor scrub noice (due to the
parallel OSDMap encoding).  Avoid that by only adding the new field if the
feature (which was added 2 patches after the encoding, see
3152faf79f498a723ae0fe44301ccb21b15a96ab and
45e79a17a932192995f8328ae9f6e8a2a6348d10.

Fixes: #8815
Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoosd/osd_types: remove useless encode_compat local var for pg_pool_t::encode
Sage Weil [Fri, 11 Jul 2014 18:29:05 +0000 (11:29 -0700)]
osd/osd_types: remove useless encode_compat local var for pg_pool_t::encode

This is left over from db3fd1152a87f8f152facdf141f8367296b371df
when we made the HitSet stuff incompat, but that behavior was reverted by
dc3ce58add130ca5a0a20b097b0ac934a1b486c7, leaving this cruft behind.

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2088 from guangyy/wip-8733
Samuel Just [Fri, 11 Jul 2014 17:20:04 +0000 (10:20 -0700)]
Merge pull request #2088 from guangyy/wip-8733

Fix the PG listing issue which could miss objects for EC pool

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2092 from onlyjob/rbdmap
Sage Weil [Fri, 11 Jul 2014 16:03:03 +0000 (09:03 -0700)]
Merge pull request #2092 from onlyjob/rbdmap

rbdmap: per-device mount (Closes: #8538)

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agorbdmap: per-device mount (Closes: #8538) 2092/head
Dmitry Smirnov [Fri, 11 Jul 2014 09:50:24 +0000 (19:50 +1000)]
rbdmap: per-device mount (Closes: #8538)

`/etc/init.d/rbdmap start` was doing `mount -a`. Although (arguably)
`mount -a -O _netdev` could be less disruptive, it's not RBD mapping job to
mount unrelated devices and potentially do it at the wrong time.

Solution is to call `mount {device}` which works as expected and mounts
device even if it given in form `mount /dev/rbd/pool/imagename` while
`/etc/fstab` uses UUID or LABEL notation.

Furthermore this commit

 * fixes global exit code (it was always 0): now it is 0 only when
   all devices were (un)mounted successfully; otherwise non-zero.
 * replaces `mount -a` with per-device post-mapping `mount {dev}`
 * show mapping progress using LSB functions per device instead of for
   {start|stop} invocation.
 * capture output of `(u)mount` (if any) and report it as "info".

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
11 years agorbd.cc: Check io-size avoid floating point exception.
Ma, Jianpeng [Thu, 12 Jun 2014 08:15:17 +0000 (08:15 +0000)]
rbd.cc: Check io-size avoid floating point exception.

In func do_bench_write if io_size is zero,it can cause floating point execption.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agodoc/changelog/v0.80.2: include tag
Sage Weil [Thu, 10 Jul 2014 20:24:08 +0000 (13:24 -0700)]
doc/changelog/v0.80.2: include tag

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoPG::op_must_wait_for_map: pass the epoch rather than the map 2071/head
Somnath Roy [Fri, 27 Jun 2014 21:05:53 +0000 (14:05 -0700)]
PG::op_must_wait_for_map: pass the epoch rather than the map

have_same_or_newer_map is also modified to accept epoch instead of
map.

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
11 years agoMerge branch 'master' of https://github.com/ceph/ceph
John Wilkins [Thu, 10 Jul 2014 18:30:41 +0000 (11:30 -0700)]
Merge branch 'master' of https://github.com/ceph/ceph

11 years agodoc: Added CentOS/RHEL install for git.
John Wilkins [Thu, 10 Jul 2014 18:30:00 +0000 (11:30 -0700)]
doc: Added CentOS/RHEL install for git.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agorgw: modelines
Sage Weil [Thu, 10 Jul 2014 17:54:51 +0000 (10:54 -0700)]
rgw: modelines

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agorgw: fix RGWObjManifestRule decoder
Sage Weil [Thu, 10 Jul 2014 17:36:16 +0000 (10:36 -0700)]
rgw: fix RGWObjManifestRule decoder

Only decode the new field if it is a new struct.

Fixes: #8804
Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agodoc: Added keyring location note to resolve pull abandoned pull request #1946.
John Wilkins [Thu, 10 Jul 2014 15:05:42 +0000 (08:05 -0700)]
doc: Added keyring location note to resolve pull abandoned pull request #1946.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoFix the PG listing issue which could miss objects for EC pool (where there is object... 2088/head
Guang Yang [Wed, 9 Jul 2014 11:20:36 +0000 (11:20 +0000)]
Fix the PG listing issue which could miss objects for EC pool (where there is object shard and generation).
Backport: firefly
Signed-off-by: Guang Yang (yguang@yahoo-inc.com)
11 years agodoc: Clean up formatting, usage and removed duplicate section.
John Wilkins [Thu, 10 Jul 2014 00:18:03 +0000 (17:18 -0700)]
doc: Clean up formatting, usage and removed duplicate section.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc/release-notes: v0.80.2
Sage Weil [Thu, 10 Jul 2014 00:10:12 +0000 (17:10 -0700)]
doc/release-notes: v0.80.2

Signed-off-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #1905 from leseb/doc-rbd-icehouse
John Wilkins [Wed, 9 Jul 2014 23:27:52 +0000 (16:27 -0700)]
Merge pull request #1905 from leseb/doc-rbd-icehouse

doc: rbd icehouse updated. Need to remove duplicate section.

Reviewed-by: John Wilkins <john.wilkins@inktank.com>
11 years agoMerge pull request #2087 from theanalyst/doc/typo-fix
John Wilkins [Wed, 9 Jul 2014 23:05:57 +0000 (16:05 -0700)]
Merge pull request #2087 from theanalyst/doc/typo-fix

doc: Fixing a few typos in docs

Reviewed-by: John Wilkins <john.wilkins@inktank.com>
11 years agoRevert "qa: add an fsx run which turns on kernel debugging"
Greg Farnum [Wed, 9 Jul 2014 17:49:59 +0000 (10:49 -0700)]
Revert "qa: add an fsx run which turns on kernel debugging"

This reverts commit 29c33f0c057acc4e0f4e5022c97553a2dc095b21.
We don't need the debugging any more, and having two separate fsx runners
already caused one update-in-the-wrong-place issue.

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoRevert "qa: add an fsx run which turns on kernel debugging"
Greg Farnum [Wed, 9 Jul 2014 17:49:59 +0000 (10:49 -0700)]
Revert "qa: add an fsx run which turns on kernel debugging"

This reverts commit 29c33f0c057acc4e0f4e5022c97553a2dc095b21.
We don't need the debugging any more, and having two separate fsx runners
already caused one update-in-the-wrong-place issue.

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agodoc: fix a typo in quickstart doc 2087/head
Abhishek Lekshmanan [Wed, 9 Jul 2014 05:48:49 +0000 (11:18 +0530)]
doc: fix a typo in quickstart doc

* doc/start/documenting-ceph.rst: s/along side/alongside

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agodoc: fix a few typos in radosgw docs
Abhishek Lekshmanan [Wed, 9 Jul 2014 05:48:09 +0000 (11:18 +0530)]
doc: fix a few typos in radosgw docs

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agodoc: fix a few typos in rados docs
Abhishek Lekshmanan [Wed, 9 Jul 2014 05:45:08 +0000 (11:15 +0530)]
doc: fix a few typos in rados docs

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agodoc: fix a few typos in the dev docs
Abhishek Lekshmanan [Wed, 9 Jul 2014 05:35:46 +0000 (11:05 +0530)]
doc: fix a few typos in the dev docs

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agodoc: fix a few typos in rbd docs
Abhishek Lekshmanan [Wed, 9 Jul 2014 05:28:59 +0000 (10:58 +0530)]
doc: fix a few typos in rbd docs

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agodoc: Fix a few typos in the install docs
Abhishek Lekshmanan [Wed, 9 Jul 2014 05:17:51 +0000 (10:47 +0530)]
doc: Fix a few typos in the install docs

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agodoc: fix a few typos in architecture page
Abhishek Lekshmanan [Wed, 9 Jul 2014 04:50:54 +0000 (10:20 +0530)]
doc: fix a few typos in architecture page

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agodoc: Fix a typo in the rbd man page
Abhishek Lekshmanan [Wed, 9 Jul 2014 04:46:52 +0000 (10:16 +0530)]
doc: Fix a typo in the rbd man page

's/specifially/specifically'

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
11 years agoMerge pull request #2029 from ceph/wip-8523
Sage Weil [Wed, 9 Jul 2014 00:56:54 +0000 (17:56 -0700)]
Merge pull request #2029 from ceph/wip-8523

mon: OSDMonitor: add 'osd pool get-quota' command

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2085 from ceph/wip-7891
Sage Weil [Tue, 8 Jul 2014 23:25:56 +0000 (16:25 -0700)]
Merge pull request #2085 from ceph/wip-7891

osd: fix pg ref leaks on shutdown

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: cancel agent_timer events on shutdown 2085/head
Sage Weil [Fri, 9 May 2014 15:41:33 +0000 (08:41 -0700)]
osd: cancel agent_timer events on shutdown

We need to cancel all agent timer events on shutdown.  This also needs to
happen early so that any in-progress events will execute before we start
flushing and cleaning up PGs.

Backport: firefly
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: s/applying repop/canceling repop/
Sage Weil [Tue, 8 Jul 2014 23:11:44 +0000 (16:11 -0700)]
osd: s/applying repop/canceling repop/

The 'applying' language dates back to when we would wait for acks from
replicas before applying writes locally.  We don't do any of that any more;
now, this loop just cancels the repops with remove_repop() and some other
cleanup.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: clear PGBackend state on shutdown
Sage Weil [Tue, 8 Jul 2014 23:11:27 +0000 (16:11 -0700)]
osd: clear PGBackend state on shutdown

This was leaking state on shutdown whenever there were in-flight repops
that were canceled.

Fixes: #7891
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: separate cleanup from PGBackend::on_change()
Sage Weil [Tue, 8 Jul 2014 23:10:58 +0000 (16:10 -0700)]
osd: separate cleanup from PGBackend::on_change()

The generic portion of on_change() cleaned up temporary on-disk objects
and requires a Transaction.  The rest is clearing out in-memory state and
does not.  Separate the two.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 8 Jul 2014 18:45:22 +0000 (11:45 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agoqa/workunits: cephtool: test for 'osd pool {get,set}-quota' 2029/head
Joao Eduardo Luis [Fri, 27 Jun 2014 21:20:51 +0000 (22:20 +0100)]
qa/workunits: cephtool: test for 'osd pool {get,set}-quota'

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: OSDMonitor: add 'osd pool get-quota' command
Joao Eduardo Luis [Fri, 27 Jun 2014 20:41:18 +0000 (21:41 +0100)]
mon: OSDMonitor: add 'osd pool get-quota' command

Enables us to obtain current quotas for a given pool.

Fixes: #8523
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #2076 from cernceph/wip-wbthrottle-perfcounters
Samuel Just [Tue, 8 Jul 2014 17:25:20 +0000 (10:25 -0700)]
Merge pull request #2076 from cernceph/wip-wbthrottle-perfcounters

decrement WBThrottle perfcounters in clear_object

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2082 from ceph/wip-8727
Sage Weil [Tue, 8 Jul 2014 17:05:33 +0000 (10:05 -0700)]
Merge pull request #2082 from ceph/wip-8727

messages: MForward: fix compat version

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agomessages: MForward: fix compat version 2082/head
Joao Eduardo Luis [Tue, 8 Jul 2014 15:46:27 +0000 (16:46 +0100)]
messages: MForward: fix compat version

A while ago we bumped the head version and reset the compat version to 0.
Doing this so happens to make the messenger assume that the message does
not support the compat versioning and sets the compat version to the head
version -- thus making compat = 2 when it should have been 1.

The nasty side-effect of this is that upgrading from emperor to firefly
will have emperor-leaders being unable to decode forwarded messages from
firefly-peons.

Fixes: #8727
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #2081 from ceph/wip-osd-leaks
Sage Weil [Tue, 8 Jul 2014 04:08:21 +0000 (21:08 -0700)]
Merge pull request #2081 from ceph/wip-osd-leaks

osd: fix several memory leaks from fast dispatch

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoosd: clear sessions_waiting_on_map on shutdown 2081/head
Sage Weil [Mon, 7 Jul 2014 23:06:49 +0000 (16:06 -0700)]
osd: clear sessions_waiting_on_map on shutdown

Wake up these ops and drop the Session refs on shutdown.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: fix session leak when waiting on map
Sage Weil [Mon, 7 Jul 2014 23:06:21 +0000 (16:06 -0700)]
osd: fix session leak when waiting on map

We don't want to leak the Session if this Session is already waiting on
a map.

Introduced by eb30f88c942d80cbc951d4d0f375479069d15624.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2037 from ceph/wip-async-log
Gregory Farnum [Mon, 7 Jul 2014 22:37:13 +0000 (15:37 -0700)]
Merge pull request #2037 from ceph/wip-async-log

MDS: Encode log events in a separate thread from main execution.

This is a first small step in multi-threading the MDS daemon.

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoosd: clear Sessions for loopback Connections on shutdown
Sage Weil [Tue, 1 Jul 2014 21:31:11 +0000 (14:31 -0700)]
osd: clear Sessions for loopback Connections on shutdown

Starting with the fast dispatch patches, we are calling the handle_connect
on loopback.  Make sure we zap them on shutdown to break the Session <->
Connection ref cycle.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoRevert "OSD: move waiting_for_pg into Session"
Sage Weil [Mon, 7 Jul 2014 22:01:50 +0000 (15:01 -0700)]
Revert "OSD: move waiting_for_pg into Session"

This reverts commit ecda2fef8ce982df3581a3b47ba74ae581d82479.

This leaves Session* refs indefinitely in the map.

This was one source of #7995.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2080 from ceph/wip-8306-rebase
Sage Weil [Mon, 7 Jul 2014 21:52:17 +0000 (14:52 -0700)]
Merge pull request #2080 from ceph/wip-8306-rebase

Wip 8306 rebase

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agoOSD: fix debug logging output
Greg Farnum [Mon, 7 Jul 2014 19:46:16 +0000 (12:46 -0700)]
OSD: fix debug logging output

The snapmapper and infos statements were backwards. Now they aren't.

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #2078 from ceph/wip-8751
Sage Weil [Mon, 7 Jul 2014 20:23:25 +0000 (13:23 -0700)]
Merge pull request #2078 from ceph/wip-8751

test: generalise default_pools in test_rados

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoceph.spec.in: add bash completion file for radosgw-admin 2080/head
Dan Mick [Thu, 3 Jul 2014 23:11:24 +0000 (16:11 -0700)]
ceph.spec.in: add bash completion file for radosgw-admin

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
11 years agoceph.spec.in: rhel7-related changes:
Dan Mick [Thu, 3 Jul 2014 23:10:55 +0000 (16:10 -0700)]
ceph.spec.in: rhel7-related changes:

udev rules: /lib -> /usr/lib
/sbin binaries move to /usr/sbin or %{_sbindir}

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
11 years agoFix/add missing dependencies:
Dan Mick [Thu, 3 Jul 2014 23:08:44 +0000 (16:08 -0700)]
Fix/add missing dependencies:

- rbd-fuse depends on librados2/librbd1
- ceph-devel depends on specific releases of libs and libcephfs_jni1
- librbd1 depends on librados2
- python-ceph does not depend on libcephfs1

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
11 years agoceph.spec.in: whitespace fixes
Dan Mick [Thu, 3 Jul 2014 23:05:00 +0000 (16:05 -0700)]
ceph.spec.in: whitespace fixes

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
11 years agoceph.spec.in: split out ceph-common as in Debian
Dan Mick [Thu, 3 Jul 2014 23:04:10 +0000 (16:04 -0700)]
ceph.spec.in: split out ceph-common as in Debian

Move files, postun scriptlet, and add dependencies on ceph-common
where appropriate

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
11 years agotest: generalise default_pools in test_rados 2078/head
John Spray [Mon, 7 Jul 2014 17:18:28 +0000 (18:18 +0100)]
test: generalise default_pools in test_rados

Instead of fragile assumptions about what pools
do or do not exist by default, simply use what
exists at test setup time as a baseline.

Fixes: #8751
Signed-off-by: John Spray <john.spray@redhat.com>
11 years agoMerge pull request #2074 from onlyjob/docs
Sage Weil [Mon, 7 Jul 2014 16:07:04 +0000 (09:07 -0700)]
Merge pull request #2074 from onlyjob/docs

doc: mention kernel support for rbd format 2

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2077 from ceph/wip-8754
Sage Weil [Mon, 7 Jul 2014 16:04:57 +0000 (09:04 -0700)]
Merge pull request #2077 from ceph/wip-8754

tests: don't depend on 'data' pool in rbd test

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agotests: don't depend on 'data' pool in rbd test 2077/head
John Spray [Mon, 7 Jul 2014 14:45:54 +0000 (15:45 +0100)]
tests: don't depend on 'data' pool in rbd test

Since we removed the default 'data' and 'metadata' pools,
tests which need a pool should create it themselves.

Signed-off-by: John Spray <john.spray@redhat.com>
11 years agodoc/release-notes: clarify CRUSH notes about tunables
Sage Weil [Mon, 7 Jul 2014 14:05:38 +0000 (07:05 -0700)]
doc/release-notes: clarify CRUSH notes about tunables

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agodecrement WBThrottle perfcounters in clear_object 2076/head
Dan van der Ster [Mon, 7 Jul 2014 13:51:51 +0000 (15:51 +0200)]
decrement WBThrottle perfcounters in clear_object

We observed that the WBThrottle perfcounters are leaking upwards
at a rate of around 50-100 ios_dirtied per day. The counters are
currently not decremented in clear_object, so that's the likely
explanation. Decrement them like elsewhere in WBThrottle.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
11 years agoMerge pull request #2075 from ceph/wip-8745
Sage Weil [Mon, 7 Jul 2014 13:54:49 +0000 (06:54 -0700)]
Merge pull request #2075 from ceph/wip-8745

mds: use client-provided time stamp for user-visible file metadata

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agomds: use client-provided time stamp for user-visible file metadata 2075/head
Yan, Zheng [Mon, 7 Jul 2014 08:16:27 +0000 (16:16 +0800)]
mds: use client-provided time stamp for user-visible file metadata

Fixes: #8745
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
11 years agodoc: mention kernel support for rbd format 2 2074/head
Dmitry Smirnov [Sat, 5 Jul 2014 09:27:24 +0000 (19:27 +1000)]
doc: mention kernel support for rbd format 2

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Sat, 5 Jul 2014 04:18:55 +0000 (21:18 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agoMerge pull request #2072 from ceph/wip-8738-next
Sage Weil [Sat, 5 Jul 2014 01:35:24 +0000 (18:35 -0700)]
Merge pull request #2072 from ceph/wip-8738-next

Patch up the CRUSH map compatibility guards

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@redhat.com>
11 years agodoc: Fix a typo regarding requiretty for RHEL based platforms
Wido den Hollander [Fri, 4 Jul 2014 12:28:03 +0000 (14:28 +0200)]
doc: Fix a typo regarding requiretty for RHEL based platforms

11 years agoMerge pull request #2058 from ceph/wip-refs
Sage Weil [Fri, 4 Jul 2014 00:36:48 +0000 (17:36 -0700)]
Merge pull request #2058 from ceph/wip-refs

refcount debugging for RefCountedObject

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agomon: check changes to the whole CRUSH map and to tunables against cluster features 2072/head
Greg Farnum [Thu, 3 Jul 2014 23:30:49 +0000 (16:30 -0700)]
mon: check changes to the whole CRUSH map and to tunables against cluster features

When we change the tunables, or set a new CRUSH map, we need to make sure it's
supported by all the monitors and OSDs currently participating in the cluster.

Fixes: #8738
Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoOSDMonitor: fix quorum_features comparison in check_cluster_features
Greg Farnum [Thu, 3 Jul 2014 22:24:30 +0000 (15:24 -0700)]
OSDMonitor: fix quorum_features comparison in check_cluster_features

We need to see if there's a feature which is not in the quorum_features,
not if there are no features in common!

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agomsg: debug refs on incoming Messages 2058/head
Sage Weil [Tue, 1 Jul 2014 22:47:44 +0000 (15:47 -0700)]
msg: debug refs on incoming Messages

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/RefCountedObject: make nref, cct private
Sage Weil [Tue, 1 Jul 2014 22:51:30 +0000 (15:51 -0700)]
common/RefCountedObject: make nref, cct private

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomsg/Message: use RefCountedObject ctor to set initial ref count
Sage Weil [Tue, 1 Jul 2014 22:50:33 +0000 (15:50 -0700)]
msg/Message: use RefCountedObject ctor to set initial ref count

Also, drop the useless assert in the dtor (the RefCountedObject dtor does
the same).

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomsg/Pipe: debug Pipe refs
Sage Weil [Tue, 1 Jul 2014 23:44:02 +0000 (16:44 -0700)]
msg/Pipe: debug Pipe refs

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomsg: debug Connection refs
Sage Weil [Tue, 1 Jul 2014 23:43:46 +0000 (16:43 -0700)]
msg: debug Connection refs

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoosd: debug Session refs
Sage Weil [Tue, 1 Jul 2014 22:44:11 +0000 (15:44 -0700)]
osd: debug Session refs

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/RefCountedObject: assert nref == 0 in dtor
Sage Weil [Tue, 1 Jul 2014 22:51:06 +0000 (15:51 -0700)]
common/RefCountedObject: assert nref == 0 in dtor

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/RefCountedObject: optionally take initial ref count to ctor
Sage Weil [Tue, 1 Jul 2014 22:49:58 +0000 (15:49 -0700)]
common/RefCountedObject: optionally take initial ref count to ctor

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/RefCountedObject: optionally debug
Sage Weil [Tue, 1 Jul 2014 22:43:47 +0000 (15:43 -0700)]
common/RefCountedObject: optionally debug

Introduce a 'refs' subsys for logging.  Print log ref count inc and dec
for any RefCountedObject that gets a cct passed to its ctor.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #2059 from ceph/wip-osd-dumpres
Sage Weil [Thu, 3 Jul 2014 21:27:42 +0000 (14:27 -0700)]
Merge pull request #2059 from ceph/wip-osd-dumpres

osd: allow dumping reservation state via asok

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2069 from thorstenb/thb-buildconvenience-1
Sage Weil [Thu, 3 Jul 2014 21:00:34 +0000 (14:00 -0700)]
Merge pull request #2069 from thorstenb/thb-buildconvenience-1

Automagically setup submodules on first run.

Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoMerge pull request #2066 from thorstenb/wip-janitorial-clang-2
Sage Weil [Thu, 3 Jul 2014 20:56:01 +0000 (13:56 -0700)]
Merge pull request #2066 from thorstenb/wip-janitorial-clang-2

[werror] Fix c++11-compat-reserved-user-defined-literal

11 years agoMerge pull request #2062 from somnathr/wip-sd-replicated-pg
Samuel Just [Thu, 3 Jul 2014 20:36:50 +0000 (13:36 -0700)]
Merge pull request #2062 from somnathr/wip-sd-replicated-pg

ReplicatedPG: Removed the redundant register_snapset_context call

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2064 from somnathr/wip-sd-share-map
Samuel Just [Thu, 3 Jul 2014 20:36:27 +0000 (13:36 -0700)]
Merge pull request #2064 from somnathr/wip-sd-share-map

OSD: adjust share_map() to handle the case that the osd is down

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2065 from somnathr/wip-sd-optracker
Samuel Just [Thu, 3 Jul 2014 20:35:23 +0000 (13:35 -0700)]
Merge pull request #2065 from somnathr/wip-sd-optracker

Pull request for optracker changes

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #2063 from athanatos/wip-8691
Samuel Just [Thu, 3 Jul 2014 20:34:19 +0000 (13:34 -0700)]
Merge pull request #2063 from athanatos/wip-8691

OSD: wake_pg_waiters after dropping pg lock

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #2047 from dachary/wip-osd-config
Loic Dachary [Thu, 3 Jul 2014 14:00:56 +0000 (16:00 +0200)]
Merge pull request #2047 from dachary/wip-osd-config

osd: improve tests for configuration updates

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoMerge pull request #2036 from ceph/wip-osd-map-cache-size
Loic Dachary [Thu, 3 Jul 2014 12:40:42 +0000 (14:40 +0200)]
Merge pull request #2036 from ceph/wip-osd-map-cache-size

osd: allow osd map cache size to be adjusted at runtime

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #2068 from thorstenb/wip-janitorial-clang-4
Loic Dachary [Thu, 3 Jul 2014 09:29:35 +0000 (11:29 +0200)]
Merge pull request #2068 from thorstenb/wip-janitorial-clang-4

ceph_argparse_flag has no regular 3rd parameter.

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoqa: support running under non privileged user
Loic Dachary [Tue, 1 Jul 2014 06:42:58 +0000 (08:42 +0200)]
qa: support running under non privileged user

If the test is run against a cluster started with vstart.sh (which is
the case for make check), the --asok-does-not-need-root disables the use
of sudo and allows the test to run without requiring privileged user
permissions.

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 522174b066044e51a7019bd6cad81117e83c394e)

11 years agoMerge pull request #2061 from ceph/wip-8728
Sage Weil [Thu, 3 Jul 2014 00:55:05 +0000 (17:55 -0700)]
Merge pull request #2061 from ceph/wip-8728

qa/workunits/rest/test.py: make osd create test idempotent

Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agoMerge pull request #2046 from ceph/wip-8670
Sage Weil [Thu, 3 Jul 2014 00:44:56 +0000 (17:44 -0700)]
Merge pull request #2046 from ceph/wip-8670

mon: OSDMonitor: 'osd pool' - if we can set it, we must be able to get it

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Sage Weil <sage@redhat.com>
11 years agoAutomagically setup submodules on first run. 2069/head
Thorsten Behrens [Mon, 2 Jun 2014 20:11:24 +0000 (22:11 +0200)]
Automagically setup submodules on first run.

I mean, who's reading the README, anyway?

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
11 years agoceph_argparse_flag has no regular 3rd parameter. 2068/head
Thorsten Behrens [Wed, 2 Jul 2014 22:15:03 +0000 (00:15 +0200)]
ceph_argparse_flag has no regular 3rd parameter.

With clang warning: 'va_start' has undefined behavior with reference
types, noticing copy-paste mistake on ceph_argparse_flag.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
11 years ago[werror] Fix c++11-compat-reserved-user-defined-literal 2066/head
Thorsten Behrens [Tue, 24 Jun 2014 22:26:35 +0000 (00:26 +0200)]
[werror] Fix c++11-compat-reserved-user-defined-literal

c++11 readiness, avoid clash with
http://www.stroustrup.com/C++11FAQ.html#UD-literals

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
11 years agoOSD: adjust share_map() to handle the case that the osd is down 2064/head
Somnath Roy [Wed, 2 Jul 2014 18:51:38 +0000 (11:51 -0700)]
OSD: adjust share_map() to handle the case that the osd is down

The assert was hitting while OSd is waiting for becoming healthy
in handle_osd_map(). This can happen while io is going on and
OSDs are made down forcefully by say osd thrash command.
So, the fix could be instead of asserting just return from here.

Fixes: #8646
Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
11 years agomon: OSDMonitor: 'osd pool' - if we can set it, we must be able to get it 2046/head
Joao Eduardo Luis [Mon, 30 Jun 2014 16:51:47 +0000 (17:51 +0100)]
mon: OSDMonitor: 'osd pool' - if we can set it, we must be able to get it

Add support to get the values for the following variables:
 - target_max_objects
 - target_max_bytes
 - cache_target_dirty_ratio
 - cache_target_full_ratio
 - cache_min_flush_age
 - cache_min_evict_age

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoReplicatedPG: Removed the redundant register_snapset_context call 2062/head
Somnath Roy [Wed, 2 Jul 2014 18:20:29 +0000 (11:20 -0700)]
ReplicatedPG: Removed the redundant register_snapset_context call

In the get_object_context(), the get_snapset_context is been called
and the register_snapset_context is already been invoked from there.
This call seems to be redundant.

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>