]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoFix casing of Content-Type header 5532/head
Robin H. Johnson [Fri, 4 Sep 2015 01:07:48 +0000 (01:07 +0000)]
Fix casing of Content-Type header

It turns out, despite the HTTP spec declaring that header field names
should be case-insensitive, some clients treat them wrongly, and
consider "Content-type" to not match "Content-Type".

CyberDuck was one of those clients, now fixed upstream in
https://trac.cyberduck.io/ticket/8999

To reduce future occurances of this bug, fix the casing of the
Content-Type header, to strictly comply with the HTTP specification (be
strict about what you send, and generous about what you receive).

Fixes: #12939
Backport: hammer, firefly
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 1b9fbffdc24160251b96cec820d62fb2a12b6eab)

9 years agorgw: we should not overide Swift sent content type
Orit Wasserman [Thu, 13 Aug 2015 13:02:03 +0000 (15:02 +0200)]
rgw: we should not overide Swift sent content type

Fixes: #12363
backport: hammer

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 423cf136f15df3099c9266f55932542d303c2713)

9 years agorgw: send Content-Length in response for GET on Swift account.
Radoslaw Zarzynski [Thu, 25 Jun 2015 16:28:50 +0000 (18:28 +0200)]
rgw: send Content-Length in response for GET on Swift account.

Fixes: #12158
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 5f47b11791cd46ce2771046e4888575869cc9685)

Conflicts:
src/rgw/rgw_rest_swift.cc
            omit dump_account_metadata() call

9 years agorgw: enforce Content-Type in Swift responses.
Radoslaw Zarzynski [Tue, 23 Jun 2015 09:54:09 +0000 (11:54 +0200)]
rgw: enforce Content-Type in Swift responses.

Swift sends Content-Type HTTP header even if the response
doesn't contain body. We have this behaviour implemented
until applying some changes in end_header() function.
Unfortunately, lack of Content-Type causes early exits in
many Tempest's tests for Swift API verification.

Fixes: #12157
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 106aeba206736d4080326f9bc191876bed63370b)

9 years agorgw: force content_type for swift bucket stats request
Orit Wasserman [Mon, 22 Jun 2015 11:51:49 +0000 (13:51 +0200)]
rgw: force content_type for swift bucket stats request

Fixes: 12095
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit da259e4da1329e1e448d75c48c6ee3d1318e19b2)

9 years agorgw: force content-type header for swift account responses without body
Orit Wasserman [Tue, 21 Apr 2015 10:31:19 +0000 (12:31 +0200)]
rgw: force content-type header for swift account responses without body

This regression was introduced in commit 4cfeca03ade21861ab70ca759f94eb244c16cb39

Fixes: #11438
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 009664e560ee37ef6dc170a0155d6c749e151b06)

9 years agorgw: shouldn't return content-type: application/xml if content length is 0
Orit Wasserman [Thu, 9 Apr 2015 18:04:59 +0000 (20:04 +0200)]
rgw: shouldn't return content-type: application/xml if content length is 0

Fixed: #11091

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 5cc92bb27cfbaee4af24dc312c9b98331f899794)

9 years agoMerge pull request #5993 from SUSE/wip-13169-firefly
Loic Dachary [Sat, 3 Oct 2015 07:40:33 +0000 (09:40 +0200)]
Merge pull request #5993 from SUSE/wip-13169-firefly

update docs to point to download.ceph.com

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #6038 from liewegas/wip-13088
Sage Weil [Wed, 23 Sep 2015 21:09:18 +0000 (17:09 -0400)]
Merge pull request #6038 from liewegas/wip-13088

common/HeartBeat: include types

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agocommon/RWLock: include assert 6038/head
Sage Weil [Wed, 23 Sep 2015 21:06:52 +0000 (17:06 -0400)]
common/RWLock: include assert

Fixes atomic_t build issue without libatomic-ops.

Fixes: #13088
Signed-off-by: Sage Weil <sage@redhat.com>
9 years ago.gitmodules: fix ceph-object-corpus source url
Sage Weil [Tue, 22 Sep 2015 17:03:49 +0000 (13:03 -0400)]
.gitmodules: fix ceph-object-corpus source url

Fixes: #13196
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6000 from SUSE/wip-12097-firefly
Sage Weil [Tue, 22 Sep 2015 16:29:08 +0000 (12:29 -0400)]
Merge pull request #6000 from SUSE/wip-12097-firefly

kernel_untar_build fails on EL7

9 years agoMerge pull request #5234 from SUSE/wip-12244-firefly
Yehuda Sadeh [Mon, 21 Sep 2015 20:07:49 +0000 (13:07 -0700)]
Merge pull request #5234 from SUSE/wip-12244-firefly

