]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoMerge pull request #3548 from ceph/wip-10643
Loic Dachary [Sun, 22 Mar 2015 22:03:35 +0000 (23:03 +0100)]
Merge pull request #3548 from ceph/wip-10643

mon: MDSMonitor: missing backports for giant

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4053 from dachary/wip-8011-giant
Loic Dachary [Sun, 22 Mar 2015 21:12:58 +0000 (22:12 +0100)]
Merge pull request #4053 from dachary/wip-8011-giant

osd/ReplicatedPG.cc: 5244: FAILED assert(soid < scrubber.start || soid >= scrubber.end)

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4052 from dachary/wip-10844-giant
Loic Dachary [Sun, 22 Mar 2015 21:12:40 +0000 (22:12 +0100)]
Merge pull request #4052 from dachary/wip-10844-giant

mon: caps validation should rely on EntityName instead of entity_name_t

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4050 from dachary/wip-10817-giant
Loic Dachary [Sun, 22 Mar 2015 21:12:15 +0000 (22:12 +0100)]
Merge pull request #4050 from dachary/wip-10817-giant

WorkQueue: make timeout when calling WaitInterval configurable

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4049 from dachary/wip-10787-giant
Loic Dachary [Sun, 22 Mar 2015 21:11:43 +0000 (22:11 +0100)]
Merge pull request #4049 from dachary/wip-10787-giant

mon: OSDMonitor::map_cache is buggy, send_incremental is not conservative

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4048 from dachary/wip-10770-giant
Loic Dachary [Sun, 22 Mar 2015 21:09:28 +0000 (22:09 +0100)]
Merge pull request #4048 from dachary/wip-10770-giant

rgw: pending bucket index operations are not cancelled correctly

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4046 from dachary/wip-10723-giant
Loic Dachary [Sun, 22 Mar 2015 21:09:06 +0000 (22:09 +0100)]
Merge pull request #4046 from dachary/wip-10723-giant

rados python binding leaks Ioctx objects

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4044 from dachary/wip-10617-giant
Loic Dachary [Sun, 22 Mar 2015 21:08:45 +0000 (22:08 +0100)]
Merge pull request #4044 from dachary/wip-10617-giant

osd: pgs for deleted pools don't finish getting removed if osd restarts

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4034 from dachary/wip-10475-giant
Loic Dachary [Sun, 22 Mar 2015 21:08:20 +0000 (22:08 +0100)]
Merge pull request #4034 from dachary/wip-10475-giant

rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #4033 from dachary/wip-10471-giant
Loic Dachary [Sun, 22 Mar 2015 21:07:53 +0000 (22:07 +0100)]
Merge pull request #4033 from dachary/wip-10471-giant

rgw: index swift keys appropriately

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agoMerge pull request #3971 from ceph/giant-11053
John Spray [Thu, 19 Mar 2015 22:07:58 +0000 (22:07 +0000)]
Merge pull request #3971 from ceph/giant-11053

mds: fix assertion caused by system clock backwards

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agorgw: Swift API. Support for X-Remove-Container-Meta-{key} header. 4034/head
Dmytro Iurchenko [Tue, 3 Feb 2015 15:54:38 +0000 (17:54 +0200)]
rgw: Swift API. Support for X-Remove-Container-Meta-{key} header.

Fixes: #10475
Backport: hammer, firefly
Reported-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
(cherry picked from commit f67bfa24fd6f69c2fcc0987eba8b6b426dd78320)

Conflicts:
src/rgw/rgw_rest.h
        trivial merge: prototype of an unrelated function changed
        src/rgw/rgw_op.cc
        s/is_object_op/!(s->object == NULL)/

10 years agoShardedThreadPool: make wait timeout on empty queue configurable 4050/head
Samuel Just [Tue, 10 Feb 2015 01:41:19 +0000 (17:41 -0800)]
ShardedThreadPool: make wait timeout on empty queue configurable

Fixes: 10818
Backport: giant
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 7002f934e6664daa995ca0629c0ea3bae1c6bddf)

10 years agoWorkQueue: make wait timeout on empty queue configurable
Samuel Just [Tue, 10 Feb 2015 01:11:38 +0000 (17:11 -0800)]
WorkQueue: make wait timeout on empty queue configurable

Fixes: 10817
Backport: giant, firefly, dumpling
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5aa6f910843e98a05bfcabe6f29d612cf335edbf)

10 years agoPGLog: include rollback_info_trimmed_to in (read|write)_log
Samuel Just [Thu, 20 Nov 2014 23:15:08 +0000 (15:15 -0800)]
PGLog: include rollback_info_trimmed_to in (read|write)_log

