Commit Graph

51417 Commits

Author SHA1 Message Date
Sage Weil
88f61daa93 Merge pull request #8209 from liewegas/wip-13992
ceph_test_rados_misc: shorten mount timeout

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-18 11:52:27 -04:00
Sage Weil
959ae39ebb ceph_test_rados_misc: shorten mount timeout
This might fix #13992.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 10:34:53 -04:00
Sage Weil
8b9ed00812 os/filestore: fix warning
os/filestore/FileStore.cc: In member function ‘int FileStore::_zero(const coll_t&, const ghobject_t&, uint64_t, size_t)’:
os/filestore/FileStore.cc:3294:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (offset + len > st.st_size) {
                        ^

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 10:16:49 -04:00
Loic Dachary
cae8d3c89c Merge pull request #7932 from theanalyst/mailmap/10.0.4
mailmap for 10.0.4

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-18 15:14:02 +01:00
Sage Weil
811b8f5e3c qa/workunits/rest/test.py: don't use newfs
It doesn't work anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 09:51:31 -04:00
Sage Weil
f6f9c00b33 Merge pull request #8121 from liewegas/wip-15136
mon: remove 'mds setmap'

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-18 09:44:05 -04:00
Ricardo Dias
a619468bdc rbd: rbd-mirroring: Added unit tests to test image mirroring behaviour
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
Ricardo Dias
6ebb4f36b2 rbd: rbd-mirroring: Fixed if clause in mirror_image_get_info
This fix targets the case when journaling is not enabled but
someone calls mirror_image_get_info.

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
Ricardo Dias
c472493659 rbd: rbd-mirroring: Disable image mirroring when journaling feature is disabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15143
2016-03-18 10:45:13 +00:00
Ricardo Dias
ba6c0c9d4c rbd: rbd-mirroring: Enable image mirroring when journaling feature is enabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
Ricardo Dias
7385d4acde rbd: rbd-mirroring: Enable image mirroring upon create with journaling feature
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
branto1
97b709c1b4 Merge pull request #8137 from ceph/wip-15146-ceph-dep
rpm: remove sub-package dependencies on "ceph"

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-03-18 10:10:35 +01:00
Sage Weil
2cf3f964a6 Merge pull request #7838 from rldleblanc/pg_prime-enable
mon: enable 'mon osd prime pg temp' by default

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:59:33 -04:00
Sage Weil
08cc711403 Merge pull request #7939 from yangdongsheng/remove_v1
mon: standardize Ceph removal commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:56:48 -04:00
Sage Weil
3ea63bbecf Merge pull request #7721 from xiexingguo/xxg-wip-fixdc
os/filestore: fix result handling logic of destroy_collection

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:55:11 -04:00
Sage Weil
ebf41cbafb Merge pull request #7754 from xiexingguo/xxg-wip-14845
osd: fix inaccurate counter and skip over queueing an empty transaction

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:54:32 -04:00
Sage Weil
be94eca1fb Merge pull request #7970 from Yan-waller/yj-wip-async
msg/async: _try_send trim already sent for outcoming_bl more efficient

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-03-17 21:53:38 -04:00
Sage Weil
053b15c256 Merge pull request #8127 from ceph/wip-15122
ceph_test_msgr: reduce test size to fix memory size

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:52:18 -04:00
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
Orit Wasserman
425546a032 rgw: use current period id when it is empty for mdlog list and shard lock/unlock
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-03-17 20:27:10 +01: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
Jianpeng Ma
30e0f92074 os/bluestore/BlueFS: Before reap ioct, it should wait io complete.
When change write mode of FileWrite(in _flush_range) from buffer to
direct. osd met segment fault.
This because call _close_writer don't check related ios whether
complete.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-03-18 00:18:48 +08:00
Kefu Chai
f8cca624d4 mon: ignore msg without session attached
there is chance that a connection gets reset, and the session attached
to a message that was sent over this connection is reset. i.e.
con->set_priv(NULL) in Monitor::ms_handle_reset(), but we are about to
handle_command() this message after the message is somehow requeued. so,
not all MonOpRequests have an attached Session, especially those are
re-dispatched. we could check conn->is_connected() everywhere, but
that's error-prone and hard to maintain. so, in this change:

* we need to check for the session before looking at it closer.
* hold a reference to it when holding it, because in another thread,
  ms_handle_reset() could be freeing it.

Fixes: #15113
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-18 00:09:07 +08:00
Sage Weil
b0d9b0de15 mon: remove 'mds setmap' command
This command has no discernable purpose, and is difficult and
dangerous to support anyway.

Fixes: #15136
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-17 10:40:24 -04:00
Mykola Golub
13c7ba4c67 test: rbd-mirror: different log and asok location for local/remote contexts
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-17 14:46:21 +02:00
Mykola Golub
21e127bc4c rbd-mirror: make remote context respect env and argv config params
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-17 13:24:53 +02: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
Mykola Golub
3800e2ba63 rbd-mirror: command line options should override environment
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-17 11:14:13 +02:00
Jianjian Huo
06d22ef163 os/bluestore: rename need_size to want_size in StupidAllocator.
Allocate() could return extent with size < need_size, so rename it per
Sage's suggestion.

Signed-off-by: Jianjian Huo <samuel.huo@gmail.com>
2016-03-16 23:09:28 -07:00
Jianjian Huo
d571be2305 os/bluestore: avoid duplicated searches during allocating free extents
When StupidAllocator searches for free extents, if hint is not 0(most times),
it will search extents starting from hint and up in each applicable bin,
if not found, then search all extents in those bins again.

If the extent to find(>= needs) exists below hint and is not in the choose_bin(),
let's say it's in the bin_X; then during this twice searches, all extents from
hint and up in bins before bin_X will be searched twice. This patch will eliminate
those unnecessary searches.

Signed-off-by: Jianjian Huo <samuel.huo@gmail.com>
2016-03-16 23:09:28 -07:00
Samuel Just
4d45a3f525 features: deprecate CEPH_FEATURE_OSD_PROXY_FEATURES
Can't be removed until CEPH_FeATURE_OSD_MIN_SIZE_RECOVERY is also
ready.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-16 18:10:13 -07:00
Samuel Just
9aeaf5c367 features: deprecate CEPH_FEATURE_OSD_MIN_SIZE_RECOVERY
Can't be removed until CEPH_FEATUERE_OSD_PROXY_METADATA goes
as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-16 18:10:13 -07:00
Samuel Just
d2eb10111a features: deprecate CEPH_FEATURE_OSD_TRANSACTION_MAY_LAYOUT
We can't remove this until the other 1<<46's also go.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-16 18:10:13 -07:00
Samuel Just
35e2585e15 features: deprecate CEPH_FEATURE_OSD_OBJECT_DIGEST
We can't actually reuse this until all of the 1<<46 bits are
ready.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-16 18:10:13 -07:00
Samuel Just
333e988627 features,osd/: deprecate CEPH_FEATURE_OSD_REPOP feature bit
This allows us to rip out the code for supporting the old
repop format.  We can't actually reuse this bit until all
4 1<<46 bits are deprecated for one release.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-16 18:10:13 -07:00
Samuel Just
b0ba592986 features: deprecate CEPH_FEATURE_OSD_SET_ALLOC_HINT
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-03-16 18:10:12 -07:00