Civetweb RGW appears to report full size of object as downloaded when only partially downloaded

9 years agoMerge pull request #4535 from xinxinsh/wip-11416-firefly
Yehuda Sadeh [Mon, 21 Sep 2015 19:35:52 +0000 (12:35 -0700)]
Merge pull request #4535 from xinxinsh/wip-11416-firefly

rgw: use correct objv_tracker for bucket instance

9 years agoqa: update to newer Linux tarball 6000/head
Greg Farnum [Tue, 16 Jun 2015 15:13:41 +0000 (08:13 -0700)]
qa: update to newer Linux tarball

This should make newer gcc releases happier in their default configuration.
kernel.org is now distributing tarballs as .xz files so we change to that
as well when decompressing (it is supported by Ubuntu Precise so we should
be all good).

Fixes: #11758
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 1ea3f47ab806d48ca7b045c2731d344eae3900e1)

Conflicts:
qa/workunits/kernel_untar_build.sh
            trivial resolution

9 years agodoc: correct links to download.ceph.com 5993/head
Alfredo Deza [Fri, 18 Sep 2015 18:13:02 +0000 (14:13 -0400)]
doc: correct links to download.ceph.com

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 387d7800359154950431d0984c756f43f21dd9b4)

Conflicts:
doc/install/get-packages.rst
            preferred the new version in all cases

9 years agoMerge pull request #5200 from SUSE/wip-12289-firefly 5935/head
Nathan Cutler [Thu, 10 Sep 2015 09:46:41 +0000 (11:46 +0200)]
Merge pull request #5200 from SUSE/wip-12289-firefly

mon: scrub error (osdmap encoding mismatch?) upgrading from 0.80 to ~0.80.2

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5388 from SUSE/wip-12490-firefly
Nathan Cutler [Wed, 9 Sep 2015 13:45:37 +0000 (15:45 +0200)]
Merge pull request #5388 from SUSE/wip-12490-firefly

buffer: critical bufferlist::zero bug

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5408 from SUSE/wip-12492-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:10:09 +0000 (06:10 +0200)]
Merge pull request #5408 from SUSE/wip-12492-firefly

the output is wrong when runing ceph osd reweight

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5404 from SUSE/wip-12395-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:07:51 +0000 (06:07 +0200)]
Merge pull request #5404 from SUSE/wip-12395-firefly

register_new_pgs() should check ruleno instead of its index

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5199 from SUSE/wip-11980-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:05:39 +0000 (06:05 +0200)]
Merge pull request #5199 from SUSE/wip-11980-firefly

MDSMonitor: handle MDSBeacon messages properly

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5410 from SUSE/wip-12497-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:04:15 +0000 (06:04 +0200)]
Merge pull request #5410 from SUSE/wip-12497-firefly

get pools health'info have error

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5409 from SUSE/wip-12495-firefly
Nathan Cutler [Wed, 9 Sep 2015 04:01:50 +0000 (06:01 +0200)]
Merge pull request #5409 from SUSE/wip-12495-firefly

pgmonitor: wrong at/near target max“ reporting

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5358 from ceph/wip-11470.firefly
Nathan Cutler [Mon, 7 Sep 2015 12:22:52 +0000 (14:22 +0200)]
Merge pull request #5358 from ceph/wip-11470.firefly

mon: PaxosService: call post_refresh() instead of post_paxos_update()

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #5403 from SUSE/wip-12393-firefly
Nathan Cutler [Mon, 7 Sep 2015 08:20:27 +0000 (10:20 +0200)]
Merge pull request #5403 from SUSE/wip-12393-firefly

Memory leak in Mutex.cc, pthread_mutexattr_init without pthread_mutexattr_destroy

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #5225 from SUSE/wip-12266-firefly
Nathan Cutler [Sun, 6 Sep 2015 19:19:55 +0000 (21:19 +0200)]
Merge pull request #5225 from SUSE/wip-12266-firefly

ceph.spec.in: 50-rbd.rules conditional is wrong

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5217 from SUSE/wip-12268-firefly
Nathan Cutler [Sun, 6 Sep 2015 19:19:42 +0000 (21:19 +0200)]
Merge pull request #5217 from SUSE/wip-12268-firefly

ceph-common needs python-argparse on older distros, but doesn't require it

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5224 from SUSE/wip-12304-firefly
Ken Dreyer [Fri, 4 Sep 2015 17:50:22 +0000 (11:50 -0600)]
Merge pull request #5224 from SUSE/wip-12304-firefly

ceph.spec.in running fdupes unnecessarily

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #5394 from SUSE/wip-12447-firefly
Ken Dreyer [Fri, 4 Sep 2015 17:47:49 +0000 (11:47 -0600)]
Merge pull request #5394 from SUSE/wip-12447-firefly