Fixes: #10157
Backport: firefly, giant
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 1fe8b846641486cc294fe7e1d2450132c38d2dba)

10 years agomon: MonCap: take EntityName instead when expanding profiles 4052/head
Joao Eduardo Luis [Wed, 11 Feb 2015 23:36:01 +0000 (23:36 +0000)]
mon: MonCap: take EntityName instead when expanding profiles

entity_name_t is tightly coupled to the messenger, while EntityName is
tied to auth.  When expanding profiles we want to tie the profile
expansion to the entity that was authenticated.  Otherwise we may incur
in weird behavior such as having caps validation failing because a given
client messenger inst does not match the auth entity it used.

e.g., running

ceph --name osd.0 config-key exists foo daemon-private/osd.X/foo

has entity_name_t 'client.12345' and EntityName 'osd.0'.  Using
entity_name_t during profile expansion would not allow the client access
to daemon-private/osd.X/foo (client.12345 != osd.X).

Fixes: #10844
Backport: firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit 87544f68b88fb3dd17c519de3119a9ad9ab21dfb)

10 years agomon: Monitor: stash auth entity name in session
Joao Eduardo Luis [Fri, 14 Nov 2014 21:03:54 +0000 (21:03 +0000)]
mon: Monitor: stash auth entity name in session

Backport: giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit ca8e1efc0be9bffcfbdce5593526d257aa498062)

10 years agoReplicatedPG: fail a non-blocking flush if the object is being scrubbed 4053/head
Samuel Just [Thu, 20 Nov 2014 22:27:39 +0000 (14:27 -0800)]
ReplicatedPG: fail a non-blocking flush if the object is being scrubbed

Fixes: #8011
Backport: firefly, giant
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 9b26de3f3653d38dcdfc5b97874089f19d2a59d7)

10 years agoMerge pull request #4042 from dachary/wip-10546-giant
Sage Weil [Tue, 17 Mar 2015 17:52:01 +0000 (10:52 -0700)]
Merge pull request #4042 from dachary/wip-10546-giant

ceph time check start round bug in monitor.cc

10 years agoMerge pull request #4047 from dachary/wip-10762-giant
Sage Weil [Tue, 17 Mar 2015 17:50:26 +0000 (10:50 -0700)]
Merge pull request #4047 from dachary/wip-10762-giant

mon: osd gets marked down twice

10 years agoMerge pull request #4041 from dachary/wip-10512-giant
Sage Weil [Tue, 17 Mar 2015 17:49:53 +0000 (10:49 -0700)]
Merge pull request #4041 from dachary/wip-10512-giant

osd: cancel_flush requeues blocked events after blocking event

10 years agoMerge pull request #4031 from dachary/wip-10353-giant
Sage Weil [Tue, 17 Mar 2015 17:47:26 +0000 (10:47 -0700)]
Merge pull request #4031 from dachary/wip-10353-giant

crush: set_choose_tries = 100 for erasure code rulesets

10 years agoMerge pull request #4029 from dachary/wip-9910-giant
Sage Weil [Tue, 17 Mar 2015 17:47:08 +0000 (10:47 -0700)]
Merge pull request #4029 from dachary/wip-9910-giant

msg/Pipe: discard delay queue before incoming queue

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #4030 from dachary/wip-10351-giant
Sage Weil [Tue, 17 Mar 2015 17:44:53 +0000 (10:44 -0700)]
Merge pull request #4030 from dachary/wip-10351-giant

mount.ceph: avoid spurious error message

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4028 from dachary/wip-10259-giant
Sage Weil [Tue, 17 Mar 2015 17:44:00 +0000 (10:44 -0700)]
Merge pull request #4028 from dachary/wip-10259-giant

osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::o...

10 years agoMerge pull request #4027 from dachary/wip-10257-giant
Sage Weil [Tue, 17 Mar 2015 17:42:10 +0000 (10:42 -0700)]
Merge pull request #4027 from dachary/wip-10257-giant

  mon: PGMonitor: several stats output error fixes

10 years agoMerge pull request #3998 from dzafman/wip-10677
Sage Weil [Tue, 17 Mar 2015 17:41:56 +0000 (10:41 -0700)]
Merge pull request #3998 from dzafman/wip-10677

Fix ceph command manpage to match ceph -h (giant)

Reviewed-by: Xinxin Shu <xinxin.shu@intel.com>
10 years agoMerge pull request #3921 from sponce/wip-11078-giant
Sage Weil [Tue, 17 Mar 2015 17:40:02 +0000 (10:40 -0700)]
Merge pull request #3921 from sponce/wip-11078-giant

