Commit Graph

51263 Commits

Author SHA1 Message Date
Sage Weil
e50ba1140d Merge branch 'wip-13990' of git://github.com/tchaikov/ceph
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:46:45 -04:00
Sage Weil
122e6d6be9 Merge pull request #8160 from yuyuyu101/jewel-spdk
os/bluestore/NVMEDevice: make IO thread using dpdk launch
2016-03-17 21:47:57 -04:00
Sage Weil
3c938d9577 Merge pull request #8163 from liewegas/wip-15151
osd/ReplicatedPG: clear watches on change after applying repops

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-17 21:47:28 -04:00
Sage Weil
df1e7f852e Merge pull request #7359 from songbaisen/song9
mon: consider pool size when creating pool

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 18:00:10 -04:00
Sage Weil
b0a90a82c5 Merge pull request #7674 from majianpeng/bluestore-sync-transaction
os/bluestore: make bluestore_sync_transaction = true can work.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 17:59:47 -04:00
Sage Weil
fd61b503e9 Merge pull request #7860 from majianpeng/bluestores-clone-overlay
os/bluestore: clone overlay data

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 17:59:26 -04:00
Sage Weil
7504dc266a Merge pull request #7930 from ceph/wip-debian-librgw-tests
debian: package librgw_file* tests
2016-03-17 17:58:58 -04:00
Sage Weil
5b18de23b5 Merge remote-tracking branch 'gh/wip-strict-debian-deps' 2016-03-17 17:53:23 -04:00
Sage Weil
6741606ebb Merge pull request #7957 from majianpeng/bluestore-read
os/filestore: require offset == length == 0 for full object read; add test

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-03-17 17:57:01 -04:00
Sage Weil
c021e1b142 Merge pull request #8039 from gregsfortytwo/wip-14962-greg
osd/ReplicatedPG: be more careful about calling publish_stats_to_osd()

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 17:56:06 -04:00
Sage Weil
1302ad1af3 Merge pull request #8096 from liewegas/wip-15073
osd: ensure new osdmaps commit before publishing them to pgs

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-17 17:55:31 -04:00
Yehuda Sadeh
2c05ca35f2 Merge pull request #8167 from theanalyst/mstart/rgw_ports
mstart: start rgw on different ports as well

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-17 11:06:37 -07:00
Sage Weil
4e3cf59eac osd: assert that we don't try to use an OSDMap > superblock.newest_map
handle_osd_map now adds OSDMaps to the cache as it receives them
but before they are stable.  Ensure that we don't try to use them.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-17 12:58:54 -04:00
Sage Weil
b839a06c1a osd: commit osdmaps before exposing them to PGs
handle_osd_map and the PGs use different sequencers when writing
their updates.  We therefore need to make sure new osdmaps are
committed to disk before we expose them to PGs, lest they update
their info to reference a new osdmap that hasn't actually
committed yet.

This doesn't happen with FileStore because transactions are
ordered when they are queued, but it does affect BlueStore.

Fix by splitting handle_osd_map into two phases, one that just
persists stuff, and the second half that publishes the new maps to
the rest of the OSD.

Fixes: #15073
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-17 12:58:54 -04:00
Yehuda Sadeh
fe515bf913 Merge pull request #8170 from yehudasa/wip-rgw-sync-fixes-3
Wip rgw sync fixes 3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-03-17 09:21:15 -07:00
Kefu Chai
809df6e112 Merge pull request #8179 from zhjwpku/zhjwpku
doc/architecture.rst: remove redundant word "across"

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-17 18:14:41 +08:00
Zhao Junwang
c399d3187e doc/architecture.rst: remove redundant word "across"
Signed-off-by: Zhao Junwang <zhjwpku@gmail.com>
2016-03-17 17:34:51 +08:00
Yehuda Sadeh
60429c38b9 rgw: take a reference to the cr in async cr workers
and drop the cr when worker is done. The cr can be cleaned before
worker is done, so we should have it stick around as long as the
worker is alive.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-16 15:36:53 -07:00
Yehuda Sadeh
1f741716cc rgw: finalize reqs through a temporary set
can't call _finish_request() on iter->second when iterating, it clobbers the
map.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-16 15:36:53 -07:00
Yehuda Sadeh
40832718fa rgw: update data_log only when completing the op
It doesn't make sense to update it earlier, the zone that follows will not sync before
it sees the completion.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-16 15:36:53 -07:00
Josh Durgin
599d4eaaaf Merge pull request #8169 from ceph/wip-15041
doc: initial draft of RBD mirroring admin documentation

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-16 15:04:56 -07:00
Jason Dillaman
9d2d090e5c doc: initial draft of RBD mirroring admin documentation
Fixes: #15041

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-16 17:51:43 -04:00
Yehuda Sadeh
7789e187e9 Merge pull request #8168 from linuxbox2/rgw-ldap-fixes
Rgw ldap fixes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-16 13:41:06 -07:00
Matt Benjamin
1539d9029c rgw-ldap: conditional build
Permit building without LDAP support--support is enabled by default.
Tested with CMake and autotools standalone builds.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-16 16:31:20 -04:00
Kefu Chai
eaa933877b Merge pull request #8165 from tchaikov/wip-fix-rgw-encoding
rgw/rgw_common.h: fix the RGWBucketInfo decoding

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-03-17 02:11:49 +08:00
Sage Weil
4b97cd7bf5 Merge remote-tracking branch 'gh/jewel' 2016-03-16 13:20:30 -04:00
Kefu Chai
9789c29fe0 osd: populate the trim_thru epoch using MOSDMap.oldest_map
instead of filling MOSDMap with the local oldest_map, we share
the maximum MOSDMap.oldest_map received so far with peers. That
way one OSD's failure to trim won't prevent it from sharing with
others that they are allowed to trim.