ceph.spec.in: useless %py_requires breaks SLE11-SP3 build

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #5043 from SUSE/wip-12007-firefly
Loic Dachary [Fri, 4 Sep 2015 15:18:30 +0000 (17:18 +0200)]
Merge pull request #5043 from SUSE/wip-12007-firefly

Objecter: pg listing can deadlock when throttling is in use

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #4769 from SUSE/wip-11741-firefly
Loic Dachary [Fri, 4 Sep 2015 15:08:41 +0000 (17:08 +0200)]
Merge pull request #4769 from SUSE/wip-11741-firefly

crush: take crashes due to invalid arg

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #4788 from SUSE/wip-11801-firefly
Nathan Cutler [Fri, 4 Sep 2015 14:50:45 +0000 (16:50 +0200)]
Merge pull request #4788 from SUSE/wip-11801-firefly

Make it more difficult to delete pools in firefly

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5235 from SUSE/wip-12310-firefly
Loic Dachary [Fri, 4 Sep 2015 14:44:57 +0000 (16:44 +0200)]
Merge pull request #5235 from SUSE/wip-12310-firefly

read on chunk-aligned xattr not handled

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5389 from SUSE/wip-12391-firefly
Loic Dachary [Fri, 4 Sep 2015 14:42:28 +0000 (16:42 +0200)]
Merge pull request #5389 from SUSE/wip-12391-firefly

EC pools are not allowed as cache pools, disallow in the mon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5406 from ceph/wip-12465-firefly
Sage Weil [Fri, 4 Sep 2015 13:42:03 +0000 (09:42 -0400)]
Merge pull request #5406 from ceph/wip-12465-firefly

log: take mutex while opening fd

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #4854 from ceph/wip-11769-firefly
Nathan Cutler [Thu, 3 Sep 2015 10:34:32 +0000 (12:34 +0200)]
Merge pull request #4854 from ceph/wip-11769-firefly

librbd: aio calls may block

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5233 from SUSE/wip-12074-firefly
Loic Dachary [Wed, 2 Sep 2015 05:55:15 +0000 (07:55 +0200)]
Merge pull request #5233 from SUSE/wip-12074-firefly

RGW logfile does not get chowned properly

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5390 from SUSE/wip-12503-firefly
Nathan Cutler [Wed, 12 Aug 2015 07:43:19 +0000 (09:43 +0200)]
Merge pull request #5390 from SUSE/wip-12503-firefly

rgw/logrotate.conf calls service with wrong init script name

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #4765 from SUSE/wip-11721-firefly
Yehuda Sadeh [Tue, 11 Aug 2015 18:27:16 +0000 (11:27 -0700)]
Merge pull request #4765 from SUSE/wip-11721-firefly

rgw: Keystone PKI token expiration is not enforced

9 years agoUpdate OSDMonitor.cc 5410/head
renhwztetecs [Tue, 21 Jul 2015 10:55:00 +0000 (18:55 +0800)]
Update OSDMonitor.cc

OSDMonitor::get_pools_health(), s/objects/bytes/

Fixes: #12402
Signed-off-by: ren.huanwen@zte.com.cn
(cherry picked from commit 7fc13c9d6b9a4962d7640240416105d8f558d600)

9 years ago mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status. 5409/head
huangjun [Mon, 20 Jul 2015 02:50:20 +0000 (10:50 +0800)]
  mon/PGMonitor: avoid uint64_t overflow when checking pool 'target/max' status.
Fixes: #12401
Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit f84e6b8157e78fd05cd1c8ac957c92df17e6ba06)

9 years agomon: OSDMonitor: fix hex output on 'osd reweight' 5408/head
Joao Eduardo Luis [Tue, 21 Jul 2015 10:20:53 +0000 (11:20 +0100)]
mon: OSDMonitor: fix hex output on 'osd reweight'

Fixes: #12251
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 787fa80c2746fde44ac0583ff7995ec5be9a672d)

9 years agomon/PGMonitor: bug fix pg monitor get crush rule 5404/head
Xinze Chi [Fri, 3 Jul 2015 10:27:13 +0000 (18:27 +0800)]
mon/PGMonitor: bug fix pg monitor get crush rule

when some rules have been deleted before, the index in array of crush->rules
is not always equals to crush_ruleset of pool.

Fixes: #12210
Reported-by: Ning Yao <zay11022@gmail.com>
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
(cherry picked from commit 498793393c81c0a8e37911237969fba495a3a183)

9 years agoMutex: fix leak of pthread_mutexattr 5403/head
Ketor Meng [Tue, 26 May 2015 10:50:17 +0000 (18:50 +0800)]
Mutex: fix leak of pthread_mutexattr