Fix libstriprados::stat, use strtoll insdead of strtol

10 years agoMerge pull request #3819 from tchaikov/giant-pg-leak-10421
Sage Weil [Tue, 17 Mar 2015 17:36:28 +0000 (10:36 -0700)]
Merge pull request #3819 from tchaikov/giant-pg-leak-10421

osd: fix PG leak in SnapTrimWQ._clear()

10 years agoMerge pull request #3771 from ceph/wip-10883-giant
Sage Weil [Tue, 17 Mar 2015 17:35:37 +0000 (10:35 -0700)]
Merge pull request #3771 from ceph/wip-10883-giant

osd: Fix FileJournal wrap to get header out first

10 years agoMerge pull request #3637 from sponce/wip-10758-giant
Sage Weil [Tue, 17 Mar 2015 17:35:29 +0000 (10:35 -0700)]
Merge pull request #3637 from sponce/wip-10758-giant

Backport of pull request 3633 to giant : Fixed write_full behavior in libradosstriper

10 years agomon/OSDMonitor: do not trust small values in osd epoch cache 4049/head
Sage Weil [Thu, 12 Feb 2015 21:49:50 +0000 (13:49 -0800)]
mon/OSDMonitor: do not trust small values in osd epoch cache

If the epoch cache says the osd has epoch 100 and the osd is asking for
epoch 200+, do not send it 100+.

Fixes: #10787
Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a5759e9b97107488a8508f36adf9ca1aba3fae07)

10 years agorgw: send appropriate op to cancel bucket index pending operation 4048/head
Yehuda Sadeh [Thu, 5 Feb 2015 17:33:26 +0000 (09:33 -0800)]
rgw: send appropriate op to cancel bucket index pending operation

Fixes: #10770
Backport: firefly, giant

Reported-by: baijiaruo <baijiaruo@126.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit dfee96e3aebcaeef18c721ab73f0460eba69f1c7)

Conflicts:
src/rgw/rgw_rados.cc
        resolved by manual s/ADD/CANCEL/

10 years agomon: ignore osd failures from before up_from 4047/head
Sage Weil [Thu, 5 Feb 2015 11:07:50 +0000 (03:07 -0800)]
mon: ignore osd failures from before up_from

If the failure was generated for an instance of the OSD prior to when
it came up, ignore it.

This probably causes a fair bit of unnecessary flapping in the wild...

Backport: giant, firefly
Fixes: #10762
Reported-by: Dan van der Ster <dan@vanderster.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 400ac237d35d0d1d53f240fea87e8483c0e2a7f5)

10 years agorados.py: keep reference to python callbacks 4046/head
Josh Durgin [Tue, 10 Feb 2015 04:50:23 +0000 (20:50 -0800)]
rados.py: keep reference to python callbacks

If we don't keep a reference to these, the librados aio calls will
segfault since the python-level callbacks will have been garbage
collected. Passing them to aio_create_completion() does not take a
reference to them. Keep a reference in the python Completion object
associated with the request, since they need the same lifetime.

This fixes a regression from 60b019f69aa0e39d276c669698c92fc890599f50.

Fixes: #10775
Backport: dumpling, firefly, giant
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 36d37aadbbbece28d70e827511f1a473d851463d)
(cherry picked from commit 5f1245e131e33a98572408c8223deed2c7cf7b75)

10 years agoFix memory leak in python rados bindings
Billy Olsen [Mon, 2 Feb 2015 23:24:59 +0000 (16:24 -0700)]
Fix memory leak in python rados bindings

A circular reference was inadvertently created when using the
CFUNCTYPE binding for callbacks for the asynchronous i/o callbacks.
This commit refactors the usage of the callbacks such that the
Ioctx object does not have a class reference to the callbacks.

Fixes: #10723
Backport: giant, firefly, dumpling
Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 60b019f69aa0e39d276c669698c92fc890599f50)

10 years agoosd: do not ignore deleted pgs on startup 4044/head
Sage Weil [Fri, 23 Jan 2015 18:47:44 +0000 (10:47 -0800)]
osd: do not ignore deleted pgs on startup

These need to get instantiated so that we can complete the removal process.

Fixes: #10617
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 879fd0c192f5d3c6afd36c2df359806ea95827b8)

10 years agomon: Monitor: fix timecheck rounds period 4042/head
Joao Eduardo Luis [Fri, 30 Jan 2015 11:37:28 +0000 (11:37 +0000)]
mon: Monitor: fix timecheck rounds period

