Commit Graph

72832 Commits

Author SHA1 Message Date
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
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
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
Matt Benjamin
189ce0e5a6 Merge pull request #15293 from linuxbox2/wip-rgwfile-buckattr
rgw_file: store bucket uxattrs on the bucket
2017-05-26 09:48:09 -04:00
linbing
730781afec mon: it's no need to get pg action_primary osd twice in pg scrub
Signed-off-by: linbing <linbing@t2cloud.net>
2017-05-26 21:36:14 +08:00
Jason Dillaman
32bd33eb1b Merge pull request #15290 from idryomov/wip-krbd-unmap-straw
qa/suites/krbd: unmap subsuite needs straw buckets

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-05-26 09:27:50 -04:00
Ken Dreyer
4274c91c28 doc: describe differences with "mds set" vs "fs set"
Thanks to John Spray <jspray@redhat.com> on ceph-users for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-26 06:38:14 -06:00
Ken Dreyer
02753cdb91 doc: describe CephFS max_file_size
Add a description of max_file_size to the CephFS admin docs.

Thanks to John Spray <jspray@redhat.com> on ceph-users for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-26 06:38:11 -06:00
Jianpeng Ma
910e58011d os/bluestore/BlueStore: Only call once notify_all.
All txcs of deferred_running have the same osr, so only call once
notify_call.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-05-26 18:15:06 +08:00
Jianpeng Ma
45113968b8 os/bluestore/BlueStore: avoid iterating to get ios/cost in _kv_sync_thread.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-05-26 18:15:06 +08:00
Jianpeng Ma
6435c4a252 os/bluestore/BlueStore: batch handle Throttle.put.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-05-26 18:15:06 +08:00
Willem Jan Withagen
f28f4cbc20 ./qa/workunits/ceph-helpers.sh: Do not trace kill_daemon
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-26 12:07:28 +02:00
Willem Jan Withagen
0f8972dd70 vstart:Suppress trivial logging info during devlopment
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-26 12:07:14 +02:00
Willem Jan Withagen
f7e60bac5d src/ceph.in: Use env(CEPH_DEV) to suppress noise from ceph
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-05-26 12:07:13 +02:00
linbing
5b468b641a Modify note error
Signed-off-by: linbing linbing@t2cloud.net
2017-05-26 17:45:43 +08:00
liuchang0812
5284778e0e tool/ceph: support target mon in tell help subcommand
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2017-05-26 17:39:22 +08:00
xie xingguo
9939d5a819 common/ceph_context: fix leak of registered commands on exit
By unregister them properly.
Also rearrange commands order to keep pace with register process.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-05-26 17:28:55 +08:00
Greg Farnum
b0e9deeea8 osd: Reset() the snaptrimmer on shutdown
We were failing to exit various wait states which held PGRefs. Error!

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

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-05-25 21:52:49 -07:00
Sage Weil
6b6c14f8c7 Merge pull request #14658 from chardan/jfw-wip-halflife_atomic_t-baragon
librados,libradosstriper,test: migrate atomic_t to std::atomic (baragon)

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-25 22:29:19 -05:00
Sage Weil
0f01014ba5 Merge pull request #15227 from tchaikov/wip-20051
mon/MonClient: cancel pending commands on shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-05-25 22:28:47 -05:00
Sage Weil
6650a18e59 Merge pull request #15249 from Alessandro-Barbieri/patch-2
yasm-wrapper: filter -pthread

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-25 22:27:57 -05:00
Sage Weil
dcebdf4ff0 Merge pull request #15268 from ifed01/wip-bluestore-false-assert
os/bluestore: fix false assert in IOContext::aio_wake

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-25 22:27:23 -05:00
Sage Weil
94c834ab9b Merge pull request #15272 from tchaikov/wip-mon-cleanups
mon: cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
2017-05-25 22:27:11 -05:00
Sage Weil
855955e58e osd: reduce size of osdmap cache, messages
On large clusters, these large caches can be problematic (as maps get big).
We've seen good results with extremely small caches (10s of maps).  Make
a more modest reduction.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-25 23:13:37 -04:00
Sage Weil
c1b92cdcbb test/osd/osd-config.sh: fix test to isolate cases
The third test (increasing osd_map_max_advance)
was triggering a warning from the 4th case (which
it didn't before).

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-25 23:13:37 -04:00
Sage Weil
c489d45113 osd: fadvise hint WILL_NEED when reading encoded osdmaps
This way will ensure we cache data for recent osdmaps if we need to for
the benefit of laggy clients... even if (in bluestore's case)
bluestore_default_buffered_reads = false (it's true by default).  This
should mitigate any tail latency/work even if the osdmap cache size is too
small.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-25 22:52:33 -04:00
Sage Weil
73985a5b10 osd: instrument osdmap bl cache hits and misses
Add perfcounters so we can see whether we are missing osdmaps in the
cache.  This will let us tell whether, given a workload or environment,
our osdmap cache might be too small.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-25 22:52:33 -04:00
Sage Weil
0ff3d4291c osd: do not bother with misdirected op diagnosis by default
We enable osd_debug_misdirected_ops in QA, but this is wasted effort on
a production cluster.  In particular, it means that a idle client that
sends an op to the wrong OSD based on an old map will require that OSD to
load that old map into memory to decide whether to print a warning... all
on the off-chance that the client is buggy.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-05-25 22:29:22 -04:00