Need pthread_mutexattr_destroy after pthread_mutexattr_init

Fixes: #111762
Signed-off-by: Ketor Meng <d.ketor@gmail.com>
(cherry picked from commit 2b23327b3aa8d96341d501a5555195ca1bc0de8f)

9 years agoceph.spec.in: drop SUSE-specific %py_requires macro 5394/head
Nathan Cutler [Thu, 9 Jul 2015 09:51:13 +0000 (11:51 +0200)]
ceph.spec.in: drop SUSE-specific %py_requires macro

%py_requires expands to

BuildRequires: /usr/bin/python
PreReq: python = 2.7

The BuildRequires: is already provided, and the PreReq is wrong because
e.g. SLE11-SP3 (a platform we are trying to support) has Python 2.6.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit cbf6c7b46b42e163950bf7956e5b7565fca961c9)

Conflicts:
ceph.spec.in
            in master, the %py_requires is in the python-rados package,
            while in firefly it is in the python-ceph package

9 years agorgw/logrotate.conf: Rename service name 5390/head
wuxingyi [Wed, 11 Mar 2015 09:34:40 +0000 (17:34 +0800)]
rgw/logrotate.conf: Rename service name

The service name for ceph rados gateway was changed to "ceph-radosgw",
the previous version of service name "radosgw" would cause a failed reload,
and finally make it impossible to write any log data to the log file.

Signed-off-by: wuxingyi <wuxingyi2015@outlook.com>
(cherry picked from commit 9df3f798179481fe8ae6ae873dcb793de7d8f367)

9 years agoOSDMonitor: disallow ec pools as tiers 5389/head
Samuel Just [Fri, 15 May 2015 20:05:40 +0000 (13:05 -0700)]
OSDMonitor: disallow ec pools as tiers

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

Conflicts:
qa/workunits/cephtool/test.sh
           no "# make sure we can't clobber snapshot state" tests in firefly
src/mon/OSDMonitor.cc
           no tp->removed_snaps.empty() in firefly

9 years agoUnittestBuffer: Add bufferlist zero test case 5388/head
Haomai Wang [Thu, 9 Jul 2015 05:32:03 +0000 (13:32 +0800)]
UnittestBuffer: Add bufferlist zero test case

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 577acf665948e531e50d36f5780ea19351a5bf65)

9 years agobuffer: Fix bufferlist::zero bug with special case
Haomai Wang [Thu, 9 Jul 2015 05:42:42 +0000 (13:42 +0800)]
buffer: Fix bufferlist::zero bug with special case

Fixes: #12252
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 43f583d160ccaf879eaf0f3020e77860cf8d1df0)

9 years agomon: PaxosService: call post_refresh() instead of post_paxos_update() 5358/head
Joao Eduardo Luis [Fri, 12 Jun 2015 18:21:10 +0000 (19:21 +0100)]
mon: PaxosService: call post_refresh() instead of post_paxos_update()

Whenever the monitor finishes committing a proposal, we call
Monitor::refresh_from_paxos() to nudge the services to refresh.  Once
all services have refreshed, we would then call each services
post_paxos_update().

However, due to an unfortunate, non-critical bug, some services (mainly
the LogMonitor) could have messages pending in their
'waiting_for_finished_proposal' callback queue [1], and we need to nudge
those callbacks.

This patch adds a new step during the refresh phase: instead of calling
directly the service's post_paxos_update(), we introduce a
PaxosService::post_refresh() which will call the services
post_paxos_update() function first and then nudge those callbacks when
appropriate.

[1] - Given the monitor will send MLog messages to itself, and given the
service is not readable before its initial state is proposed and
committed, some of the initial MLog's would be stuck waiting for the
proposal to finish.  However, by design, we only nudge those message's
callbacks when an election finishes or, if the leader, when the proposal
finishes.  On peons, however, we would only nudge those callbacks if an
election happened to be triggered, hence the need for an alternate path
to retry any message waiting for the initial proposal to finish.

Fixes: #11470
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 1551ebb63238073d2fd30201e6b656a8988e958c)

9 years agoLog::reopen_log_file: take m_flush_mutex 5406/head
Samuel Just [Fri, 24 Jul 2015 22:38:18 +0000 (15:38 -0700)]
Log::reopen_log_file: take m_flush_mutex

Otherwise, _flush() might continue to write to m_fd after it's closed.
This might cause log data to go to a data object if the filestore then
reuses the fd during that time.

Fixes: #12465
Backport: firefly, hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 8778ab3a1ced7fab07662248af0c773df759653d)

  - modified to drop m_flush_mutex_holder, which isn't present in firefly