Fixes: #13990
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-17 01:02:11 +08:00
Josh Durgin
188644cb75 Merge pull request #8158 from dillaman/wip-rbd-mirror-fixes
rbd-mirror: fix image replay test failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-16 09:41:04 -07:00
Abhishek Lekshmanan
81b07be672 mstart: start rgw on different ports as well
similar to the way we set CEPH_PORT, set CEPH_RGW_PORT as well so that
we've rgw instances starting on different ports

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-03-16 17:22:02 +01:00
branto1
8be0a35c67 Merge pull request #8133 from ceph/wip-15145-cephfs-tools
packaging: move cephfs repair tools to ceph-common

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-03-16 16:52:01 +01:00
Kefu Chai
2842c073a6 rgw/rgw_common.h: fix the RGWBucketInfo decoding
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-16 23:41:39 +08:00
Yehuda Sadeh
e9e77c8553 Merge pull request #8154 from tchaikov/wip-fix-rgw-decoding
rgw/rgw_common.h: fix the RGWBucketInfo decoding

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-16 08:07:33 -07:00
Sage Weil
0abff12a83 osd/ReplicatedPG: clear watches on change after applying repops
apply_and_flush_repops does any in-flight request side-effects,
including setting up new watches.  Clear out watches after that
so we don't leave any behind.

Fixes: #15151
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-16 10:45:15 -04:00
Haomai Wang
35afd5afab bluestore/NVMEDevice: make IO thread using dpdk launch
Previously we will call rte_eal_init in caller thread as well as dpdk
resources will init in that thread. It will cause all threads spawned
later will bind to the specified core.

And io thread will be spawned via dpdk api, otherwise, dpdk memory
has huge performance degraded problem.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-03-16 22:36:04 +08:00
Jason Dillaman
50b53eaf4b qa/workunits/rbd: rbd_mirror was extracting the incorrect image id
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-16 10:01:38 -04:00
Jason Dillaman
f2e39888d0 qa/workunits/rbd: use unique logs for each rbd-mirror daemon
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-16 10:01:38 -04:00
Jason Dillaman
3cf8952559 journal: refetch active object before defaulting to new tag
If a live replay is in progress, it's possible that object offset 0
was pulled and a new tag is discovered before the current object is
(re-)pulled to determine that the old tag still has entries remaining.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-16 10:01:38 -04:00
Loic Dachary
6364e5ff0a Merge pull request #7894 from SUSE/wip-14828
ceph.spec.in: do not install Ceph RA on systemd platforms

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-16 14:10:15 +01:00
Kefu Chai
3895878cfd rgw/rgw_common.h: fix the RGWBucketInfo decoding
introduced by 416234b

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-16 20:41:18 +08:00
Boris Ranto
ff3f0f868d ceph.spec.in: Make ceph-common require libcephfs1
We recently moved fsck/repair tools to ceph-common package. We should
also make the version/release requirements tight.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-03-16 12:15:33 +01:00
Kefu Chai
167ddd6b6e Merge pull request #8107 from liewegas/wip-crush
crush: fix cli tests for new crush tunables

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-16 16:35:08 +08:00
Gregory Farnum
b4f34bcc17 Merge pull request #8073 from ceph/wip-fsmap-upgrade-jewel
mds: fix FSMap upgrade with daemons in the map

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-15 22:34:50 -07:00
Yehuda Sadeh
31852ec66e Merge pull request #8142 from tchaikov/wip-rgw-ftbfs
cls/rgw: fix FTBFS

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-15 20:53:27 -07:00
Kefu Chai
f03f99d7af cls/rgw: fix FTBFS
BIVerObjEntry::mtime() is a method not a member variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-16 11:46:57 +08:00
Yehuda Sadeh
a6151fddf1 Merge pull request #8002 from rzarzynski/wip-rgw-putobjmeta
rgw: add support for metadata upload during PUT on Swift container.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-15 19:36:42 -07:00
Josh Durgin
d04da80b87 Merge pull request #8138 from dillaman/wip-15141
rbd: add support for mirror image promotion/demotion/resync

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-15 18:03:25 -07:00
Yehuda Sadeh
2ade096bb3 Merge pull request #8139 from yehudasa/wip-rgw-implicit-tenant
rgw: Allow an implicit tenant in case of Keystone

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-15 17:44:24 -07:00
Jason Dillaman
4411179013 librbd: implement mirror image resync request API
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 20:38:35 -04:00
Jason Dillaman
d1a6c7c4c9 librbd: track if a mirror image resync has been requested
A secondary image will store its resync request to the primary
image's journal. When the local rbd mirror process detects the
flag being set, it can initiate a resync from the remote.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 20:38:34 -04:00
Jason Dillaman
353f895ac3 journal: add placeholder for marking clients are disconnected
When a client is disconnected from the journal, entries can be
pruned regardless of the affected client's commit position.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-15 20:38:34 -04:00