Commit Graph

59826 Commits

Author SHA1 Message Date
Sage Weil
feefd35853 do_cmake.sh: set BOOST_J to $(nproc)
This lets us build boost with all processors.

Signed-off-by: Sage Weil <sage@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-11-07 15:56:53 -05:00
Matt Benjamin
81e1fcc4f0 boost: update boost to 8/29
Pull-up Boost to the commit which merged the upstream fix for
upstream Boost/iostreams bug #11860 (template arity warnings),
per discussion in core.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-11-07 15:56:43 -05:00
Matt Benjamin
5f869450ea cmake: find and build bundled boost
Build Boost using the src/boost submodule, unless overridden
by -DWITH_SYSTEM_BOOST.

If -DBOOST_J=<n> is provided, builds Boost with <n> jobs.

Boost builds in the configured Build directory.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-11-07 15:56:29 -05:00
Matt Benjamin
d8dff81c3e boost: add submodule at tag boost-1.61.0
This implements option #4 for external boost, based on upstream
discussion.  In option #4:

1. boost is added as a submodule
2. builds default to using the attached boost module
3. building against a system-provided boost is supported, but
   must be configured explicitly

Because all of the boost components are attached as nested
submodules in the upstream boost repository, neither the nested
submodules nor the root boost submodule have been cloned into
modules in github.com/ceph (acked by Sage).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-11-07 15:56:17 -05:00
John Spray
f80c7a8f20 Merge pull request #11647 from ceph/wip-jlayton-cephfs
libcephfs client API overhaul and update

Reviewed-by: John Spray <john.spray@redhat.com>
2016-11-07 21:07:40 +01:00
Yehuda Sadeh
351911a20e Merge pull request #11425 from weiqiaomiao/wqm-rgw-oplog
rgw: fix the field 'total_time'  of log entry in log show opt

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-11-07 10:45:10 -08:00
Yehuda Sadeh
ace03b97ab Merge pull request #8712 from diwakargoel/master
doc: Correcting the sample python tempurl generation script.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-11-07 10:41:04 -08:00
Yehuda Sadeh
82740e9be3 Merge pull request #11648 from cbodley/wip-17698
rgw: fix for bucket delete racing with mdlog sync

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-11-07 10:36:29 -08:00
Yehuda Sadeh
996e59f05c Merge pull request #11598 from cbodley/wip-rgw-bucket-sync
rgw multisite: move lease up to RunBucketSync instead of child crs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-11-07 10:35:26 -08:00
Casey Bodley
9c731ed6b6 rgw: delete entries_index in RGWFetchAllMetaCR
use a unique_ptr to ensure the entries_index is freed on destruction

Fixes: http://tracker.ceph.com/issues/17812

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-11-07 13:08:11 -05:00
Sage Weil
696ddb5ef1 mon/OSDMonitor: remove obsolete comment
We are using new_up_client

Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-07 11:37:03 -05:00
Sage Weil
ed724eb923 mon/OSDMonitor: clean up prepare_boot
use __func__
newlines
whitespace

Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-07 11:30:44 -05:00
Sage Weil
877fb294d4 mon/OSDMonitor: clear old_weight when using it to auto mark-in
We store an old weight when we (auto) mark down.  Clear that
weight when we auto-mark in.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-07 11:28:43 -05:00
Sage Weil
73a2c11e94 mon/OSDMonitor: remember old weight on 'osd out'
If we have an OSD with a weight that's not 1.0 and mark it out,
we should restore the same weight when we mark it back in. We
already do this when an OSD is automatically marked out, just
not when it is explicitly marked out.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-07 11:28:43 -05:00
Loic Dachary
b51aec70fb Merge pull request #11715 from dzafman/wip-test-ec-eio
Fix racey test by setting noout flag (tracker 17757)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-11-07 17:26:53 +01:00
Daniel Gryniewicz
28a338a381 Merge pull request #11624 from yuyuyu101/wip-rgwfile-pybind
Wip rgwfile pybind
2016-11-07 11:08:35 -05:00
Haomai Wang
b4fc122754 pybind/rgwfile: change description
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-11-08 00:04:07 +08:00
Haomai Wang
334d125f78 pybind/rgwfile: fixes hardcode way to find include dir
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-11-08 00:00:57 +08:00
Ilya Dryomov
aeb979ae4d AsyncConnection: dispatch write handler on keepalive2
...otherwise, if the connection is idle (i.e. no proper TAG_MSG
messages), keepalive ack will not get sent until some point in the
future.