Fixes: #10546
Backports: dumpling?,firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit 2e749599ac6e1060cf553b521761a93fafbf65bb)

10 years agoosd: requeue blocked op before flush it was blocked on 4041/head
Sage Weil [Mon, 12 Jan 2015 01:28:04 +0000 (17:28 -0800)]
osd: requeue blocked op before flush it was blocked on

If we have request A (say, cache-flush) that blocks things, and then
request B that gets blocked on it, and we have an interval change, then we
need to requeue B first, then A, so that the resulting queue will keep
A before B and preserve the order.

This was observed on this firefly run:

  ubuntu@teuthology:/a/sage-2015-01-09_21:43:43-rados-firefly-distro-basic-multi/694675

Backport: giant, firefly
Fixes: #10512
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 11bdfb4131ecac16d4a364d651c6cf5d1d28c702)

10 years agorgw: index swift keys appropriately 4033/head
Yehuda Sadeh [Wed, 7 Jan 2015 21:56:14 +0000 (13:56 -0800)]
rgw: index swift keys appropriately

Fixes: #10471
Backport: firefly, giant

We need to index the swift keys by the full uid:subuser when decoding
the json representation, to keep it in line with how we store it when
creating it through other mechanism.

Reported-by: hemant burman <hemant.burman@gmail.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 478629bd2f3f32afbe6e93eaebb8a8fa01af356f)

10 years agocrush: set_choose_tries = 100 for erasure code rulesets 4031/head
Loic Dachary [Wed, 17 Dec 2014 15:06:55 +0000 (16:06 +0100)]
crush: set_choose_tries = 100 for erasure code rulesets

It is common for people to try to map 9 OSDs out of a 9 OSDs total ceph
cluster. The default tries (50) will frequently lead to bad mappings for
this use case. Changing it to 100 makes no significant CPU performance
difference, as tested manually by running crushtool on one million
mappings.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 2f87ac807f3cc7ac55d9677d2051645bf5396a62)

10 years agomount.ceph: avoid spurious error message 4030/head
Yan, Zheng [Sat, 3 Jan 2015 07:29:29 +0000 (15:29 +0800)]
mount.ceph: avoid spurious error message

/etc/mtab in most modern distributions is a symbol link to
/proc/self/mounts.

Fixes: #10351
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit bdd0e3c4bda97fe18487a58dd173a7dff752e1a2)

10 years agomsg/Pipe: discard delay queue before incoming queue 4029/head
Sage Weil [Wed, 29 Oct 2014 21:45:11 +0000 (14:45 -0700)]
msg/Pipe: discard delay queue before incoming queue

Shutdown the delayed delivery before the incoming queue in case the
DelayedDelivery thread is busy queuing messages.

Fixes: #9910
Signed-off-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit f7431cc3c25878057482007beb874c9d4473883e)

10 years agoosd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::operator== 4028/head
Samuel Just [Fri, 5 Dec 2014 23:29:52 +0000 (15:29 -0800)]
osd_types: op_queue_age_hist and fs_perf_stat should be in osd_stat_t::operator==

Fixes: 10259
Backport: giant, firefly, dumpling
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 1ac17c0a662e6079c2c57edde2b4dc947f547f57)

10 years agomon: PGMonitor: skip zeroed osd stats on get_rule_avail() 4027/head
Joao Eduardo Luis [Mon, 19 Jan 2015 18:49:15 +0000 (18:49 +0000)]
mon: PGMonitor: skip zeroed osd stats on get_rule_avail()

Fixes: #10257
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit b311e7c36273efae39aa2602c1f8bd90d39e5975)

10 years agomon: PGMonitor: available size 0 if no osds on pool's ruleset
Joao Eduardo Luis [Fri, 16 Jan 2015 18:13:05 +0000 (18:13 +0000)]
mon: PGMonitor: available size 0 if no osds on pool's ruleset

get_rule_avail() may return < 0, which we were using blindly assuming it
would always return an unsigned value.  We would end up with weird
values if the ruleset had no osds.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit 8be6a6ab2aa5a000a39c73a98b11a0ab32fffa1c)

10 years agomon: PGMonitor: fix division by zero on stats dump
Joao Eduardo Luis [Fri, 16 Jan 2015 18:12:42 +0000 (18:12 +0000)]
mon: PGMonitor: fix division by zero on stats dump

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit 50547dc3c00b7556e26b9a44ec68640c5c3a2384)

