RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,026 Commits 216 Branches 395 Tags 1.4 GiB
fda6e16cf1
Commit Graph

73026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jiaying Ren
a0d88b09ef rgw: fix test_multi.py default config file path 
$ python test_multi.py --num-zonegroups=2 --num-zones 2 --gateways-per-zone 1
Traceback (most recent call last):
  File "test_multi.py", line 315, in <module>
      init(True)
        File "test_multi.py", line 162, in init
	    path = tpath('test_multi.conf')
	    NameError: global name 'tpath' is not defined

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
 2017-05-27 10:45:20 +08: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
Sage Weil
4cb882e026 mon/OSDMonitor: change info in 'osd failed' messages 
- put 'osd.NNN failed' at front
- drop the ip address
- include the crush location
- be consistent:
  "osd.$id failed ($crush_location) ($reason)"

2017-05-26 16:05:21.573460 mon.0 [INF] osd.0 failed (root=default,host=gnit) (refused connection reported by osd.1)
2017-05-26 16:06:17.198225 mon.0 [INF] osd.1 failed (root=default,host=gnit) (2 reporters from different osd after 20.098778 >= grace 20.000000)

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-26 16:07:20 -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
Kefu Chai
86031d02fa mon: trim the creating_pgs after updating it with pgmap 
see-also: http://tracker.ceph.com/issues/20067
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-27 01:32:11 +08:00
Kefu Chai
50616b9e57 mon/OSDMonitor: print more log when updating creating_pgs 
see-also: http://tracker.ceph.com/issues/20067
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-27 01:32:11 +08:00
Sage Weil
d64b481a8a unittest_osdmap: parse env 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-26 12:26:03 -04:00
Sage Weil
e1bd82851d osd/OSDMap: more efficient PGMapTemp 
Use a flat_map with pointers into a buffer with the actual data.  For a
decoded mapping, we have just two allocations (one for flat_map and one
for the encoded buffer).

This can get slow if you make lots of incremental changes after the fact
since flat_map is not efficient for modifications at large sizes.  :/

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-26 12:26:03 -04:00
Sage Weil
3630165609 osd/OSDMap: encapsulate pg_temp 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-26 12:26:03 -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
Loic Dachary
cd86ef1292 crush: allow item addition/removal when choose_args exists 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2017-05-26 18:48:36 +03:00
Loic Dachary
ffc0d0f1bf crush: wrap crush_bucket_{remove,add}_item 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2017-05-26 18:47:51 +03:00
Jos Collin
dba3d3e42d common: Remove redundant includes 
Fixes: http://tracker.ceph.com/issues/19883 (Partially)

Signed-off-by: Jos Collin <jcollin@redhat.com>
 2017-05-26 21:12:39 +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
Casey Bodley
456ac50aa7 Merge pull request #14341 from theanalyst/cleanup/rgw/str-find 
rgw_common: use string::npos for the results of str.find

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-05-26 10:33:35 -04:00
Sage Weil
d6c4925793 Merge pull request #14746 from wjwithagen/wip-wjw-reduce-noise-2 
src/ceph.in: Use env(CEPH_DEV) to suppress noise from ceph

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-26 09:30:17 -05:00
Sage Weil
622c09ccd3 Merge pull request #15247 from liewegas/wip-upmap-save 
osdmaptool: require --upmap-save before modifying input osdmap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2017-05-26 09:20:05 -05:00
Jason Dillaman
47ad4429fb Merge pull request #15234 from trociny/wip-19832 
librbd: potential read IO hang when image is flattened

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-05-26 10:12:44 -04:00
Jason Dillaman
a38f0a5c98 Merge pull request #15239 from trociny/wip-19962 
librbd: discard related IO should skip op if object non-existent

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-05-26 10:12:06 -04:00