Commit Graph

39299 Commits

Author SHA1 Message Date
Sage Weil
8ee43796c5 Merge pull request #3689 from athanatos/wip-10771
ReplicatedPG::eval_repop: check waiting_for_* even if !m

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-10 17:33:18 -08:00
Dmytro Iurchenko
6898f0b27f rgw: Swift API. The second way of specifying desirable response format.
OpenStack Object Storage API v1 defines two ways for the client to tell which response format it understands.
Until now RGW looked at query variable 'format' only. This commit implements the second way of setting the format by
providing 'Accept' HTTP-header with the desirable response mime-type.

Backport: hammer
Fixes: #10746

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
2015-02-10 14:07:40 -08:00
Josh Durgin
8cd480d0d2 Merge pull request #3682 from ceph/wip-10719
Wip 10719

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-02-10 13:36:23 -08:00
Sage Weil
46fcef5dcb Merge pull request #3680 from ceph/wip-10827
osdc/Objecter: linger_register now acquires rwlock

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-10 13:00:26 -08:00
Yehuda Sadeh
e504003aad rgw: remove multipart entries for bucket index when aborting
Fixes #10719

Since we now let the gc clean the aborter multipart uploads, we need to
clear the multipart entries from the bucket index when cleaning up the
meta object.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-02-10 12:41:20 -08:00
Yehuda Sadeh
3e54acbc20 rgw: encode rgw_obj::orig_obj
We weren't encoding orig_obj, however, it's now needed so that we can
call get_index_key() on decoded objects. Only encode/decode it if ns or
instance are not empty.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-02-10 12:41:19 -08:00
Sage Weil
a0deb5561b Merge pull request #3672 from ceph/wip-old-gcc
fix build and warnings on older gcc

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2015-02-10 12:38:45 -08:00
Yehuda Sadeh
744f48e1cf Merge branch 'wip-diurchenko-master' into hammer
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-02-10 09:44:08 -08:00
Dmytro Iurchenko
f67bfa24fd 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>
2015-02-10 09:18:01 -08:00
Dmytro Iurchenko
cdfc23f0e2 rgw: fix doc, A typo in command line argument name
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
2015-02-10 09:18:01 -08:00
Dmytro Iurchenko
2f8d31e9b1 rgw: Swift API. Dump container's custom metadata.
Fixes: #10665
Backport: hammer, firefly
Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
2015-02-10 09:18:01 -08:00
Josh Durgin
203c06da6d locally disable pragma warnings on gcc < 4.6
diagnostic push|pop are not present before 4.6, so each use gives a
warning. Temporarily ignore these by disabling/reenabling -Wpragmas.
Note that this means the other disabled warnings are not scoped on
old gcc. I don't think this is worth fixing, since newer gcc will
respect the scope and show us the warnings outside of it.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-09 15:48:15 -08:00
Josh Durgin
93629d3d4c Pipe: conditionally compile IPTOS setting
This doesn't exist on older platforms.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-02-09 14:55:15 -08:00
Jason Dillaman
b025fbfa22 librbd: consolidate all async operation flush logic
librbd has three different methods for flushing asynchronous
operations. These have all been consolidated down to a single,
shared method to fix an existing issue and simplify maintenance
going forward.

Fixes: #10783
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-02-09 14:40:25 -08:00
Jason Dillaman
0a00be286d xlist: added missing include
The xlist header references NULL without including
the header which defines it.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-02-09 14:40:14 -08:00
Samuel Just
78b1fb5e94 ReplicatedPG::eval_repop: check waiting_for_* even if !m
There can be client ops waiting on a promote now.

Fixes: 10771
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-02-09 09:17:44 -08:00
Sage Weil
d757f8e7eb Merge pull request #3631 from liewegas/wip-mon-dup-down
mon: fix unnecessary osd mark down

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-02-08 22:35:39 -08:00
Sage Weil
918b378493 mon: have two COMMAND two COMMAND_WITH_FLAG macros
This avoids 2 separate calls to define each item and keeps the blame
info intact.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-02-08 22:13:29 -08:00
Mykola Golub
7920db3da9 tests: make ceph_watch_wait output watchfile content on failure
It should help in troubleshooting remote test failures.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-02-08 22:12:55 -08:00
Mykola Golub
ac9d75c471 mon: noforward flag for commands that are not supposed to be forwarded
For not a monitor leader, if a received command is not supported
locally, but is supported by the leader, it is forwarded to the
leader.

For some commands that may have undesirable behaviour. E.g. for the
recently added "ceph tell mon.x version", if the mon.x is not a leader
and does not support "version" command yet, but the leader does, the
user will receive the version of the leader, and can't be actually
sure about a non leader version.