10 years agodoc: Fix ceph command manpage to match ceph -h (giant) 3998/head
David Zafman [Sat, 14 Mar 2015 02:16:47 +0000 (19:16 -0700)]
doc: Fix ceph command manpage to match ceph -h (giant)

Fixes: #10677
Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Minor fixes to ceph command manpage
David Zafman [Fri, 13 Mar 2015 23:50:13 +0000 (16:50 -0700)]
doc: Minor fixes to ceph command manpage

Fixes: #10676
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 7e85722fd4c89715fc2ed79697c82d65d7ebf287)

10 years agodoc: Fix ceph command manpage to match ceph -h (firefly)
David Zafman [Thu, 12 Mar 2015 18:39:52 +0000 (11:39 -0700)]
doc: Fix ceph command manpage to match ceph -h (firefly)

Improve synopsis section
Fixes: #10676
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9ac488c1eb0e30511079ba05aaf11c79615b3940)

Conflicts:

man/ceph.8 (took incoming version)

10 years agodoc: Changes format style in ceph to improve readability as html.
Nilamdyuti Goswami [Thu, 18 Dec 2014 11:41:22 +0000 (17:11 +0530)]
doc: Changes format style in ceph to improve readability as html.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
(cherry picked from commit 8b796173063ac9af8c21364521fc5ee23d901196)

10 years agomds: fix assertion caused by system clock backwards 3971/head
Yan, Zheng [Tue, 10 Mar 2015 11:55:57 +0000 (19:55 +0800)]
mds: fix assertion caused by system clock backwards

Fixes: #11053
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agodoc: Adds man page for ceph.
Nilamdyuti Goswami [Fri, 12 Dec 2014 20:54:41 +0000 (02:24 +0530)]
doc: Adds man page for ceph.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
(cherry picked from commit 76da87a64ca6b3cc0ceeaf63e19a9f440d6f4161)

10 years agoFix libstriprados::stat, use strtoll insdead of strtol 3921/head
Dongmao Zhang [Fri, 14 Nov 2014 10:48:58 +0000 (18:48 +0800)]
Fix libstriprados::stat, use strtoll insdead of strtol

The return value(long int) of strict_strtol is too small for unstriped
object.

Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
(cherry picked from commit fe6679dca479fc24806d7e57ab0108a516cd6d55)

10 years agoFix libstriprados::remove, use strtoll insdead of strtol
Dongmao Zhang [Wed, 10 Dec 2014 10:55:28 +0000 (18:55 +0800)]
Fix libstriprados::remove, use strtoll insdead of strtol

Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
(cherry picked from commit 78a15ee4c61fdadccb1921e861748400cc651862)

10 years agoObjecter::_op_submit_with_budget: add timeout before call
Samuel Just [Mon, 2 Feb 2015 21:57:00 +0000 (13:57 -0800)]
Objecter::_op_submit_with_budget: add timeout before call

Objecter::_send_op depends on the ontimeout field being filled in
to avoid 10340 and 9582.

Fixes: 10340
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit cfcfafcb0f33994dbda1efe478ef3ab822ff50d4)

10 years agoosd: fix PG leak in SnapTrimWQ._clear() 3819/head
Kefu Chai [Tue, 10 Feb 2015 08:29:45 +0000 (16:29 +0800)]
osd: fix PG leak in SnapTrimWQ._clear()

Fixes: #10421
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 01e154d592d6cdbf3f859cf1b4357e803536a6b4)

10 years ago0.87.1 v0.87.1
Jenkins [Mon, 23 Feb 2015 20:02:04 +0000 (12:02 -0800)]
0.87.1

10 years agoosd: Fix FileJournal wrap to get header out first 3771/head
David Zafman [Thu, 19 Feb 2015 00:21:12 +0000 (16:21 -0800)]
osd: Fix FileJournal wrap to get header out first

Correct and restore assert that was removed

Cause by f46b1b473fce0322a672b16c7739e569a45054b6
Fixes: #10883
Backport: dumpling, firefly, giant

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 970bb4901f93575709421b5b25c3eff213de61b8)

10 years agoMerge pull request #3731 from liewegas/wip-10834-giant
Loic Dachary [Tue, 17 Feb 2015 00:09:54 +0000 (01:09 +0100)]
Merge pull request #3731 from liewegas/wip-10834-giant

osd: tolerate sessionless con in fast dispatch path

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoosd: tolerate sessionless con in fast dispatch path 3731/head
Sage Weil [Tue, 2 Dec 2014 02:15:59 +0000 (18:15 -0800)]
osd: tolerate sessionless con in fast dispatch path