9 years agoMerge pull request #4583 from SUSE/wip-11542-firefly
Nathan Cutler [Sat, 25 Jul 2015 11:51:43 +0000 (13:51 +0200)]
Merge pull request #4583 from SUSE/wip-11542-firefly

rgw: Change variable length array of std::strings (not legal in C++) to std::vector<std::string>

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #4584 from SUSE/wip-8911-firefly
Nathan Cutler [Sat, 25 Jul 2015 11:50:06 +0000 (13:50 +0200)]
Merge pull request #4584 from SUSE/wip-8911-firefly

rgw: doesn't return 'x-timestamp' in header which is used by 'View Details' of OpenStack

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #4642 from SUSE/wip-11323-firefly
Nathan Cutler [Sat, 25 Jul 2015 11:48:31 +0000 (13:48 +0200)]
Merge pull request #4642 from SUSE/wip-11323-firefly

rgw: quota not respected in POST object

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #4641 from SUSE/wip-11149-firefly
Nathan Cutler [Sat, 25 Jul 2015 11:24:39 +0000 (13:24 +0200)]
Merge pull request #4641 from SUSE/wip-11149-firefly

rgw: delete bucket does not remove .bucket.meta file

Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5170 from SUSE/wip-12039-firefly
Nathan Cutler [Sat, 25 Jul 2015 11:21:31 +0000 (13:21 +0200)]
Merge pull request #5170 from SUSE/wip-12039-firefly

rgw: Swift API: response for PUT on /container does not contain the mandatory Content-Length header when FCGI is used

Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #4762 from SUSE/wip-11754-firefly
Nathan Cutler [Sat, 25 Jul 2015 11:20:15 +0000 (13:20 +0200)]
Merge pull request #4762 from SUSE/wip-11754-firefly

rgw: Object copy bug

Reviewed-by: Yahuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5171 from SUSE/wip-12240-firefly
Josh Durgin [Fri, 24 Jul 2015 18:42:58 +0000 (11:42 -0700)]
Merge pull request #5171 from SUSE/wip-12240-firefly

librbd: internal.cc: 1967: FAILED assert(watchers.size() == 1)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #4639 from SUSE/wip-7385-firefly
Josh Durgin [Fri, 24 Jul 2015 18:26:23 +0000 (11:26 -0700)]
Merge pull request #4639 from SUSE/wip-7385-firefly

librbd: Objectcacher setting max object counts too low

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotests: verify librbd blocking aio code path 4854/head
Jason Dillaman [Tue, 2 Jun 2015 14:33:35 +0000 (10:33 -0400)]
tests: verify librbd blocking aio code path

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4cf41486e9c9e1efcb863960a8f3e0326ffca7e5)

9 years agolibrbd: new rbd_non_blocking_aio config option
Jason Dillaman [Tue, 2 Jun 2015 02:56:11 +0000 (22:56 -0400)]
librbd: new rbd_non_blocking_aio config option

Setting this option to false reverts librbd to legacy behavior
where AIO operations could potentially block.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 769cad12716b85d87eacc1069dd9f5c21cad3915)

Conflicts:
src/common/config_opts.h: trivial resolution
src/librbd/librbd.cc: trivial resolution

9 years agoPendingReleaseNotes: document changes to librbd's aio_read methods
Jason Dillaman [Fri, 10 Apr 2015 00:34:28 +0000 (20:34 -0400)]
PendingReleaseNotes: document changes to librbd's aio_read methods

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agotests: update librbd AIO tests to remove result code
Jason Dillaman [Thu, 9 Apr 2015 01:55:36 +0000 (21:55 -0400)]
tests: update librbd AIO tests to remove result code

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Conflicts:
src/test/librbd/test_librbd.cc: trivial resolution

9 years agolibrbd: AioRequest::send no longer returns a result
Jason Dillaman [Thu, 9 Apr 2015 17:33:09 +0000 (13:33 -0400)]
librbd: AioRequest::send no longer returns a result

The librados calls used by AioRequest::send should always return
zero unless there is a bug.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c77bce3311ab62892eb8c1d883263ba7ed663b20)

Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/AioRequest.h: trivial resolution
src/librbd/internal.cc: trivial resolution

9 years agolibrbd: internal AIO methods no longer return result
Jason Dillaman [Thu, 9 Apr 2015 01:37:50 +0000 (21:37 -0400)]
librbd: internal AIO methods no longer return result

All failures should be returned via the AioCompletion.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9ab42d613128ab08c688ddbea93df4c95068b9cd)

Conflicts:
src/librbd/AioRequest.cc: trivial resolution
src/librbd/internal.cc: trivial resolution
src/librbd/internal.h: trivial resolution