Fix this by adding noforward flag to commands that are not supposed to
be forwarded. Set the flag for "version" command. Although there are
other non-forwardable commands (like injectargs) it is not necessary
to add the flag to them, as the commands are too old to suffer from
the describe problem.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-02-08 22:12:55 -08:00
Mykola Golub
3ff4821307 mon: fix Monitor::_get_moncommand()
It should match command prefix, not any substring.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-02-08 22:12:55 -08:00
Sage Weil
14dbe1ded2 Merge branch 'wip-mshec-r44' of git://github.com/t-miyamae/ceph into hammer
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-08 21:57:14 -08:00
Sage Weil
d66aad4269 Merge pull request #3667 from ceph/wip-doc-ports
doc: updates for port ranges

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-08 07:53:56 -08:00
John Spray
45f842db41 doc: remind user to calculate the correct max port
This was kind of easy to miss, and if users
just paste in the command as given then their
first few OSDs will work, and from their
4th OSD onwards things will get weird.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-02-08 15:50:38 +01:00
John Spray
c65d8ed5d1 doc: fix "7810" port typo
The correct value is now 7300, used to be
7100, was never 7810.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-02-08 15:50:38 +01:00
John Spray
fe47e23aed doc: correct default of ms_bind_port_max
It's 7300 in the code, whereas these docs
had it as 7100.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-02-08 15:50:38 +01:00
Sage Weil
541a8f7355 Merge pull request #3665 from yuyuyu101/wip-fix-qa
AsyncConnection: Fix several bugs from qa test

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-08 02:21:33 -08:00
Haomai Wang
d2eaeea081 AsyncConnection: fix incorrect condition for exchanging in_seq
Originally we use "in_seq==0" to judge whether need to exchange in_seq,
it's wrong when peer side already receive message and need to reply new
in_seq to this side.

Now use "is_reset_from_peer" to indicate whether not need to exchange

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-02-08 16:01:43 +08:00
Loic Dachary
f2de124a20 Merge pull request #3660 from SUSE/wip-fix-suse-tests
Handle differently-named xmlstarlet binary for *suse

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-07 22:53:06 +01:00
Thorsten Behrens
9b6b7c35d0 Handle differently-named xmlstarlet binary for *suse
Seems *SUSE sticks to the upstream binary name of 'xml'
for the xmlstarlet package.

Signed-off-by: Thorsten Behrens <tbehrens@suse.com>
2015-02-07 13:20:17 +01:00
Josh Durgin
a0b60297fc Merge pull request #3657 from ceph/wip-10782
pybind: fixed runtime errors with librbdpy

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-02-06 20:04:31 -08:00
Loic Dachary
a8a4c8278e Merge pull request #3627 from tchaikov/check_output-on-centos6
ceph_objectstore_tool: fix check_output on python2.6

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-06 19:16:48 +01:00
Kefu Chai
15350a088d ceph_objectstore_tool: fix check_output on python2.6
* backported the subprocess.check_output from python2.7

Fixes: #10756

Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-02-07 01:23:02 +08:00
Sage Weil
34f5326c0b Merge pull request #3652 from dachary/wip-mailmap
mailmap: UMD is University of Maryland
2015-02-06 05:33:55 -08:00
Sage Weil
0d7df6c30a Merge pull request #3131 from mslovy/fix_init_filejournal_throttle
os: FileJournal:: fix, uninitialization of FileJournal throttle

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-06 05:30:28 -08:00
Loic Dachary
9dfd4ac1af mailmap: UMD is University of Maryland
And not University of Mississippi

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-02-06 13:05:12 +01:00
Sage Weil
a08d3be053 Merge remote-tracking branch 'gh/hammer' 2015-02-06 03:04:09 -08:00
Sage Weil
6d72a1f040 Merge pull request #3468 from ceph/wip-cephfs-snap1
Wip cephfs snap1

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-06 03:02:50 -08:00
Sage Weil
69288ce458 Merge pull request #3649 from ceph/wip-opath-setattr
client: handle O_PATH fds on setattr too

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-06 02:31:11 -08:00
Loic Dachary
1504dd624d Merge pull request #3633 from sponce/wip-10758
Fixed issue #10758 : write_full behavior in libradosstriper

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-02-06 10:03:31 +01:00
Sebastien Ponce
6a91f2bb82 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>
2015-02-06 09:08:35 +01:00
Gregory Farnum
7d05c9e5d1 Merge pull request #3624 from ktdreyer/wip-doc-submitting-patches-branches
SubmittingPatches: clarify the use of branches in PRs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-02-05 22:14:22 -08:00
Greg Farnum
051453640c client: handle O_PATH fds on setattr too
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2015-02-05 21:05:57 -08:00
Josh Durgin
9446358f8c Merge pull request #3626 from majianpeng/misc
rbd.py: Add rbd_read2/rbd_write2 funcion which can handle fadvise flags.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-02-06 05:10:43 +01:00
Yehuda Sadeh
f86fb9799e rgw: obj delete operation can use remove_objs param
The remove_objs param is needed to atomically remove multiple entries
from the bucket index, e.g., when cancelling a multipart upload.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-02-05 17:26:11 -08:00
Jianpeng Ma
538395d606 rbd.py: Add rbd_read2/rbd_write2 funcion which can handle fadvise flags.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2015-02-06 09:19:20 +08:00
Sage Weil
1c394e4b26 Merge pull request #3642 from vuhuong/wip-hammer
Wip xio hammer

Reviewed-by: Matt Benjamin <matt@cohortfs.com>
2015-02-05 11:30:57 -08:00
Sage Weil
49486deb3e Merge pull request #3639 from ceph/wip-10770
rgw: send appropriate op to cancel bucket index pending operation

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-05 11:22:30 -08:00
Sage Weil
54a22236a0 Merge pull request #3641 from athanatos/wip-10731
ReplicatedPG: block writes on degraded objects unless all peers support ...

Reviewed-by: Sage Weil <sage@redhat.com>
2015-02-05 11:13:42 -08:00
Yehuda Sadeh
dfee96e3ae 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>
2015-02-05 09:48:36 -08:00