We can now get a session cleared from a Connection at any time.  Change
the assert to an if in ms_fast_dispatch to cope.  It's pretty rare, but it
can happen, especially with delay injection.  In particular, a racing
thread can call mark_down() on us.

Fixes: #10209
Backport: giant
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 01df2227125abf94571b4b0c7bccca57098ed2dc)

10 years agoqa: use correct binary path on rpm-based systems
Josh Durgin [Mon, 2 Feb 2015 15:43:35 +0000 (16:43 +0100)]
qa: use correct binary path on rpm-based systems

Fixes: #10715
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 05ce2aa1bf030ea225300b48e7914577a412b38c)

10 years agoMerge pull request #3407 from ceph/wip-9854-giant
Loic Dachary [Tue, 10 Feb 2015 23:11:57 +0000 (00:11 +0100)]
Merge pull request #3407 from ceph/wip-9854-giant

osdc: Constrain max number of in-flight read requests

10 years agoMerge pull request #3568 from dachary/wip-10471-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 21:01:21 +0000 (22:01 +0100)]
Merge pull request #3568 from dachary/wip-10471-rgw-giant

rgw: use s->bucket_attrs instead of trying to read obj attrs

10 years agoMerge pull request #3263 from dachary/wip-jerasure-giant
Loic Dachary [Tue, 10 Feb 2015 20:59:40 +0000 (21:59 +0100)]
Merge pull request #3263 from dachary/wip-jerasure-giant

erasure-code: update links to jerasure upstream (giant)

10 years agoMerge pull request #3191 from ceph/giant-10277
Loic Dachary [Tue, 10 Feb 2015 20:59:17 +0000 (21:59 +0100)]
Merge pull request #3191 from ceph/giant-10277

Giant 10277

10 years agoMerge pull request #3186 from ceph/wip-giant-mon-backports
Loic Dachary [Tue, 10 Feb 2015 20:58:52 +0000 (21:58 +0100)]
Merge pull request #3186 from ceph/wip-giant-mon-backports

mon: backports for #9987 against giant

10 years agoMerge pull request #3185 from dachary/wip-10325-cauchy-giant
Loic Dachary [Tue, 10 Feb 2015 20:58:29 +0000 (21:58 +0100)]
Merge pull request #3185 from dachary/wip-10325-cauchy-giant

erasure-code: relax cauchy w restrictions (giant)

10 years agoMerge pull request #3178 from dachary/wip-9998-crush-underfloat-giant
Loic Dachary [Tue, 10 Feb 2015 20:58:05 +0000 (21:58 +0100)]
Merge pull request #3178 from dachary/wip-9998-crush-underfloat-giant

crush: fix weight underfloat issue (giant)

10 years agoMerge pull request #3579 from dachary/wip-9877-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:57:50 +0000 (21:57 +0100)]
Merge pull request #3579 from dachary/wip-9877-rgw-giant

rgw: RGWRados::get_obj() returns wrong len if len == 0

10 years agoMerge pull request #3168 from ceph/wip-8797-giant
Loic Dachary [Tue, 10 Feb 2015 20:57:18 +0000 (21:57 +0100)]
Merge pull request #3168 from ceph/wip-8797-giant

Wip 8797 giant

10 years agoMerge pull request #3582 from dachary/wip-10062-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:56:53 +0000 (21:56 +0100)]
Merge pull request #3582 from dachary/wip-10062-rgw-giant

rgw: s3 keystone auth fixes

10 years agoMerge pull request #3581 from dachary/wip-9918-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:56:37 +0000 (21:56 +0100)]
Merge pull request #3581 from dachary/wip-9918-rgw-giant

rgw: update swift subuser perm masks when authenticating

10 years agoMerge pull request #3580 from dachary/wip-9907-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:56:17 +0000 (21:56 +0100)]
Merge pull request #3580 from dachary/wip-9907-rgw-giant

fix can not disable max_size quota

10 years agoMerge pull request #3083 from dachary/wip-10211-erasure-code-buffer-alignement-giant
Loic Dachary [Tue, 10 Feb 2015 20:55:56 +0000 (21:55 +0100)]
Merge pull request #3083 from dachary/wip-10211-erasure-code-buffer-alignement-giant

erasure-code: enforce chunk size alignment (giant)

10 years agoMerge pull request #3577 from dachary/wip-9587-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:55:23 +0000 (21:55 +0100)]
Merge pull request #3577 from dachary/wip-9587-rgw-giant

init-radosgw.sysv: set ulimit -n before starting daemon

10 years agoMerge pull request #3576 from dachary/wip-5595-9576-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:54:58 +0000 (21:54 +0100)]
Merge pull request #3576 from dachary/wip-5595-9576-rgw-giant

