]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Abhishek L [Thu, 14 Sep 2017 09:31:23 +0000 (11:31 +0200)]
Merge pull request #17445 from smithfarm/wip-21110-luminous
luminous: rgw: send data-log list infinitely
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Abhishek L [Thu, 14 Sep 2017 08:33:29 +0000 (10:33 +0200)]
Merge pull request #17488 from smithfarm/wip-21241-luminous
luminous: rgw: usage of --inconsistent-index should require user confirmation and print a warning
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Abhishek L [Thu, 14 Sep 2017 08:28:16 +0000 (10:28 +0200)]
Merge pull request #17484 from smithfarm/wip-21184-luminous
luminous: tests: NameError: global name 'name' is not defined
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Abhishek L [Thu, 14 Sep 2017 08:26:12 +0000 (10:26 +0200)]
Merge pull request #17474 from smithfarm/wip-21114-luminous
luminous: cephfs: tests: FS_DEGRADED spurious health warnings in some sub-suites
Reviewed-By: Patrick Donelly <pdonelly@redhat.com>
Abhishek L [Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)]
Merge pull request #17471 from smithfarm/wip-21107-luminous
luminous: cephfs: client/mds has wrong check to clear S_ISGID on chown
Reviewed-By: Patrick Donelly <pdonelly@redhat.com>
Abhishek L [Wed, 13 Sep 2017 21:13:03 +0000 (23:13 +0200)]
Merge pull request #17646 from theanalyst/wip-luminous-multifixes
luminous: rgw fixes for multisite tests in luminous
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Jason Dillaman [Tue, 12 Sep 2017 20:04:54 +0000 (16:04 -0400)]
Merge pull request #17647 from dillaman/wip-21345
luminous: qa/workunits/rbd: relax greps to support upgrade formatting change
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Casey Bodley [Wed, 30 Aug 2017 15:16:25 +0000 (11:16 -0400)]
test/rgw: fix test_encrypted_object_sync for 3+ zones
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
8762c4b29051b2b49bfd8c1e0ceaa1aee6417a74 )
Alfredo Deza [Tue, 12 Sep 2017 12:01:43 +0000 (08:01 -0400)]
Merge pull request #17653 from ceph/backport-wip-bz1478598
luminous: ceph-volume allow filtering by `uuid`, do not require osd id
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Abhishek L [Tue, 12 Sep 2017 11:02:35 +0000 (13:02 +0200)]
Merge pull request #17485 from smithfarm/wip-21185-luminous
luminous: rgw: rgw_file: incorrect lane lock behavior in evict_block()
Reviewed-By: Orit Wasserman <oritwas@redhat.com>
Abhishek L [Tue, 12 Sep 2017 10:40:44 +0000 (12:40 +0200)]
Merge pull request #17476 from smithfarm/wip-21135-luminous
luminous: rgw: bucket index sporadically reshards to 65521 shards
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Abhishek L [Tue, 12 Sep 2017 09:06:05 +0000 (11:06 +0200)]
Merge pull request #17470 from smithfarm/wip-21104-luminous
luminous: build/ops: ceph-fuse RPM should require fusermount
Reviewed-By: Ken Dreyer <ktdreyer@redhat.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
Abhishek L [Tue, 12 Sep 2017 09:05:14 +0000 (11:05 +0200)]
Merge pull request #17477 from smithfarm/wip-21137-luminous
luminous: mgr: 500 error when attempting to view filesystem data
Reviewed-By: John Spray <jcsp@redhat.com>
Sage Weil [Mon, 11 Sep 2017 21:09:01 +0000 (16:09 -0500)]
Merge pull request #17495 from smithfarm/wip-21235-luminous
luminous: tests: thrashosds read error injection doesn't take live_osds into account
Sage Weil [Mon, 11 Sep 2017 21:07:22 +0000 (16:07 -0500)]
Merge pull request #17483 from smithfarm/wip-21183-luminous
luminous: mgr: Crash in MonCommandCompletion
Sage Weil [Mon, 11 Sep 2017 21:06:42 +0000 (16:06 -0500)]
Merge pull request #17486 from smithfarm/wip-21188-luminous
luminous: pybind: dashboard usage graph getting bigger and bigger
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 11 Sep 2017 21:05:24 +0000 (16:05 -0500)]
Merge pull request #17350 from liewegas/wip-pr-17334-luminous
os/bluestore: reshard-fix wrong shard length
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Abhishek L [Mon, 11 Sep 2017 20:31:14 +0000 (22:31 +0200)]
Merge pull request #17473 from smithfarm/wip-21112-luminous
luminous: cephfs: get_quota_root sends lookupname op for every buffered write
Reviewed-By: Patrick Donnelly <pdonnell@redhat.com>
Abhishek L [Mon, 11 Sep 2017 20:29:32 +0000 (22:29 +0200)]
Merge pull request #17465 from smithfarm/wip-21045-luminous
luminous: rbd: TestMirroringWatcher.ModeUpdated: periodic failure due to injected message failures
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Abhishek L [Mon, 11 Sep 2017 20:28:59 +0000 (22:28 +0200)]
Merge pull request #17565 from theanalyst/wip-21278-luminous
luminous: the standbys are not updated via ceph tell mds.* command
Reviewed-By: Patrick Donnelly <pdonnell@redhat.com>
Abhishek L [Mon, 11 Sep 2017 20:28:06 +0000 (22:28 +0200)]
Merge pull request #17566 from theanalyst/wip-21267-luminous
luminous: Incorrect grammar in FS message 1 filesystem is have a failed mds daemon
Reviewed-By: Patrick Donnelly <pdonnell@redhat.com>
Abhishek L [Mon, 11 Sep 2017 20:23:50 +0000 (22:23 +0200)]
Merge pull request #17557 from theanalyst/wip-21269-luminous
luminous: some generic options can not be passed by rbd-nbd
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Abhishek L [Mon, 11 Sep 2017 19:43:48 +0000 (21:43 +0200)]
Merge pull request #17448 from smithfarm/wip-21118-luminous
luminous: rgw: need to stream metadata full sync init
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Abhishek L [Mon, 11 Sep 2017 19:37:26 +0000 (21:37 +0200)]
Merge pull request #17464 from smithfarm/wip-20964-luminous
luminous: rbd: switch to new config option getter methods
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Alfredo Deza [Mon, 11 Sep 2017 16:32:08 +0000 (12:32 -0400)]
ceph-volume lvm.trigger just split the osd_id once
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
ecd5af88da2815603283742c661d27e2a48f9f7e )
Alfredo Deza [Mon, 11 Sep 2017 16:30:34 +0000 (12:30 -0400)]
ceph-volume tests catch improper parsing of osd uuid
When the osd ID existed in the UUID in the same format (e.g. '1-') the
parsing would break returning a bogus UUID that is impossible to find
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
5392697121ef150f0edac05df14d116cf0148593 )
Andrew Schoen [Fri, 8 Sep 2017 20:32:15 +0000 (15:32 -0500)]
tests: remove 'ceph-' prefix from test node hostnames
This updates our Vagrantfile to match the changes in ceph-ansible
introduced by https://github.com/ceph/ceph-ansible/commit/
298a63c43
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit
f41d359ebaec8762ed1a7b8cfd85c23f351a5070 )
Alfredo Deza [Fri, 8 Sep 2017 16:25:57 +0000 (12:25 -0400)]
ceph-volume lvm.api PVolumes should filter by all matching tags, not just one
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
b8613c1d7bf56c49d1b7f1c41a37073b8739bbc3 )
Alfredo Deza [Fri, 8 Sep 2017 16:25:31 +0000 (12:25 -0400)]
ceph-volume tests pv API should also match all pv_tags
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
120fd6a196045c8511c3eaafec37de43003bf450 )
Alfredo Deza [Fri, 8 Sep 2017 15:47:09 +0000 (11:47 -0400)]
ceph-volume tests prove all volume tags have to match in vgs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
fe2a7106decb586e83f5b60d6c18c454afe4883e )
Alfredo Deza [Fri, 8 Sep 2017 15:46:34 +0000 (11:46 -0400)]
ceph-volume lvm.api all vg tags should match, not just one
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
6d679855aa077e2de3f20316625d478a3697c78f )
Alfredo Deza [Thu, 7 Sep 2017 21:00:22 +0000 (17:00 -0400)]
ceph-volume tests prove all tags have to match in lvs
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
80e401ca970066541ae7255be1caf42883048df4 )
Alfredo Deza [Thu, 7 Sep 2017 20:59:53 +0000 (16:59 -0400)]
ceph-volume lvm.api all lv tags should match, not just one
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
dbaf30c3e4d921df2a92812383c8805a77eb8f5b )
Alfredo Deza [Thu, 7 Sep 2017 20:56:55 +0000 (16:56 -0400)]
ceph-volume lvm.activate allow not using osd_id
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
99a8a719695591558da29b3d16a347d5bff8bf3d )
Alfredo Deza [Thu, 7 Sep 2017 20:54:19 +0000 (16:54 -0400)]
ceph-volume tests prove missing args.osd_id is fine
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
8d1a1a885fd65073308c205949bc70b41805f92f )
Alfredo Deza [Thu, 7 Sep 2017 20:51:43 +0000 (16:51 -0400)]
ceph-volume tests add is_root and lv fixtures to conftest
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
d18d5e139be82de36e1a60340525adbf79fdedd9 )
Abhishek L [Mon, 11 Sep 2017 19:22:44 +0000 (21:22 +0200)]
Merge pull request #17446 from smithfarm/wip-21115-luminous
luminous: rgw multisite: objects encrypted with SSE-KMS are stored unencrypted in target zone
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Abhishek L [Mon, 11 Sep 2017 19:22:05 +0000 (21:22 +0200)]
Merge pull request #17468 from smithfarm/wip-21052-luminous
luminous: build/ops: RHEL 7.3 Selinux denials at OSD start
Reviewed-By: Ken Dreyer <ktdreyer@redhat.com>
Abhishek L [Mon, 11 Sep 2017 19:19:17 +0000 (21:19 +0200)]
Merge pull request #17444 from smithfarm/wip-20968-luminous
luminous: rgw: bytes_send and bytes_recv in the msg of usage show returning is 0 in master branch
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Abhishek L [Mon, 11 Sep 2017 19:16:40 +0000 (21:16 +0200)]
Merge pull request #17555 from theanalyst/wip-21270-luminous
luminous: rgw: shadow objects are sometimes not removed
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Abhishek L [Mon, 11 Sep 2017 19:00:36 +0000 (21:00 +0200)]
Merge pull request #17558 from theanalyst/wip-21277-luminous
luminous: [cls] metadata_list API function does not honor `max_return` parameter.
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Abhishek L [Mon, 11 Sep 2017 18:59:53 +0000 (20:59 +0200)]
Merge pull request #17556 from theanalyst/wip-21265-luminous
luminous: [cli] rename of non-existent image results in seg fault
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Abhishek L [Mon, 11 Sep 2017 18:59:28 +0000 (20:59 +0200)]
Merge pull request #17560 from theanalyst/wip-21288-luminous
luminous: [test] various teuthology errors
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Abhishek L [Mon, 11 Sep 2017 18:58:52 +0000 (20:58 +0200)]
Merge pull request #17561 from theanalyst/wip-21289-luminous
luminous: [rbd] image-meta list does not return all entries
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Jason Dillaman [Thu, 7 Sep 2017 12:55:27 +0000 (08:55 -0400)]
qa/workunits/rbd: relax greps to support upgrade formatting change
Fixes: http://tracker.ceph.com/issues/21181
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
273c84578b06905229a7c6eae7b1a12bbe60de95 )
Conflicts:
qa/workunits/rbd/import_export.sh: trivial resolution
Abhishek L [Mon, 11 Sep 2017 18:08:14 +0000 (20:08 +0200)]
Merge pull request #17336 from tchaikov/wip-luminous-pr-16774
luminous: mgr/dashboard: fix rbd's pool sub menu
Reviewed-By: Jason Dillaman <jdillaman@redhat.com>
Sage Weil [Sun, 10 Sep 2017 19:16:20 +0000 (14:16 -0500)]
Merge pull request #17622 from liewegas/wip-more-lum-pi
osd: update info only if new_interval
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 10 Sep 2017 19:01:27 +0000 (14:01 -0500)]
Merge pull request #17564 from theanalyst/wip-21283-luminous
qa/objectstore/bluestore*: less debug output
Kefu Chai [Mon, 4 Sep 2017 05:51:34 +0000 (13:51 +0800)]
osd: update info only if new_interval
refactor OSD::build_initial_pg_history() so we update the info only if a
new interval is identified. also, this is consistent with
OSD::build_past_intervals_parallel().
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
4ae053439e526fab0451d1502576dce89eb6b44f )
Sage Weil [Sun, 10 Sep 2017 18:59:45 +0000 (13:59 -0500)]
Merge pull request #17496 from smithfarm/wip-21236-luminous
luminous: osd: build_initial_pg_history doesn't update up/acting/etc
Sage Weil [Sun, 10 Sep 2017 18:56:51 +0000 (13:56 -0500)]
Merge pull request #17601 from liewegas/wip-21171-luminous
os/bluestore: fix deferred write deadlock, aio short return handling
Jason Dillaman [Fri, 8 Sep 2017 18:04:14 +0000 (14:04 -0400)]
Merge pull request #17551 from dillaman/wip-21280
luminous: test/cls_rbd: mask newer feature bits to support upgrade tests
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Sage Weil [Fri, 8 Sep 2017 15:58:39 +0000 (10:58 -0500)]
Merge pull request #17467 from smithfarm/wip-21046-luminous
luminous: common: adding line break at end of some cli results
Sage Weil [Fri, 8 Sep 2017 15:57:33 +0000 (10:57 -0500)]
Merge pull request #17472 from smithfarm/wip-21108-luminous
luminous: mon: OSDMonitor: osd pool application get support
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 15:56:56 +0000 (10:56 -0500)]
Merge pull request #17475 from smithfarm/wip-21133-luminous
luminous: osd: PrimaryLogPG: sparse read won't trigger repair correctly
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 15:55:55 +0000 (10:55 -0500)]
Merge pull request #17481 from smithfarm/wip-21182-luminous
luminous: core: osd crush rule rename not idempotent
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 15:55:37 +0000 (10:55 -0500)]
Merge pull request #17494 from smithfarm/wip-21234-luminous
luminous: bluestore: asyn cdeferred_try_submit deadlock
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Fri, 8 Sep 2017 15:51:33 +0000 (08:51 -0700)]
Merge pull request #17469 from smithfarm/wip-21103-luminous
luminous: cephfs: client: missing space in some client debug log messages
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Fri, 8 Sep 2017 15:48:05 +0000 (08:48 -0700)]
Merge pull request #17562 from theanalyst/wip-21276-luminous
luminous: os/bluestore/BlueFS.cc: 1255: FAILED assert(!log_file->fnode.extents.empty())
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 14:28:35 +0000 (09:28 -0500)]
Merge pull request #17345 from liewegas/wip-pr-17311-luminous
mon: use ceph_clock_now if message is self-generated
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 8 Sep 2017 14:28:17 +0000 (09:28 -0500)]
Merge pull request #17344 from liewegas/wip-pr-17330-luminous
mon/OSDMonitor: make 'osd crush class rename' idempotent
Sage Weil [Fri, 8 Sep 2017 14:27:55 +0000 (09:27 -0500)]
Merge pull request #17527 from liewegas/wip-pr-17510-luminous
crush: fix fast rule lookup when uniform
Sage Weil [Fri, 8 Sep 2017 14:27:31 +0000 (09:27 -0500)]
Merge pull request #17511 from liewegas/wip-stupid-luminous
os/bluestore: default to stupid allocator
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Sage Weil [Fri, 8 Sep 2017 14:26:27 +0000 (09:26 -0500)]
Merge pull request #17501 from smithfarm/wip-21242-luminous
luminous: osd: osd/PG: discard msgs from down peers
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 14:25:37 +0000 (09:25 -0500)]
Merge pull request #17500 from smithfarm/wip-21240-luminous
luminous: mon: rate limit on health check update logging
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 14:24:50 +0000 (09:24 -0500)]
Merge pull request #17498 from smithfarm/wip-21238-luminous
luminous: osd: subscribe to new osdmap while waiting_for_healthy
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 14:22:49 +0000 (09:22 -0500)]
Merge pull request #17497 from smithfarm/wip-21237-luminous
luminous: bluestore: osd crash when change option bluestore_csum_type from none to CRC32
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Sep 2017 14:22:23 +0000 (09:22 -0500)]
Merge pull request #17378 from jan--f/wip-21187-luminous
luminous: core: osd/PGLog: write only changed dup entries
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Thu, 7 Sep 2017 20:28:59 +0000 (16:28 -0400)]
os/bluestore/aio: handle short return from io_submit
io_submit may return a value less than nr, indicating that only some of
the provided iocbs were queued. If that happens we should loop, not
return and silently drop those aios on the floor.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
dc17dfd9ff05b5676488c2b1bca53026b2ca6244 )
Sage Weil [Wed, 30 Aug 2017 21:18:18 +0000 (17:18 -0400)]
os/bluestore: more deferred debugging
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
11ac691dcc86aeed4ccb692a79ade4be04c5ef2f )
Sage Weil [Tue, 29 Aug 2017 20:15:52 +0000 (16:15 -0400)]
os/bluestore: drop deferred_submit_lock
This lock serves no purpose. It only protects the call to the aio_submit
on the OpSequencer running batch, but we are the only caller who will do
that submission, and a new batch won't be moved into place until ours is
completed and retired (by the completion for the aio we are queueing).
More importantly, this fixes a deadlock:
- thread A submits aio, but the queue is full, and blocks
- thread B blocks taking deferred_submit_lock while holding deferred_lock
- aio completion thread blocks trying to take deferred_lock, and thus
no further aios are drained.
Fixes: http://tracker.ceph.com/issues/21171
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
7a5ef62af194373c3a8c307b05ae6d467e49c9f0 )
Pan Liu [Fri, 8 Sep 2017 01:34:36 +0000 (09:34 +0800)]
Merge pull request #17534 from liewegas/wip-pr-17459-luminous
os/bluestore: add bluestore_prefer_deferred_size_hdd/ssd to tracked keys
John Spray [Mon, 28 Aug 2017 12:50:46 +0000 (13:50 +0100)]
mds: fix "1 filesystem is have a..." message
Like "Health check failed: 1 filesystem is have a failed mds daemon (FS_WITH_FAILED_MDS)"
Fixes: http://tracker.ceph.com/issues/21153
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
7d21119a47212140d121df99efdb838a3f078a82 )
Kefu Chai [Tue, 5 Sep 2017 08:33:24 +0000 (16:33 +0800)]
ceph: collect all mds in mdsids()
otherwise, only the active mds are returned.
Fixes: http://tracker.ceph.com/issues/21230
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
dd702cc94e32f533f0f2e76f9d202d1fa7c6a57f )
Kefu Chai [Tue, 5 Sep 2017 08:05:44 +0000 (16:05 +0800)]
ceph: always populate `targets` with ids_by_service()
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
b682e61ddc190b91da4c6cbaeba3c69d54652afb )
Kefu Chai [Tue, 5 Sep 2017 08:00:59 +0000 (16:00 +0800)]
ceph: extract ids_by_service() so it can be reused
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
25639f66910aa8a188d5b4b8fff8803e169da62a )
Sage Weil [Tue, 5 Sep 2017 21:43:28 +0000 (17:43 -0400)]
qa/objectstore/bluestore*: less debug output
Let's see if this makes the spurious MON_DOWN failures go away? (See
http://tracker.ceph.com/issues/20910)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
444f5aa08539cde827e7d93a514367a8ba39b122 )
Conflicts:
qa/objectstore/bluestore-bitmap.yaml
Added bluestore-bitmap.yaml to Luminous as well
Sage Weil [Tue, 5 Sep 2017 19:01:02 +0000 (15:01 -0400)]
os/bluestore/BlueFS: prevent _compact_log_async reentry
_should_compact_log uses new_log != nullptr to tell whether compaction is
already in progress, but we don't set it until we are midway through the
process. Set it at the top of the method to prevent reentry.
See
455cc6cea2e5e8bc1126b5047b6003fa583af1b5 , which failed to implement
this properly.
Fixes: http://tracker.ceph.com/issues/21250
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6bd9db304f906e9e4a07ca5ce07ffffdbc1678f0 )
Jason Dillaman [Wed, 6 Sep 2017 20:14:58 +0000 (16:14 -0400)]
rbd: support iterating over metadata items when listing
Fixes: http://tracker.ceph.com/issues/21179
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9c4f9856b034061aed052192b0ee09b9a9d09bc0 )
Jason Dillaman [Tue, 5 Sep 2017 20:26:52 +0000 (16:26 -0400)]
qa/suites/rbd: reduce monitor requirements for mirroring tests
Fixes: http://tracker.ceph.com/issues/21251
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
27194c30c50009eaf6391a21837f73b312fe5de6 )
Jason Dillaman [Tue, 5 Sep 2017 20:20:26 +0000 (16:20 -0400)]
qa/suites/rbd: fixed cache override
Fixes: http://tracker.ceph.com/issues/21251
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
98061bb3d7ce6309ddb04ea4d7e9d44a7ecd09c6 )
Jason Dillaman [Tue, 5 Sep 2017 19:59:47 +0000 (15:59 -0400)]
qa/suites/rbd: reduce OSD debug log levels
The teuthology machines are periodically running out of space
due to the aggressive log settings.
Fixes: http://tracker.ceph.com/issues/21251
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
763f1877ecda680e62a2b7eff5815bb6b7dd18f2 )
Jason Dillaman [Tue, 5 Sep 2017 14:53:47 +0000 (10:53 -0400)]
cls/rbd: metadata_list not honoring max_return parameter
Fixes: http://tracker.ceph.com/issues/21247
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
0130b85732849da8bb3e96f4afb7c023c958aef9 )
Pan Liu [Sun, 3 Sep 2017 04:12:15 +0000 (12:12 +0800)]
rbd-nbd: fix generic option issue
Fixes: http://tracker.ceph.com/issues/20426
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
(cherry picked from commit
16f64a4c01068603736af476f640268d0baa338d )
Pan Liu [Tue, 29 Aug 2017 15:30:15 +0000 (23:30 +0800)]
rbd-nbd: lower down the log level when return -EINVAL in aio_callback.
Signed-off-by: Pan Liu <wanjun.lp@alibaba-inc.com>
(cherry picked from commit
dcd7e5bb82524bf111a6d80d9e0c050ae55b26a1 )
Jason Dillaman [Tue, 5 Sep 2017 16:11:45 +0000 (12:11 -0400)]
librbd: rename of non-existent image results in seg fault
Fixes: http://tracker.ceph.com/issues/21248
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4a75ee43d3b108a9593a010160479fd62884eda8 )
Yehuda Sadeh [Wed, 5 Jul 2017 23:10:38 +0000 (16:10 -0700)]
rgw: add tail tag to track tail instance
Use tail_tag instead of idtag. The tail_tag is modified when either
creating a new tail, or adding a refcount to the tail (e.g., when
copying object). When just modifying the object's head, tail_tag
should remain the same. The gc will then use the tail_tag (if
exists, idtag if not) as the refcount id.
Fixes: http://tracker.ceph.com/issues/20234
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
f71a3e525d9a69fe537428f25930fb207a602afe )
Jason Dillaman [Wed, 6 Sep 2017 01:37:16 +0000 (21:37 -0400)]
test/cls_rbd: mask newer feature bits to support upgrade tests
Fixes: http://tracker.ceph.com/issues/21217
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
aeb8f29d21625f3570e2f3e6dd26594d1a6df810 )
xie xingguo [Tue, 5 Sep 2017 03:45:53 +0000 (11:45 +0800)]
os/bluestore: add bluestore_prefer_deferred_size_hdd/ssd to tracked keys
To make these two keys can be changed online:
./bin/ceph tell osd.* injectargs "--bluestore_prefer_deferred_size_hdd 0"
osd.0: bluestore_prefer_deferred_size_hdd = '0' (not observed, change may require restart)
osd.1: bluestore_prefer_deferred_size_hdd = '0' (not observed, change may require restart)
osd.2: bluestore_prefer_deferred_size_hdd = '0' (not observed, change may require restart)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
cd1225634cf4d20e485f7c30d5a0438febc7ddcc )
Sage Weil [Wed, 6 Sep 2017 02:25:03 +0000 (22:25 -0400)]
crush: fix fast rule lookup when uniform
Older clients will search for the first rule with a matching ruleset,
type, and size. The has_uniform_rules bool is only set if we have rule
ids and rulesets that line up, but we must also verify that the rest of the
mask matches or else we can get a different CRUSH mapping result because
the mask might not match and old clients will fail to find a rule and we
will find one. We also can't just check the ruleset as the legacy clients
find the *first* (of potentially many) matching rules; hence we only do
the fast check if all rulesets == rule id.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f24095e0e9734531dbdbcd4bff1392c463188e8e )
Sage Weil [Wed, 6 Sep 2017 03:04:15 +0000 (23:04 -0400)]
os/bluestore: mark bluestore_allocator as DEV
We don't want users changing this without a good reason.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 10 Aug 2017 15:58:40 +0000 (11:58 -0400)]
os/bluestore: put StupidAllocator btree into bluestore_alloc mempool
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6f189d8ab3c549a5c5e01616310c6eb39119fbc1 )
Sage Weil [Thu, 10 Aug 2017 15:21:32 +0000 (11:21 -0400)]
os/bluestore: default 'bluefs_allocator = stupid'
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
2b6eea80eacd65cbb1aa3702a3a3b642304c04f5 )
Sage Weil [Tue, 8 Aug 2017 16:14:07 +0000 (12:14 -0400)]
os/bluestore: default to bluestore_allocator = stupid
Performance looks better, and code is simpler.
Also fix config option annotations.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
3750cf9cafabd3296c22b8b8dff35e44d18b9dd8 )
Kefu Chai [Thu, 24 Aug 2017 08:04:54 +0000 (16:04 +0800)]
osd/PG: discard msgs from down peers
if a repop is replied after a replica goes down in a new osdmap, and
before the pg advances to this new osdmap, the repop replies before this
repop can be discarded by that replica OSD, because the primary resets the
connection to it when handling the new osdmap marking it down, and also
resets the messenger sesssion when the replica reconnects. to avoid the
out-of-order replies, the messages from that replica should be discarded.
Fixes: http://tracker.ceph.com/issues/19605
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
e3fce6be44506168a7a138aab93f6a4d6776397b )
John Spray [Mon, 7 Aug 2017 11:52:42 +0000 (07:52 -0400)]
mon: rate limit on health check update logging
Fixes: http://tracker.ceph.com/issues/20888
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
5b903c7b428c2c7024fdfc1dffacad0b1521b750 )
John Spray [Fri, 1 Sep 2017 09:33:16 +0000 (05:33 -0400)]
mon: add helper for emitting logs by health status
We were starting to repeat our little "if(status==HEALTH_ERR"
blocks in too many places.
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
618a27868d65aa152ac67cce8057a75c4d61def9 )
Sage Weil [Thu, 24 Aug 2017 21:56:13 +0000 (17:56 -0400)]
osd: subscribe to new osdmap while waiting_for_healthy
If we are sitting around waiting until we are able to ping our "up" peers,
we need to be sure that our notion of "up" is still correct and we're not
just stuck on an old, stale OSDMap.
Fixes: http://tracker.ceph.com/issues/21121
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
fbafa659dae94faba435ca449ee5e77b51108b4b )
xie xingguo [Thu, 31 Aug 2017 04:42:36 +0000 (12:42 +0800)]
os/bluestore: formatting nits
So we don't output anything if csum is currently off:
_do_alloc_write blob Blob(0x7fad7cc25950 blob([0x42a80000~10000] none/0x1)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
22740cc9b3e489ae82b4b3071a17793c11abce79 )
xie xingguo [Thu, 31 Aug 2017 03:42:37 +0000 (11:42 +0800)]
os/bluestore: don't re-initialize csum-setting for existing blobs
The global checksum setting may change, e.g., from NONE to CRC32,
which can cause improper re-initialization of the csum-settings of
existing blobs(e.g., partial write/overwrite may turn out to shrink
'csum_data').
We could develop some complicated solutions but for now let's not
bother since the above scenario is rare.
Fixes: http://tracker.ceph.com/issues/21175
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
8ec4b4960f9b93ff6d85a02308ccda0bccadb599 )