9 years agoThrottle: added pending_error method to SimpleThrottle
Jason Dillaman [Thu, 9 Apr 2015 01:48:21 +0000 (21:48 -0400)]
Throttle: added pending_error method to SimpleThrottle

Allow the client of SimpleThrottle to detect an async error
so that it can exit early.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b88b88c5df91325fb713c2031a56bffe421268e0)

9 years agolibrbd: add new fail method to AioCompletion
Jason Dillaman [Thu, 9 Apr 2015 00:18:50 +0000 (20:18 -0400)]
librbd: add new fail method to AioCompletion

Helper method to handle passing fatal errors generated within
librbd (not from the OSDs) back to the client.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 6d1d0c867855a96bee4c13a0c0a39a0e002ccd12)

Conflicts:
src/librbd/AioCompletion.cc: trivial resolution
src/librbd/AioCompletion.h: trivial resolution

9 years agolibrbd: avoid blocking AIO API methods
Jason Dillaman [Wed, 8 Apr 2015 23:06:52 +0000 (19:06 -0400)]
librbd: avoid blocking AIO API methods

Enqueue all AIO API methods within the new librbd thread pool to
reduce the possibility of any blocking operations. To maintain
backwards compatibility with the legacy return codes of the API's
AIO methods, it's still possible to block attempting to acquire
the snap_lock.

Fixes: #11056
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3a7b5e30efdb21aa1a0aeb68a5d02a1ac2a5faf3)

Conflicts:
src/librbd/librbd.cc: trivial resolution

9 years agolibrbd: add task pool / work queue for AIO requests
Jason Dillaman [Wed, 8 Apr 2015 21:24:08 +0000 (17:24 -0400)]
librbd: add task pool / work queue for AIO requests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit afb896d91f886b647baf38f7ec94cc3739f6d2a9)

Conflicts:
src/common/config_opts.h: trivial resolution
src/librbd/ImageCtx.cc: trivial resolution
src/librbd/ImageCtx.h: trivial resolution
src/librbd/internal.cc: trivial resolution

9 years agoWorkQueue: added virtual destructor
Jason Dillaman [Mon, 11 May 2015 21:05:49 +0000 (17:05 -0400)]
WorkQueue: added virtual destructor

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b3f5a75332c058816dc39b71e9d2b36e752159f4)

9 years agoWorkQueue: add new ContextWQ work queue
Jason Dillaman [Wed, 8 Apr 2015 20:46:34 +0000 (16:46 -0400)]
WorkQueue: add new ContextWQ work queue

The queue holds a collection of Context pointers that will
be completed by the thread pool.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 24a33e977f7b71962adeeb48f75d488a76e70fa9)

Conflicts:
src/common/WorkQueue.h: trivial resolution

9 years agocommon/ceph_context: don't import std namespace
Sage Weil [Fri, 5 Dec 2014 22:21:08 +0000 (14:21 -0800)]
common/ceph_context: don't import std namespace

This was broken by 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9029813b2784fe71879b1b7684855415b4c7566b)

9 years agoCephContext: Add AssociatedSingletonObject to allow CephContext's singleton
Haomai Wang [Mon, 1 Dec 2014 15:54:16 +0000 (23:54 +0800)]
CephContext: Add AssociatedSingletonObject to allow CephContext's singleton

If some objects associated to CephContext want to create a singleton object,
it can inherit AssociatedSingletonObject and implement destruction to get notified.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
(cherry picked from commit 7fed5dee4f96a83d1d6914f6fc0895bba2d15b99)

9 years agomon/OSDMonitor: require mon_allow_pool_delete = true to remove pools 4788/head
Sage Weil [Fri, 16 Jan 2015 15:54:22 +0000 (07:54 -0800)]
mon/OSDMonitor: require mon_allow_pool_delete = true to remove pools

This is a simple safety check.  Since we default to true it is currently
opt-in.

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

Conflicts:
     src/test/mon/osd-pool-create.sh

     Changed $CEPH_MON to 127.0.0.1 -- the CEPH_MON was introduced after
     firefly to allow tests to run in parallel. Back in firefly all tests
     use the same port because 127.0.0.1 was hardcoded. We can't
     conveniently backport all that's necessary for tests to run in
     parallel, therefore we keep the 127.0.0.1 hardcoded.

Conflicts:
src/test/mon/osd-pool-create.sh
            TEST_no_pool_delete() follows a different test than in master

9 years agoMerge pull request #5051 from SUSE/wip-12016-firefly
Loic Dachary [Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)]
Merge pull request #5051 from SUSE/wip-12016-firefly

osd: cache full mode still skips young objects

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5307 from dachary/wip-release-notes-firefly
Sage Weil [Wed, 22 Jul 2015 15:36:47 +0000 (11:36 -0400)]
Merge pull request #5307 from dachary/wip-release-notes-firefly