Fixes: #17664
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2016-11-07 17:00:49 +01:00
Ilya Dryomov
fda4d54cda AsyncConnection: rename _send_keepalive_or_ack -> _append_keepalive_or_ack
Commit 48d929c4f0 ("msg: async: improve _send_keepalive_or_ack()
a little") removed _try_send() call.  _try_send(false) was a no-op by
then, but still - rename appropriately.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2016-11-07 17:00:48 +01:00
Ilya Dryomov
47fb73bfde AsyncConnection: eliminate reader vs writer ack race in process()
process() will potentially handle multiple messages, yet we are
scheduling the writer to write out acks only once, after the first
message is processed.  This effectively races the reader with the
writer and leaves the window for exiting the process() loop with
pending acks (ack_left > 0 but no kicked writer).

Close this window by moving dispatch_event_external() out of the loop.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2016-11-07 17:00:48 +01:00
Haomai Wang
aef68c458e pybind/rgwfile: raise Exception when failing to umount
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-11-07 23:58:59 +08:00
Haomai Wang
7a4ecd8323 pybind/rgwfile: change FileHandler to FileHandle
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-11-07 23:56:05 +08:00
Casey Bodley
a50ede03f6 Merge pull request #11794 from rzarzynski/wip-rgw-17803
rgw: fix uncompressed object size deduction in RGWRados::copy_obj_data.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-11-07 10:13:45 -05:00
Sage Weil
c2a94808e1 Merge pull request #11797 from yuyuyu101/wip-bluestore-pending
os/bluestore: reap collection after all pending ios done

Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-07 08:16:18 -06:00
root
4e3142cc08 librados: Fixed check of return value in aio tests of rados
Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
2016-11-07 14:35:50 +01:00
John Spray
60e9b9f960 Merge pull request #11713 from stiopaa1/mds_mantle_passByConstRef
mds/Mantle: pass parameters by const ref

Reviewed-by: John Spray <john.spray@redhat.com>
2016-11-07 14:13:58 +01:00
John Spray
06732de7d1 Merge pull request #11727 from stiopaa1/mds_mdsrank_addOverideToThreadClass
mds/MDSRank.h: add override to virtual function

Reviewed-by: John Spray <john.spray@redhat.com>
2016-11-07 14:13:34 +01:00
Jason Dillaman
860df296bd Merge pull request #11781 from trociny/wip-qa-rbd-nbd-sudo
qa/workunits/rbd: simplify running nbd test under build env

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-07 08:02:46 -05:00
Yan, Zheng
ebb6f5ee81 Merge pull request #11806 from david-z/wip-remove-dup-log
mds: remove duplicated log in handle_client_readdir
2016-11-07 17:02:48 +08:00
Zhi Zhang
004bfc4264 mds: remove duplicated log in handle_client_readdir
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
2016-11-07 16:41:39 +08:00
Michal Jarzabek
af7d321134 mds/FSMap.h: add const and reference
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-11-06 18:55:51 +00:00
Yehuda Sadeh
45722ecbe4 Merge pull request #11343 from ceph/wip-civetweb-1.8
Update version of civetweb to 1.8
2016-11-05 12:53:23 -07:00
Michal Jarzabek
c220eb99a3 mds/FSMap.cc: prevent unneeded copy of map entry
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-11-05 19:06:16 +00:00
Haomai Wang
f46527a934 os/bluestore: reap collection after all pending ios done
Otherwise when umount finish reap and wait for pending io done, the last
pending io may aim to remove collection and make removed_collection not
empty. So the leaked collection ref will result in BlueStore deconstruction
segment failt

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-11-06 02:55:24 +08:00
Kefu Chai
916d46172f Merge pull request #11251 from stiopaa1/osd_replicatedpg_removeCount2
osd/ReplicatedPG: remove unneeded use of count

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-06 01:50:37 +08:00
Jason Dillaman
5e03f4880b Merge pull request #11510 from vshankar/wip-17356
librbd: batch object map updates during trim

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-05 13:15:27 -04:00
Jason Dillaman
8adf3848ef Merge pull request #11766 from trociny/wip-rbd-info-fix-upgrade-client
librbd: snap_get_limit compatibility check

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-05 13:15:08 -04:00
Sage Weil
4f1070c331 Merge pull request #10907 from jecluis/wip-mon-features
mon: have mon-specific features & rework internal monmap structures

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-05 07:58:14 -05:00
Sage Weil
aa5b8e7e4c Merge pull request #11772 from liewegas/wip-sortbitwise
osd,mon: require sortbitwise flag to upgrade beyond jewel
2016-11-05 07:57:17 -05:00
Sage Weil
b7f8e099e1 Merge pull request #11791 from liewegas/wip-remove-move-ranges
os: remove move_ranges_destroy_src
2016-11-05 07:57:07 -05:00
runsisi
118f081b3c mon/OSDMonitor: newly created osd should not be wrongly marked in
if we are creating an osd which has the same id as a previously
removed 'in' osd, we should not mark this newly created osd as 'in'

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-11-05 20:42:43 +08:00
Radoslaw Zarzynski
5007dbbb1c rgw: fix uncompressed object size deduction in RGWRados::copy_obj_data.
Fixes: http://tracker.ceph.com/issues/17803
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-11-05 13:11:18 +01:00
Kefu Chai
a7e42ab89a Merge pull request #10447 from stiopaa1/msg_pipe_moveDelayedDelivery2
msg/Pipe: move DelayedDelivery class to cc file

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-05 14:53:13 +08:00
Sage Weil
b009f5a8ed Merge pull request #11780 from xiexingguo/xxg-wip-bluestore-1104
os/bluestore: a few more cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-04 21:33:54 -05:00
Sage Weil
b231a67da4 Merge pull request #11498 from liewegas/wip-stop-at-jewel
mon: prevent post-jewel OSDs from booting if require_jewel_osds is not set
2016-11-04 21:24:50 -05:00
xie xingguo
e7f2c03de1 os/bluestore: fix output message when passing the end of list range
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:28:30 +08:00
xie xingguo
f046343508 os/bluestore: fix typo in comments
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:26:36 +08:00
xie xingguo
c96ecc521b os/bluestore: add sanity check against collection existence
To keep pace with other methods.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:26:12 +08:00
xie xingguo
4ebc5ab420 os/bluestore: narrow boundary check for fiemap
By including off-by-one.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:26:07 +08:00