update object content-length doesn't work correctly

10 years agoMerge pull request #3575 from dachary/wip-9479-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:54:13 +0000 (21:54 +0100)]
Merge pull request #3575 from dachary/wip-9479-rgw-giant

rgw: send back ETag on S3 object copy

10 years agoMerge pull request #3574 from dachary/wip-9478-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:53:55 +0000 (21:53 +0100)]
Merge pull request #3574 from dachary/wip-9478-rgw-giant

rgw: S3 object copy content type fix

10 years agoMerge pull request #3573 from dachary/wip-9254-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:53:33 +0000 (21:53 +0100)]
Merge pull request #3573 from dachary/wip-9254-rgw-giant

rgw: http headers need to end with \r\n

10 years agoMerge pull request #3572 from dachary/wip-9973-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:53:15 +0000 (21:53 +0100)]
Merge pull request #3572 from dachary/wip-9973-rgw-giant

rgw: remove swift user manifest (DLO) hash calculation

10 years agoMerge pull request #3571 from dachary/wip-8911-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:52:54 +0000 (21:52 +0100)]
Merge pull request #3571 from dachary/wip-8911-rgw-giant

rgw: swift GET / HEAD object returns X-Timestamp field

10 years agoMerge pull request #3570 from dachary/wip-10701-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:52:36 +0000 (21:52 +0100)]
Merge pull request #3570 from dachary/wip-10701-rgw-giant

rgw: use strict_strtoll() for content length

10 years agoMerge pull request #3569 from dachary/wip-10103-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:52:00 +0000 (21:52 +0100)]
Merge pull request #3569 from dachary/wip-10103-rgw-giant

rgw-admin: create subuser if needed when creating user

10 years agoMerge pull request #3567 from dachary/wip-10307-rgw-giant
Loic Dachary [Tue, 10 Feb 2015 20:51:06 +0000 (21:51 +0100)]
Merge pull request #3567 from dachary/wip-10307-rgw-giant

rgw: use s->bucket_attrs instead of trying to read obj attrs

10 years agoMerge pull request #3443 from ceph/wip-10590-giant
Loic Dachary [Tue, 10 Feb 2015 20:50:34 +0000 (21:50 +0100)]
Merge pull request #3443 from ceph/wip-10590-giant

rbd: ensure aio_write buffer isn't invalidated during image import

10 years agoMerge pull request #3557 from dachary/wip-10688-boost-157-giant
Loic Dachary [Tue, 10 Feb 2015 20:50:14 +0000 (21:50 +0100)]
Merge pull request #3557 from dachary/wip-10688-boost-157-giant

support Boost 1.57.0

10 years agoMerge pull request #2954 from sponce/giant
Loic Dachary [Tue, 10 Feb 2015 20:49:47 +0000 (21:49 +0100)]
Merge pull request #2954 from sponce/giant

Fixed trivial locking issue in the trunc method of libradosstriper - Giant branch

10 years agoMerge pull request #3405 from ceph/wip-10299-giant
Loic Dachary [Tue, 10 Feb 2015 20:49:20 +0000 (21:49 +0100)]
Merge pull request #3405 from ceph/wip-10299-giant

librbd: complete all pending aio ops prior to closing image

10 years agoMerge pull request #3403 from ceph/wip-10270-giant
Loic Dachary [Tue, 10 Feb 2015 20:48:49 +0000 (21:48 +0100)]
Merge pull request #3403 from ceph/wip-10270-giant

librbd: gracefully handle deleted/renamed pools

10 years agoMerge pull request #3356 from liewegas/wip-msgr-giant
Loic Dachary [Tue, 10 Feb 2015 20:48:20 +0000 (21:48 +0100)]
Merge pull request #3356 from liewegas/wip-msgr-giant

msgr: fast dispatch backports for giant

10 years agofsync-tester: print info about PATH and locations of lsof lookup
Greg Farnum [Fri, 6 Feb 2015 05:12:17 +0000 (21:12 -0800)]
fsync-tester: print info about PATH and locations of lsof lookup

We're seeing the lsof invocation fail (as not found) in testing and nobody can
identify why. Since attempting to reproduce the issue has not worked, this
patch will gather data from a genuinely in-vitro location.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit a85051483874ff5b8b0fb50426a3577040457596)

10 years agolibradosstriper: fixed write_full when ENOENT 3637/head
Sebastien Ponce [Thu, 5 Feb 2015 09:46:37 +0000 (10:46 +0100)]
libradosstriper: fixed write_full when ENOENT

