Commit Graph

72808 Commits

Author SHA1 Message Date
Sage Weil
3d6b6d72f7 mon/OSDMonitor: fix osd metadata update ordering
Do not do both.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:34:29 -04:00
Sage Weil
e570005e2c osd: replace all require_*_osds flag checks with a require_osd_release comparison
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:34:29 -04:00
Sage Weil
3118d9a154 osd: replace require_*_osds flags with require_osd_release field
- OSDMap encode and decode translate between the flags and int
representations.
- OSDMap::Incremental only does decode; we do not expect to ever encode
an incremental osdmap for an old osd that sets any of these flags.
- the 'osd set' command still lets you set the jewel and kraken flags,
but not luminous.
- OSDMap::apply_incremental handles the conversion of legacy require flags
to the new field if the jewel or kraken flags have to be set before
starting the osd upgrade.
- clear out the legacy flags when we make the luminous transition only;
until then we keep using the old flag in the encoded and decoded version
(although the require_osd_release field will be accurate in memory in all
cases).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:33:17 -04:00
Sage Weil
0b517992e0 mon: new 'osd require-osd-release' command
Note that we only allow setting this to 'luminous'.  If the 'jewel' or 'kraken'
flags need to be set that can be done through the legacy interface.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:33:17 -04:00
Sage Weil
3d4c4d9d9d osd/OSDMap: add require_osd_release numeric field, CEPH_RELEASE_*
Instead of eating up a flag for each release, which is super-awkward and
annoying, just keep a numeric release version min.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-29 21:33:17 -04:00
Sage Weil
676fc82ced Merge pull request #15324 from yuyuyu101/wip-20093
msg/async: avoid requeue racing with handle_write

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-29 14:49:57 -05:00
Sage Weil
8554158574 Merge pull request #15325 from liewegas/wip-redirect
osd,librados: add manifest, redirect

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-29 14:48:33 -05:00
Sage Weil
10b32aa501 Merge pull request #15326 from xiexingguo/fix-kvtool-tip
tools/ceph_kvstore_tool: add "bluestore-kv" to usage

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-29 14:48:10 -05:00
Sage Weil
0f803c5ac8 Merge pull request #15337 from wjwithagen/wip-wjw-freebsd-fix-includes
common: include: Redo some includes for FreeBSD
2017-05-29 14:47:50 -05:00
Kefu Chai
7a5a0a893e Merge pull request #15338 from trociny/wip-get_process_name
common: get_process_name: use getprogname on bsd systems

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-29 20:55:30 +08:00
Brad Hubbard
24b0e2bb9b Merge pull request #15345 from badone/wip-tracker-19900-wait_auth_rotating-crash-2
osd: Return early on shutdown

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-29 18:25:36 +10:00
Brad Hubbard
ae6e32dc4b osd: Return early on shutdown
eb5c02d was missing a return statement, rectify that.

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

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-05-29 11:29:23 +10:00
Kefu Chai
0d3e6a9db4 Merge pull request #15336 from wjwithagen/wjw-wip-iso_8601
common/iso_8601.cc: Make return expression Clang compatible

Reviewed-By: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-29 00:44:46 +08:00
Willem Jan Withagen
2f1b0c1863 erasure-code/isa/ErasureCodePluginIsa.cc: fixup includes
- Buffer.h is needed to prevent Clang seriously complaining
   about missing and wrong forward declarations of
	ceph::buffer:ptr
   including buffer_fwd.h does not help.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-28 14:57:06 +02:00
Willem Jan Withagen
973a4a0101 build/include: Redo som includes for FreeBSD
- During include cleanup just a too bit much was removed for FreeBSD
  to get things compiled.
  This redoes some of the includes.

Tracker: http://tracker.ceph.com/issues/19883
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-28 14:56:04 +02:00
Kefu Chai
ef9d93b8ea Merge pull request #15055 from mogeb/wip-with-instrument-functions
cmake: Add -finstrument-functions flag to OSD code

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-28 14:45:57 +08:00
Sage Weil
420dd7ff02 Merge pull request #15319 from liewegas/wip-upmap
mon,osd/OSDMap: a couple pg-upmap fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-27 22:17:14 -05:00
Sage Weil
d8f3ee1623 Merge pull request #15292 from liewegas/wip-map-cache
osd: reduce map cache size

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-27 22:11:57 -05:00
Sage Weil
a9a728fe4d Merge pull request #15296 from liewegas/wip-fix-at-end
qa/tasks/repair_test: unset flags we set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-27 22:11:31 -05:00
Sage Weil
040fd8ce0d Merge pull request #15297 from liewegas/wip-19595
mgr/MgrStandby: prevent use-after-free on just-shut-down Mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-27 22:10:12 -05:00
Kefu Chai
c6f1c06de9 Merge pull request #14284 from tchaikov/wip-19439
qa/tasks/rebuild_mondb: grant "mgr:allow *" to client.admin

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-28 10:38:26 +08:00
Sage Weil
0b0c7e56a1 Merge pull request #15284 from majianpeng/bluestore-batch-throotle
os/bluestore: batch throttle

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-27 21:02:49 -05:00
Sage Weil
5750523e85 Merge pull request #15302 from xiexingguo/wip-fix-reg-leak
common/ceph_context: fix leak of registered commands on exit

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-27 21:01:52 -05:00
Sage Weil
c5628543ca Merge pull request #15320 from liewegas/wip-peon-mapping
mon/OSDMonitor: cancel mapping job from update_from_paxos

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-27 21:00:50 -05:00
Kefu Chai
8abc6e1bea qa/tasks/rebuild_mondb: update to address ceph-mgr changes
- revive ceph-mgr after updating the keyring cap
- grant "mgr:allow *" to client.admin
- minor refactors

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-05-28 09:59:50 +08:00
Mykola Golub
134e295c69 common: get_process_name: use getprogname on bsd systems
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-05-27 21:13:08 +02:00
Willem Jan Withagen
50190741f1 common/iso_8601.cc: Make return expression Clang compatible
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-27 18:36:08 +02:00
xie xingguo
5cace1935b tools/ceph_kvstore_tool: add "bluestore-kv" to usage
We are soon going to use BlueStore as the default OS, and
hence "bluestore-kv" shall be the preferred option.

