Commit Graph

70790 Commits

Author SHA1 Message Date
Sage Weil
b66bb7702d Merge pull request #14405 from wjwithagen/wip-wjw-gitignore
gitignore: Ignore rejects by patch

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-08 13:25:43 -05:00
Sage Weil
7156f9f416 Merge pull request #14261 from liewegas/wip-15386
ceph_test_librados_api_misc: fix stupid LibRadosMiscConnectFailure.ConnectFailure test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-04-08 13:24:22 -05:00
Sage Weil
175e33bd5b Merge pull request #14130 from liewegas/wip-json-slash
common/escape: do not escape / in json

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
2017-04-08 13:21:44 -05:00
Sage Weil
14e7d6351a Merge pull request #14198 from liewegas/wip-fs
qa/suites: drop 'fs' facet, and add 'objectstore' facet where missing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-08 13:21:03 -05:00
Sage Weil
93f9f4acee Merge pull request #14255 from liewegas/wip-19430
osd/PrimaryLogPG: do not expect FULL_TRY ops to get resent

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-04-08 13:19:50 -05:00
Sage Weil
6db1193906 qa/workunits/cephtool/test.sh: handle non-escaped-/ json
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-08 14:19:00 -04:00
Willem Jan Withagen
084b1454ce gitignore: Ignore rejects by patch
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-04-08 16:53:25 +02:00
Sage Weil
9efc41f0ea Merge pull request #14386 from tchaikov/wip-19515
mon/OSDMonitor: update creating epoch if target osd changed

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-08 09:33:07 -05:00
Sage Weil
bcb17aa093 Merge pull request #14227 from ivancich/wip-perf-counter-race
common/perf_counters: fix race condition with atomic variables

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-04-08 09:22:53 -05:00
Sage Weil
5b8ea86c0f Merge pull request #14365 from tchaikov/wip-another-mgr-command
mgr: move "osd pool stats" to mgr

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-08 09:22:13 -05:00
Sage Weil
82b3c5daaa Merge pull request #14370 from chardan/jfw-wip-simple_spinlock_atomic
common: Implements simple_spin_t in terms of std::atomic_flag.

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-08 09:21:38 -05:00
Kefu Chai
3f4c4bf4a8 Merge pull request #14379 from tchaikov/wip-cmake-ctags
cmake: support optional argument for overriding default ctag excludes

Reviewed-by: Dan Mick <dmick@redhat.com>
2017-04-08 11:44:27 +08:00
Kefu Chai
a5b38e448e tests: ceph_objectstore_tool.py: run vstart with MGR=1
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-08 10:42:43 +08:00
Jason Dillaman
a5d0d0ca08 qa/workunits: partial revert of commit 5b486d9
Testing for disk usage and diff extents for a sparsely written
imported RBD image cannot generically be handled across different
OSD object stores and RBD image features.

The only alternatives would include grepping the rbd CLI
debug log for specific invocations of aio_write or mocking
the rbd CLI for unit testing.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-07 21:06:37 -04:00
Jason Dillaman
2188a7b23b rbd: import-diff was attempting to write empty chunks
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-07 21:06:29 -04:00
Jason Dillaman
24ba996513 rbd: corrected typo in rbd export v2 section header
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-07 21:06:16 -04:00
Sage Weil
b6fdd605e8 Merge pull request #14374 from liewegas/wip-mgr-init
mgr: fix bugs in init, beacons

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-07 13:47:48 -05:00
Igor Fedotov
6f69542501 os/bluestore: refactor small write handling to reuse blob more effectively.
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2017-04-07 18:32:22 +00:00
Sage Weil
c8a6ed8c23 Merge pull request #14306 from liewegas/wip-bluestore-throttle-model
os/bluestore: unify throttling model

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2017-04-07 10:49:32 -05:00
Sage Weil
c38e83f69a os/bluestore: make deferred_aggressive a counter
Multiple threads may run _osr_drain_preceding; use a count to
prevent the first finisher from prematurely disabling
aggressive mode.

Fixes: http://tracker.ceph.com/issues/19542
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-07 11:31:21 -04:00
Kefu Chai
ee6132c607 Merge pull request #14387 from wjwithagen/wip-wjw-test-osd-dup
test/osd/CMakeLists.txt: osd-dup.sh require BlueStore/AIO

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-07 23:16:13 +08:00
Sage Weil
c43faf1dd2 Merge pull request #14348 from rzarzynski/wip-bs-bitmap-no-virts-in-hotspot
os/bluestore: avoid the VTABLE-related burden in BitMapAllocator's hotspot

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-07 09:39:18 -05:00
Sage Weil
6ca733ac8d mon/MgrMonitor: send mgr beacons to leader
The leader has the last_beacon map that matters; make sure all
beacons go there.

At the same time drop the somewhat redundant checks in
preprocess_beaon and just send *everything* to prepare_beacon,
which is smart enough to do no update if there is none.

Fixes: http://tracker.ceph.com/issues/19502
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-07 10:21:46 -04:00
Mykola Golub
4931e31ec1 rbd-mirror A/A: separate ImageReplayer handling from Replayer
Fixes: http://tracker.ceph.com/issues/18785
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-04-07 15:58:52 +02:00
Mykola Golub
7558df5810 rbd-mirror A/A: InstanceReplayer class to acquire and release images
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-04-07 15:58:52 +02:00
Sage Weil
79e78bdbf3 osd/PG: only correct filestore collection bits on load
PG::update_store_with_options() is called on load *and* when the pool
properties change, but if we only need to fix bits right at load time.
More importantly, but doing a second check on pool change, we may race
with a previously queued collection create that is not yet readable via
filestore, try to (synchronously) set the property again, and deadlock.