Fixes: #10758
write_full was returning ENOENT when the file did not exists, while it should just have created it without complaining.

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
(cherry picked from commit 6a91f2bb82035b3c8021a7dc7b23548ce3d61eb6)

10 years agoosdc: Constrain max number of in-flight read requests 3407/head
Jason Dillaman [Mon, 27 Oct 2014 18:47:19 +0000 (14:47 -0400)]
osdc: Constrain max number of in-flight read requests

Constrain the number of in-flight RADOS read requests to the
cache size.  This reduces the chance of the cache memory
ballooning during certain scenarios like copy-up which can
invoke many concurrent read requests.

Fixes: #9854
Backport: giant, firefly, dumpling
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agomon: MDSMonitor: don't return -EINVAL if function is bool 3548/head
Joao Eduardo Luis [Fri, 17 Oct 2014 17:01:05 +0000 (18:01 +0100)]
mon: MDSMonitor: don't return -EINVAL if function is bool

Returning -EINVAL on a function that expects bool and the error code to
be in a variable 'r' can only achieve one thing: if this path is ever
touched, instead of returning an error as it was supposed to, we're
returning 'true' with 'r = 0' and, for no apparent reason, the user will
think everything went smoothly but with no new fs created.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit 91b2a2b69b198567d42f45f75b7f7ea559f89150)

10 years agomon: MDSMonitor: check all conditions are met *before* osdmon proposal
Joao Eduardo Luis [Fri, 17 Oct 2014 16:43:33 +0000 (17:43 +0100)]
mon: MDSMonitor: check all conditions are met *before* osdmon proposal

We should not allow ourselves to request the osdmon to propose before we
know for sure that we meet the required conditions to go through with
our own state change.  Even if we still can't guarantee that our
proposal is going to be committed, we shouldn't just change the osdmon's
state just because we can.  This way, at least, we make sure that our
checks hold up before doing anything with side-effects.

Fixes: #10643
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
(cherry picked from commit 1d1ae413e9f0aafa314af903bcf6b815f6558082)

10 years agorgw: check keystone auth also for s3 post requests 3582/head
Abhishek Lekshmanan [Mon, 22 Dec 2014 14:27:19 +0000 (19:57 +0530)]
rgw: check keystone auth also for s3 post requests

This patch adds keystone auth for s3 post requests, once a user fails in
cephx authentication, they are checked for keystone if configured.

Fixes #10062
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
(cherry picked from commit 8b3dfc9472022ea45ad24e02e0aa21dfdad798f8)

10 years agorgw: check for timestamp for s3 keystone auth
Abhishek Lekshmanan [Mon, 17 Nov 2014 12:07:00 +0000 (17:37 +0530)]
rgw: check for timestamp for s3 keystone auth

This commit ensures that we check for timestamp of s3 request is within
acceptable grace time of radosgw
Addresses some failures in #10062
Fixes: #10062
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
(cherry picked from commit 4b35ae067fef9f97b886afe112d662c61c564365)

10 years agorgw: update swift subuser perm masks when authenticating 3581/head
Yehuda Sadeh [Wed, 5 Nov 2014 22:38:46 +0000 (14:38 -0800)]
rgw: update swift subuser perm masks when authenticating

Fixes: #9918
Backport: firefly, giant
It seems that we weren't setting the swift perm mask correctly.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 5d9f36f757a7272c24d2c9adc31db1ed5e712992)

10 years agofix can not disable max_size quota 3580/head
Lei Dong [Mon, 27 Oct 2014 02:29:48 +0000 (10:29 +0800)]
fix can not disable max_size quota

Currently if we enable quota and set max_size = -1, it doesn’t
mean max_size is unlimited as expected. Instead, it means object
with any size is not allowed to upload because of “QuotaExceeded”.
The root cause is the function rgw_rounded_kb which convert max_size
to max_size_kb returns 0 for -1 because it takes an unsigned int
but we pass an int to it. A simple fix is check max_size before
it’s rounded to max_size_kb.

Test case:
1 enable and set quota:
radosgw-admin quota enable --uid={user_id} --quota-scope=user
radosgw-admin quota set --quota-scope=user --uid={user_id}\
 --max-objects=100 --max-size=-1
2 upload any object with non-zero length
it will return 403 with “QuotaExceeded” and return 200 if you apply the fix.

Fixes: #9907
Backport: giant, firefly
Signed-off-by: Dong Lei leidong@yahoo-inc.com
(cherry picked from commit abd3fd3ef9ee9999b99811937af60b7a5e673e35)