By applying this patch, the help message shall be slightly
nicer to newcomers to this tool now.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-05-27 11:06:56 +08:00
Sage Weil
8491bc1885 ceph_test_rados_api_tier: skip redirect tests if not luminous
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-26 23:01:26 -04:00
Kefu Chai
af97f164d7 Merge pull request #15111 from Liuchang0812/wip-19885-mgr-help
ceph: introduce "tell x help" subcommand

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-27 10:53:22 +08:00
Sage Weil
9a22b1a6ac qa/suites/rados/thrash-luminous: redirects require luminous
...so skip the at-end variant of d-luminous.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-26 22:52:48 -04:00
Sage Weil
a4247dd594 Merge branch 'wip-extensible_tier-redirect' of git://github.com/myoungwon/ceph into wip-redirect 2017-05-26 22:50:14 -04:00
Haomai Wang
cc45a8b9f4 msg/async: keep _has_next_outgoing calling under write_lock
Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-05-27 10:44:34 +08:00
Haomai Wang
8fb779c540 msg/async: avoid requeue racing with handle_write
when the thread is calling AsyncConnection::handle_write, another thread may
replace it and requeue all messages. Because we remove the write_lock
protection for handle_write caller, it may happen sent racing with out_q

Fix: http://tracker.ceph.com/issues/20093

Signed-off-by: Haomai Wang <haomai@xsky.com>
2017-05-27 10:44:24 +08:00
Sage Weil
5f003d6e03 Merge pull request #15289 from ifed01/wip-bluestore-fix-bmap-assert
os/bluestore: fix BitMapAllocator assert on out-of-bound hint value

Reviewed-by: Varada Kari <varada.kari@gmail.com>
2017-05-26 17:48:08 -05:00
Sage Weil
c867a4d4e4 Merge pull request #15288 from yuyuyu101/wip-20062
msg/async: remove false alert "assert"
2017-05-26 17:47:22 -05:00
Gregory Farnum
032466d72d Merge pull request #15214 from gregsfortytwo/wip-19931-snaptrim-pgref
osd: don't leak pgrefs or reservations in SnapTrimmer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-26 14:50:00 -07:00
Greg Farnum
4caf2df0c3 osd: do not default-abort on leaked pg refs
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-05-26 14:43:26 -07:00
Greg Farnum
66ea9c1f66 osd: shutdown our reserver_finisher earlier in the process
This finisher thread has a lot of callbacks which can hold PGRefs. Make
sure we drain them out before checking that all the PGs have finished
and have no outstanding references.

Moving this should be safe; we've already stopped the op thread et al
and the only things still running are the OSDService's objecter_finisher,
recovery_request_timer, and snap_sleep_timer (which has definitely been emptied
by the time we get here as it's synchronously cleared out on PG shutdown).

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-05-26 14:43:26 -07:00
Casey Bodley
4c45d84926 Merge pull request #15316 from linuxbox2/wip-limitcheck-fixes
rgw-admin: fix bucket limit check argparse, div(0)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-05-26 17:05:23 -04:00
Matt Benjamin
fb8e2fa61f rgw-admin: fix bucket limit check argparse, div(0)
1. normalize arg parsing for "bucket limit check"
1.1 s/buckets/bucket/

2. avoid dividing by num_shards when it is 0

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2017-05-26 15:49:17 -04:00
Sage Weil
2e6317a1e7 mon/OSDMonitor: cancel mapping job from update_from_paxos
On the leader we cancel the mapping job in encode_pending.  On a peon,
we don't cancel it at all!  It is surprising this didn't already cause
problems, but with the PGtempMap is pretty reliably crashes with a
largish map.

Fixes: http://tracker.ceph.com/issues/20067
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-26 14:09:59 -04:00
Sage Weil
a735244fe0 osd/OSDMap: some better pg-upmap debug output
Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-26 14:01:10 -04:00
Sage Weil
90d32a1ee8 mon/OSDMonitor: allow upmap records for deleted pools to be removed
Otherwise the offline osdmaptool --upmap-cleanup can't do its thing.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-26 14:00:57 -04:00
Jos Collin
cc2780c4e9 Merge pull request #15304 from Linbing/modify-note-word-error
mon: Fixed typo in function comment blocks and in other comments
2017-05-26 21:41:08 +05:30
Igor Fedotov
6f8e5d2f1d os/bluestore: fix BitMapAllocator assert on out-of-bound hint value
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2017-05-26 08:41:34 -07:00
Casey Bodley
4603e97183 Merge pull request #15256 from fangyuxiangGL/bucket-stats
rgw: display more info when using  radosgw-admin bucket stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-05-26 10:48:41 -04:00
Casey Bodley
e3bf1df989 Merge pull request #15221 from fangyuxiangGL/set-placement-rule
rgw: set placement rule properly

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-05-26 10:35:26 -04:00
John Spray
ba545c1216 Merge pull request #15287 from ktdreyer/doc-ceph-fs-settings
doc: describe CephFS max_file_size

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-05-26 15:35:10 +01:00
Casey Bodley
30bc0f66d7 Merge pull request #15219 from fangyuxiangGL/extra_pool
rgw: use get_data_extra_pool() when get extra pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-05-26 10:34:19 -04:00