Fixes: http://tracker.ceph.com/issues/19541
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-07 09:50:12 -04:00
Mykola Golub
8dca9f024a rbd-mirror: add set_remote_images method to ImageReplayer
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-04-07 14:15:07 +02:00
Jianpeng Ma
4a0f0a4698 os/fs/FS.cc: remove the redundant code.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-04-07 17:41:05 +08:00
Kefu Chai
5624b19099 Merge pull request #14366 from wjin/clean_mgr
mgr: remove unused function declarations

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-07 16:16:37 +08:00
Willem Jan Withagen
aa4413198b test/osd/CMakeLists.txt: osd-dup.sh require BlueStore/AIO
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-04-07 10:05:25 +02:00
Jesse Williamson
44aae1ec25 common: Implements simple_spin_t in terms of std::atomic_flag
Removes the requirement of machine-specific code in favor of the standard
library. See also PR #14337.

Signed-off-by: Jesse Williamson <jwilliamson@suse.de>
2017-04-07 00:47:12 -07:00
Kefu Chai
65d83f4a2a mon/OSDMonitor: update creating epoch if target osd changed
there is chance that the acting_primary of a PG being created changes
across osdmap updates, in that case we should update the new creating_pgs
with the mapping's epoch, not the stale one when the PG was originally
created. otherwise the new target OSD won't get the pg-create message.

Fixes: http://tracker.ceph.com/issues/19515
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-07 15:28:55 +08:00
Leo Zhang
c41c50717e messages: fix return type name of MOSDMap
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
2017-04-07 14:32:42 +08:00
Kefu Chai
2950ad91d2 Merge pull request #14029 from dachary/wip-osd-crushmap
mon: osd crush set crushmap need sanity check

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-07 12:42:20 +08:00
Kefu Chai
e1991238e7 cmake: support optional argument for overriding default ctag excludes
so instead of excluding all submodules, one can just exclude boost and
rocksdb using:

  cmake -DCTAG_EXCLUDES="boost;rocksdb" ..

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-07 12:06:52 +08:00
Dan Mick
57b45024f6 Merge pull request #14334 from tchaikov/wip-cmake-ctags
cmake: Add simple recursive ctags target for Ceph source only

Reviewed-by: Dan Mick <dmick@redhat.com>
2017-04-06 19:34:05 -07:00
Haomai Wang
572281a10c Merge pull request #14320 from Adirl/poll_blocking
msg/async/rdma: Make poll_blocking() poll for async events in additio…

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-04-07 08:23:27 +08:00
Casey Bodley
bf461574b1 Merge pull request #14340 from oritwas/wip-rgw-fix-zone-create
radosgw-admin: use zone id when creating a zone

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-06 14:21:16 -04:00
Matt Benjamin
56e8b0ecb1 Merge pull request #14262 from guihecheng/rgw_file-fix-rmdir
rgw_file: fix missing unlock in unlink
2017-04-06 14:00:51 -04:00
Casey Bodley
d108f2db3f Merge pull request #14216 from dongbula/add-multi-zonegroup-for-test
rgw: add --num-zonegroups option for multi test

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-06 13:22:36 -04:00
Casey Bodley
915370776d rgw: fix for null version_id in fetch_remote_obj()
commit 8b43c97812 fixed the wrong use of
the dest_obj's version, but removed the check for "null" version

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-06 13:17:51 -04:00
Casey Bodley
1c863a78ed rgw: fix for EINVAL errors on forwarded bucket put_acl requests
PutACL rejects request that include both a canned_acl and a request
body. when forwarding requests with canned_acls, we were also including
the generated policy in the body

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-06 13:16:18 -04:00
Casey Bodley
80892760ec Merge pull request #14354 from mogeb/cmake-lttng
cmake: build tracepoint libraries for vstart target

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-06 13:09:40 -04:00
Sage Weil
abfb057334 mgr/Mgr: unlock lock while blocking for metadata load
Fixes: http://tracker.ceph.com/issues/19516
Signed-off-by: Sage Weil <sage@redhat.com>
2017-04-06 11:40:27 -04:00
Sage Weil
bb6bef042f Merge pull request #14115 from liewegas/wip-bluestore-metadata
os/bluestore: implement collect_metadata
2017-04-06 10:16:17 -05:00
Sage Weil
7024b04bdf Merge pull request #14304 from rchagam/18576_bug_fix
tracing: fix segv

Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-06 10:15:17 -05:00
Sage Weil
1d465facb4 Merge pull request #14328 from liewegas/wip-mgrmap-features
mgr: fix several init/re-init bugs

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-06 10:14:09 -05:00
Sage Weil
1ea9783781 Merge pull request #14333 from liewegas/wip-bluestore-misc
os/bluestore: misc fixes

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2017-04-06 10:13:43 -05:00
Amir Vadai
2386cea1eb msg/async/rdma: Make poll_blocking() poll for async events in addition to tx/rx
Issue: 995322
Change-Id: I62e75f4c4e574ba97e24b20a4d7b94c56c605bb5
Signed-off-by: Amir Vadai <amir@vadai.me>
2017-04-06 15:09:25 +00:00
Sage Weil
092aa00654 Merge pull request #14210 from liewegas/wip-osd-dup
os: allow offline conversion of filestore -> bluestore (or anything else)

Reviewed-by: David Zafman <dzafman@redhat.com>
2017-04-06 09:51:18 -05:00