backport v0.80.10 release notes to firefly

9 years agoFor pgls OP, get/put budget on per list session basis, instead of per OP basis, which... 5043/head
Guang Yang [Mon, 15 Sep 2014 11:41:06 +0000 (11:41 +0000)]
For pgls OP, get/put budget on per list session basis, instead of per OP basis, which could lead to deadlock.

Signed-off-by: Guang Yang (yguang@yahoo-inc.com)
(cherry picked from commit 0f884fdb31a26f241401ce2a9329dc0f2c4eccc7)

Conflicts:
src/librados/IoCtxImpl.cc
            In firefly, return value of objecter->pg_read() is not assigned to c->tid.
src/osdc/Objecter.cc
src/osdc/Objecter.h
            There is no _op_submit_with_budget() function in firefly.
            There is no Objecter::_finish_op() function in firefly.
            In firefly, _take_op_budget() is called take_op_budget().

9 years agoMerge pull request #4867 from SUSE/wip-11878-firefly
Loic Dachary [Wed, 22 Jul 2015 08:20:32 +0000 (10:20 +0200)]
Merge pull request #4867 from SUSE/wip-11878-firefly

mon: Clock skew causes missing summary and confuses Calamari

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoAlways provide summary for non-healthy cluster. 4867/head
Thorsten Behrens [Fri, 6 Feb 2015 00:26:40 +0000 (01:26 +0100)]
Always provide summary for non-healthy cluster.

This fixes a problem, wherein calamari does not provide
popup drill-downs for warnings or errors, should the summary
be missing.

Calamari gets health info from /api/v1/cluster/$FSID/health.
If the data here has a summary field, this summary is provided
in a popup window:

  /api/v1/cluster/$FSID/health is populated (ultimately) with
  status obtained via librados python bindings from the ceph
  cluster. In the case where there's clock skew, the summary
  field supplied by the ceph cluster is empty.

No summary field, no popup window with more health details.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit eaf6e0cf48488fe604d0ef0db164d44948d4e8d4)

Conflicts:
src/mon/Monitor.cc
            firefly needs ss

9 years agoMerge pull request #5062 from SUSE/wip-11699-firefly
Josh Durgin [Tue, 21 Jul 2015 20:31:33 +0000 (13:31 -0700)]
Merge pull request #5062 from SUSE/wip-11699-firefly

objecter: resend linger ops on split

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agodoc: v0.80.10 changelog 5307/head
Sage Weil [Tue, 21 Jul 2015 16:54:19 +0000 (12:54 -0400)]
doc: v0.80.10 changelog

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b3a3e0e509eb9530994723ed9d68f85b8434a22d)

9 years agodoc/release-notes: v0.80.10
Sage Weil [Tue, 21 Jul 2015 14:55:18 +0000 (10:55 -0400)]
doc/release-notes: v0.80.10

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 2a61b611987d169d5a501d77fbd545068550c28c)

Conflicts:
doc/release-notes.rst

9 years agodoc/release-notes: update notes for v0.80.10
Loic Dachary [Tue, 14 Jul 2015 14:15:44 +0000 (16:15 +0200)]
doc/release-notes: update notes for v0.80.10

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

Conflicts:
doc/release-notes.rst

10 years agoMerge pull request #5129 from SUSE/wip-12202-firefly
Loic Dachary [Tue, 21 Jul 2015 11:03:07 +0000 (13:03 +0200)]
Merge pull request #5129 from SUSE/wip-12202-firefly

mon: ceph fails to compile with boost 1.58

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5044 from SUSE/wip-12011-firefly
Loic Dachary [Tue, 21 Jul 2015 10:51:10 +0000 (12:51 +0200)]
Merge pull request #5044 from SUSE/wip-12011-firefly

osd: PG stuck with remapped

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5039 from SUSE/wip-11961-firefly
Loic Dachary [Tue, 21 Jul 2015 10:45:22 +0000 (12:45 +0200)]
Merge pull request #5039 from SUSE/wip-11961-firefly

osd: Cleanup boost optionals for boost 1.56

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #5037 from SUSE/wip-11875-firefly
Loic Dachary [Tue, 21 Jul 2015 10:39:34 +0000 (12:39 +0200)]
Merge pull request #5037 from SUSE/wip-11875-firefly

tools: ceph-post-file fails on rhel7

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4771 from SUSE/wip-11759-firefly
Loic Dachary [Tue, 21 Jul 2015 10:34:51 +0000 (12:34 +0200)]
Merge pull request #4771 from SUSE/wip-11759-firefly

tools: ceph-disk: support NVMe device partitions

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4636 from SUSE/wip-11143-firefly
Loic Dachary [Tue, 21 Jul 2015 10:22:52 +0000 (12:22 +0200)]
Merge pull request #4636 from SUSE/wip-11143-firefly

tools:  src/ceph-disk : disk zap sgdisk invocation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4635 from SUSE/wip-7387-firefly
Loic Dachary [Tue, 21 Jul 2015 10:20:50 +0000 (12:20 +0200)]
Merge pull request #4635 from SUSE/wip-7387-firefly

common: Malformed JSON command output when non-ASCII strings are present

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4632 from SUSE/wip-11507-firefly
Loic Dachary [Tue, 21 Jul 2015 10:17:43 +0000 (12:17 +0200)]
Merge pull request #4632 from SUSE/wip-11507-firefly

osd: object creation by write cannot use an offset on an erasure coded pool

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4630 from SUSE/wip-10983-firefly
Loic Dachary [Tue, 21 Jul 2015 10:12:36 +0000 (12:12 +0200)]
Merge pull request #4630 from SUSE/wip-10983-firefly

tools: use a new disk as journal disk,ceph-disk prepare fail

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4597 from xinxinsh/wip-11026-firefly
Loic Dachary [Tue, 21 Jul 2015 10:08:26 +0000 (12:08 +0200)]
Merge pull request #4597 from xinxinsh/wip-11026-firefly

objecter: can get stuck in redirect loop if osdmap epoch == last_force_op_resend

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4582 from SUSE/wip-11543-firefly
Loic Dachary [Tue, 21 Jul 2015 10:04:39 +0000 (12:04 +0200)]
Merge pull request #4582 from SUSE/wip-11543-firefly

tools: ceph_argparse_flag has no regular 3rd parameter

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4633 from SUSE/wip-11535-firefly
Josh Durgin [Fri, 17 Jul 2015 23:10:43 +0000 (16:10 -0700)]
Merge pull request #4633 from SUSE/wip-11535-firefly

Client admin socket leaks file descriptors

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoos/chain_xattr: handle read on chnk-aligned xattr 5235/head
Sage Weil [Wed, 18 Mar 2015 20:49:20 +0000 (13:49 -0700)]
os/chain_xattr: handle read on chnk-aligned xattr

If we wrote an xattr that was a multiple of a chunk, we will try to read
the next chunk and get ENODATA.  If that happens bail out of the loop and
assume we've read the whole thing.

Backport: hammer, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8614dcebf384b74b283cd352001a65fa26ba925c)

Conflicts:
    src/test/objectstore/chain_xattr.cc
        added #define FILENAME

10 years agorgw: error out if frontend did not send all data 5234/head
Yehuda Sadeh [Thu, 25 Jun 2015 21:31:03 +0000 (14:31 -0700)]
rgw: error out if frontend did not send all data

Fixes: #11851
The civetweb mg_write() doesn't return error when it can't flush all data
to the user, it just sends the total number of bytes written. Modified the
client io to return total number of bytes and return an error if didn't
send anything.

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

10 years agoUnconditionally chown rados log file. 5233/head
Thorsten Behrens [Wed, 10 Dec 2014 10:53:43 +0000 (11:53 +0100)]
Unconditionally chown rados log file.

This fixes bnc#905047 (in a somewhat ad-hoc way). Sadly the log
file gets created from several places, so its existence does not
mean init-radosgw had actually run.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
(cherry picked from commit 41611ea27a42d6221c418613d24dce34d988f2e6)

10 years agoceph.spec.in: use _udevrulesdir to eliminate conditionals 5225/head
Nathan Cutler [Thu, 25 Jun 2015 20:37:52 +0000 (22:37 +0200)]
ceph.spec.in: use _udevrulesdir to eliminate conditionals

The conditionals governing where 50-rbd.rules is installed were not doing the
right thing on SUSE distros.

Start using the %_udevrulesdir RPM macro, while taking care that it is defined
and set to the right value. Use it to eliminate some conditionals around other
udev rules files as well.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 8aa758ee7a14e93ded1d55b4aca7a54aa47d7174)

Conflicts:
ceph.spec.in
            master spec file has diverged significantly from firefly

10 years agoceph.spec.in: do not run fdupes, even on SLE/openSUSE 5224/head
Nathan Cutler [Mon, 13 Jul 2015 16:12:01 +0000 (18:12 +0200)]
ceph.spec.in: do not run fdupes, even on SLE/openSUSE

In openSUSE there is a policy to use %fdupes in the spec file if RPMLINT
complains about duplicate files wasting space in the filesystem.

However, RPMLINT is not so complaining, so drop fdupes.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 53072b9019caf72e0313b2804ea174237ed7da33)