]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Mon, 24 Sep 2018 18:53:46 +0000 (13:53 -0500)]
mgr/DaemonServer: remove any upmaps on merging PGs
Remove any pg_upmap[_items] on pgs that are merging to ensure that they
land on the same OSDs.
This is a bit sloppy: we *could* set the source upmap to match the target
upmap (vs potentially moving both PGs to a third location, and/or then
having the balancer move the resulting PG somewhere else again), but for
now assume upmaps are not a common case and Keep It Simple.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 24 Sep 2018 18:03:05 +0000 (13:03 -0500)]
mgr/DaemonServer: prevent merge if either pg is remapped|upmap
Remapping means they could be on different OSDs.
Fixes: http://tracker.ceph.com/issues/36166
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Sep 2018 13:43:37 +0000 (08:43 -0500)]
mgr/DaemonServer: move pending merge check for more consistent code
No functional change, but this makes the code simpler to read.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 22:09:24 +0000 (17:09 -0500)]
qa/suites/rados/thrash*/thrashers/careful.yaml: thrash with mgr controller
Thrash such that we still exercise the careful throttling in the mgr.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 22:04:38 +0000 (17:04 -0500)]
mgr/DaemonServer: add option to bypass careful throttling for thrasher
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 21:45:24 +0000 (16:45 -0500)]
PendingReleaseNotes: note about mgr/balancer/max_misplaced change
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 21:40:22 +0000 (16:40 -0500)]
mgr/DaemonServer: remove stale/misleading check
The PGMap::last_osdmap_epoch is always 0.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 21:37:59 +0000 (16:37 -0500)]
mgr/DaemonServer: throttle pgp_num changes based on misplaced %
- block pgp_num increase if pg_num hasn't increased yet
- make no changes if there are inactive or unknown pgs
- make no changes if there are degraded pgs either. this might be a bit
conservative...
- calculate the magnitude of our adjusted based on the max_misplaced
target. this assumes a uniform distribution of objects across pgs,
so not perfectly accurate, but hopefully close enough.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 21:34:21 +0000 (16:34 -0500)]
mgr/DaemonServer: block pg_num decrease(merge) until pgp_num is reduced
We can't merge until the PGs are stored together. (The mon would stop
us if we tried, but let's not waste time trying.)
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 21:33:41 +0000 (16:33 -0500)]
mgr/DaemonServer: adjust_pgs(): cosmetic change to debug output
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 21:12:15 +0000 (16:12 -0500)]
mon/PGMap: add get_recovery_stats()
This is some of the same info we get in the json dump from
print_summary -> overall_recovery_summary -> recovery_summary.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 19:35:03 +0000 (14:35 -0500)]
mgr/balancer: mgr/balancer/max_misplaced -> pg_max_misplaced
Make this a compiled-in option that is consumed by other components as
well as the balancer.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 19:33:16 +0000 (14:33 -0500)]
pybind/mgr/mgr_module: add get_option()
get_config() gets a mgr-style config option. Add get_option which
fetches a compiled-in config option.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 19:08:49 +0000 (14:08 -0500)]
mgr/DaemonServer: allow pg_num increases that abort pending merges
If we are waiting for a PG to merge we can't decrease more, but if we
were in the process of merging and an increase is requested, we can
abort the merge by increase pg_num_actual whenever we want.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 19:01:51 +0000 (14:01 -0500)]
mon/OSDMonitor: resent pre-nautilus client ops on aborted merge
If we are in premerge (pg_num_pending == pg_num - 1) and abort by
increasing pg_num, we the last_force_op_resend_prenautilus since it will
be an interval change for nautlius+.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 18:56:10 +0000 (13:56 -0500)]
mon/OSDMonitor: make pgp_num track pg_num more consistently
Previously we were automatically adjusting pgp_num_target on a
pg_num_target change *only* when decreasing pg_num. Instead, make
pgp_num (continue to) track pg_num if it currently matches. If it ever
is set differently than pg_num, leave it different (unless/until it
matches again).
This is still slightly weird, but I think in practice it is good enough.
In the rare case that the admin manually sets pgp_num to something
different than pg_num, they probably won't also be using automagic
pg_num adjustment that might make them match and start tracking again.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 16 Oct 2018 12:20:17 +0000 (07:20 -0500)]
Merge PR #24095 into master
* refs/pull/24095/head:
osd: do not authenticate heartbeat connections until nautilus
msg,osd: enable unauthenticated Dispatcher for pre-nautilus OSD compat
osd: add missing space in heartbeat debug output
mgr/DaemonServer: add missing return
msg/async: drop verify_authorizer wrapper
osd: authenticate ping sessions
msg/simple: remove verify_authorizer wrapper
msg: remove unused ms_verify_authorizer
msg/async: remove get_authorizer wrapper
msg/simple: remove get_authorizer wrapper
msg/Messenger: pull authenticator validation into Messenger
msg/Messenger: uninline ms_deliver_verify_authorizer
mgr/DaemonServer: expose keyring for authenticator verification
mon: expose keyring for msgr1 authentication
mds: expose keyring for authenticater verification
osd: expose keyring for authenticater verification
msg/Dispatcher: add ms_get_auth1_authorizer_keystore
mon: fix ref cycle breakage in handle_forward
mon: use MonOpRequest get_session() instead of PaxosServiceMessage's
mon: get session from MonOpRequest in handle_command
messages/MForward: drop unused ctor
mon: use ms_handle_authentication to parse caps
mon: kill Session::global_id and use Connection member instead
mgr/DaemonServer: move session setup into ms_handle_authentication
mds: move session setup into ms_handle_authentication
osd: move session setup into ms_handle_authentication
msg: new ms_handle_authentication, add fields to Connection
Reviewed-by: Ricardo Dias <rdias@suse.com>
Sage Weil [Tue, 16 Oct 2018 12:17:59 +0000 (07:17 -0500)]
Merge PR #24579 into master
* refs/pull/24579/head:
qa/osd: fixup osd-rep-recov-eio.sh fails to parse pg dump
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
John Spray [Tue, 16 Oct 2018 12:09:08 +0000 (13:09 +0100)]
Merge pull request #24597 from batrick/i36450
qa: fix run call args
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Kefu Chai [Tue, 16 Oct 2018 11:15:35 +0000 (19:15 +0800)]
Merge pull request #23983 from theanalyst/vstart-rgw-asok
vstart: set admin socket for RGW in conf
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Tue, 16 Oct 2018 08:44:16 +0000 (16:44 +0800)]
Merge pull request #24576 from cyx1231st/wip-seastar-msgr-refactor
crimson/net: seastar-msgr refactoring
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 16 Oct 2018 05:49:19 +0000 (13:49 +0800)]
Merge pull request #24255 from gregsfortytwo/wip-crush-doc
doc: explain 'firstn v indep' in the CRUSH docs
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Patrick Donnelly [Tue, 16 Oct 2018 04:34:31 +0000 (21:34 -0700)]
Merge PR #24286 into master
* refs/pull/24286/head:
client: fix fuse client can't read or write data due its caps is invalid
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 16 Oct 2018 04:31:04 +0000 (21:31 -0700)]
Merge PR #24292 into master
* refs/pull/24292/head:
qa: add test for rctime on root inode
mds: set rctime on new system inode
mds: small refactor
Reviewed-by: Zheng Yan <zyan@redhat.com>
Patrick Donnelly [Tue, 16 Oct 2018 04:23:19 +0000 (21:23 -0700)]
Merge PR #24486 into master
* refs/pull/24486/head:
client: explicitly show blacklisted state via asok status command
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 16 Oct 2018 04:12:56 +0000 (21:12 -0700)]
Merge PR #24508 into master
* refs/pull/24508/head:
cephfs-shell: fixup 'str' object has no attribute 'decode'
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Mon, 15 Oct 2018 23:41:53 +0000 (18:41 -0500)]
Merge PR #24596 into master
* refs/pull/24596/head:
ptl-tool.py: move githubmap update into merge commit
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Patrick Donnelly [Mon, 15 Oct 2018 21:44:45 +0000 (14:44 -0700)]
qa: fix run call args
Fixes: http://tracker.ceph.com/issues/36450
Introduced-by: 95746ecce9215c8428a02f1745d03e10536a4129
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Mon, 15 Oct 2018 21:34:21 +0000 (14:34 -0700)]
Merge PR #24562 into master
* refs/pull/24562/head:
removed warning for resolved errata
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Gregory Farnum [Mon, 15 Oct 2018 21:17:36 +0000 (14:17 -0700)]
Merge pull request #24186 from libingyang-zte/master
doc: fix typos in doc/releases
Gregory Farnum [Mon, 15 Oct 2018 21:15:43 +0000 (14:15 -0700)]
Merge pull request #24238 from LenzGr/doc-leads-update
doc/dev: Updated component leads table
Yingxin [Mon, 15 Oct 2018 09:46:55 +0000 (17:46 +0800)]
crimson/net: clean seastar-msgr class dependencies
Remove protocol-specific interfaces from Messenger/Connection classes,
and let SocketMessenger manage SocketConnection instead of Connection.
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
Sage Weil [Mon, 15 Oct 2018 12:35:24 +0000 (07:35 -0500)]
osd: do not authenticate heartbeat connections until nautilus
Some (currently) pre-nautilus OSDs will crash if you try to authenticate
a heartbeat connection but they are not expecting it:
src/auth/Crypto.h: 109: FAILED assert(ckh)
ceph version
12.2.8-457-gccd69ef (
ccd69ef36aafebab964a2e47e249fdb95e083e46 ) luminous (stable)
1: (ceph::__ceph_assert_fail(char const*, char const*, int, char const*)+0x110) [0x5618b04aaea0]
2: (()+0x41cbec) [0x5618afe2cbec]
3: (CephxSessionHandler::_calc_signature(Message*, unsigned long*)+0x8c5) [0x5618b0777ba5]
4: (CephxSessionHandler::check_message_signature(Message*)+0x7d) [0x5618b077800d]
5: (AsyncConnection::process()+0x1b44) [0x5618b0761a04]
6: (EventCenter::process_events(int, std::chrono::duration<unsigned long, std::ratio<1l, 1000000000l> >*)+0x359) [0x5618b0546079]
7: (()+0xb38c3e) [0x5618b0548c3e]
8: (()+0xb5070) [0x7ff04faf5070]
9: (()+0x7dd5) [0x7ff050168dd5]
10: (clone()+0x6d) [0x7ff04f259b3d]
See http://tracker.ceph.com/issues/36443
It won't be fixed in all clusters before upgrade to nautilus, though, so
we also need to work around it here.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 16:44:32 +0000 (11:44 -0500)]
msg,osd: enable unauthenticated Dispatcher for pre-nautilus OSD compat
Before nautilus, osd heartbeats are sent over an unauthenticated channel.
We need support here to allow these connections when they are necessary
for upgrade compatibility.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 11 Oct 2018 19:28:58 +0000 (14:28 -0500)]
osd: add missing space in heartbeat debug output
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 21 Sep 2018 14:10:22 +0000 (09:10 -0500)]
mgr/DaemonServer: add missing return
Fixes: http://tracker.ceph.com/issues/36110
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 20 Sep 2018 21:19:15 +0000 (16:19 -0500)]
msg/async: drop verify_authorizer wrapper
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 16:35:42 +0000 (11:35 -0500)]
osd: authenticate ping sessions
Do not set up a Session object, though--nobody cares (currently!).
This avoids having to special-case the generic authorizer validation
code in msg/* to have to handle non-authenticated sessions. Also, it
seems like a good idea to authenticate these sessions!
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 19 Sep 2018 15:52:45 +0000 (10:52 -0500)]
msg/simple: remove verify_authorizer wrapper
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:38:21 +0000 (14:38 -0500)]
msg: remove unused ms_verify_authorizer
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:32:42 +0000 (14:32 -0500)]
msg/async: remove get_authorizer wrapper
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:29:59 +0000 (14:29 -0500)]
msg/simple: remove get_authorizer wrapper
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:21:04 +0000 (14:21 -0500)]
msg/Messenger: pull authenticator validation into Messenger
This code is essentially identical across the OSD and MDS. The
monitor is annoyingly different, but in a msgr1 specific way that
we can handle carrying here until msgr1 gets ripped out in a
couple years.
Signed-off-by: Sage Weil <sage@redhat.com>
huanwen ren [Mon, 15 Oct 2018 17:47:07 +0000 (01:47 +0800)]
qa/osd: fixup osd-rep-recov-eio.sh fails to parse pg dump
Fixes: http://tracker.ceph.com/issues/36418
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
Lenz Grimmer [Mon, 15 Oct 2018 16:01:41 +0000 (18:01 +0200)]
Merge pull request #24577 from p-na/fix-saves-invalid-config
dashboard/mgr: Save button doesn't prevent saving an invalid form
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Scoots Hamilton [Mon, 15 Oct 2018 15:18:43 +0000 (11:18 -0400)]
removed warning for resolved errata
Signed-off-by: Scoots Hamilton <scoots@redhat.com>
Sage Weil [Mon, 15 Oct 2018 13:42:50 +0000 (08:42 -0500)]
Merge PR #24473 into master
* refs/pull/24473/head:
common: drop get_contiguous() from ceph::bufferlist.
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 15 Oct 2018 13:36:18 +0000 (08:36 -0500)]
Merge PR #24493 into master
* refs/pull/24493/head:
mgr/DaemonState: clean up device life_expectancy values
mgr/devicehealth: warn based on life_expectancy_max
mgr/devicehealth: warn on failing devices at 6 weeks
Reviewed-by: John Spray <john.spray@redhat.com>
Lenz Grimmer [Mon, 15 Oct 2018 13:14:52 +0000 (15:14 +0200)]
Merge pull request #24523 from s0nea/wip-dashboard-configs-table-cleanup
mgr/dashboard: config options table cleanup
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Tatjana Dehler [Wed, 10 Oct 2018 14:12:32 +0000 (16:12 +0200)]
mgr/dashboard: config options table cleanup
Remove columns 'tags', 'enum_values', 'long_desc', 'type', 'flags',
'daemon_default', 'desc', 'level', 'can_update_at_runtime', 'services',
'max', 'see_also', 'min' and 'source' from table view and add them to
the details.
The table contains 'name', 'value' and 'default' only.
Fixes: http://tracker.ceph.com/issues/34533
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
John Spray [Mon, 15 Oct 2018 08:23:39 +0000 (09:23 +0100)]
Merge pull request #24560 from sebastian-philipp/orchestrator-fix-rook-cluster-in-name
mgr/rook: Fix Rook cluster name detection
Reviewed-by: John Spray <john.spray@redhat.com>
Patrick Nawracay [Sat, 13 Oct 2018 20:58:36 +0000 (22:58 +0200)]
mgr/dashboard: Save button doesn't prevent saving an invalid form
Fixes: http://tracker.ceph.com/issues/36426
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
Sage Weil [Sun, 14 Oct 2018 18:11:11 +0000 (13:11 -0500)]
Merge PR #24494 into master
* refs/pull/24494/head:
ceph-kvstore-tool: rename repair -> destructive-repair
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:14:43 +0000 (14:14 -0500)]
msg/Messenger: uninline ms_deliver_verify_authorizer
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:27:49 +0000 (14:27 -0500)]
mgr/DaemonServer: expose keyring for authenticator verification
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:05:08 +0000 (14:05 -0500)]
mon: expose keyring for msgr1 authentication
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:03:21 +0000 (14:03 -0500)]
mds: expose keyring for authenticater verification
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:02:57 +0000 (14:02 -0500)]
osd: expose keyring for authenticater verification
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:02:34 +0000 (14:02 -0500)]
msg/Dispatcher: add ms_get_auth1_authorizer_keystore
This is there to provide the keyring used for authenticating msgr1
authorizers.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 19:00:44 +0000 (14:00 -0500)]
mon: fix ref cycle breakage in handle_forward
We now rely on the session -> connection ref for printing
remote addr, peer_global_id, and so on. Change this code to
break the ref cycle instead by removing the con->session link,
which is only needed by the MonOpRequest ctor called at the top
of _ms_dispatch.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 9 Oct 2018 22:08:46 +0000 (17:08 -0500)]
mon: use MonOpRequest get_session() instead of PaxosServiceMessage's
The PaxosServiceMessage method relies on the msg -> con -> session linkage,
and the con -> session link is not present for forwarded messages. Also,
the message path is redundant and unnecessary.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 18:59:25 +0000 (13:59 -0500)]
mon: get session from MonOpRequest in handle_command
We should have made this switchover a long time ago.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 9 Oct 2018 22:08:56 +0000 (17:08 -0500)]
messages/MForward: drop unused ctor
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 11 Sep 2018 21:53:15 +0000 (16:53 -0500)]
mon: use ms_handle_authentication to parse caps
The situation is a bit different here than the MDS and OSD because the
authentication happens from MAuth instead of ms_verify_authorizer, but
we are moving toward being more consistent.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 11 Sep 2018 21:30:27 +0000 (16:30 -0500)]
mon: kill Session::global_id and use Connection member instead
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 13 Sep 2018 21:54:08 +0000 (16:54 -0500)]
mgr/DaemonServer: move session setup into ms_handle_authentication
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 11 Sep 2018 19:38:05 +0000 (14:38 -0500)]
mds: move session setup into ms_handle_authentication
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 11 Sep 2018 19:07:16 +0000 (14:07 -0500)]
osd: move session setup into ms_handle_authentication
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 15 Jun 2016 15:40:34 +0000 (11:40 -0400)]
msg: new ms_handle_authentication, add fields to Connection
Lay some groundwork to eliminate ms_verify_authorizer.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 14 Oct 2018 16:42:17 +0000 (11:42 -0500)]
Merge PR #24146 into master
* refs/pull/24146/head:
mgr/orchestrator: Fix Python 3 issues
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Tue, 9 Oct 2018 14:13:41 +0000 (09:13 -0500)]
ceph-kvstore-tool: rename repair -> destructive-repair
This is shown to corrupt otherwise healthy rocksdb databases. Rename to
make it clear that it is generally not safe to run and shoud only be used
as a last resort.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 14 Oct 2018 16:40:15 +0000 (11:40 -0500)]
Merge PR #24247 into master
* refs/pull/24247/head:
PendingReleaseNotes: add note about increased mon memory footprint
doc/start/hardware-recommendations: refresh recommendations for RAM
rocksdb: increase default cache size to 512 MB
mon: mon_osd_cache_size = 500 (from 10)
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Sun, 14 Oct 2018 13:06:18 +0000 (08:06 -0500)]
Merge PR #24495 into master
* refs/pull/24495/head:
kv: apply the move semantics in KeyValueDB::get().
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Sun, 14 Oct 2018 13:05:10 +0000 (08:05 -0500)]
Merge PR #24535 into master
* refs/pull/24535/head:
mon: consider AUTH_NONE clients which "authenticate" to be finished
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Mykola Golub [Sun, 14 Oct 2018 07:40:05 +0000 (10:40 +0300)]
Merge pull request #24563 from dillaman/wip-36410
test: move OpenStack devstack test to rocky release
Reviewed-by: Mykola Golub <mgolub@suse.com>
Neha Ojha [Sat, 13 Oct 2018 02:15:39 +0000 (19:15 -0700)]
Merge pull request #24564 from neha-ojha/wip-21931
osd: do not overestimate the size of the object for reads with trimtrunc
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed By: Xie Xingguo <xie.xingguo@zte.com.cn>
Sage Weil [Fri, 12 Oct 2018 21:29:44 +0000 (16:29 -0500)]
Merge PR #24204 into master
* refs/pull/24204/head:
qa/suites/rgw/tempest: valgrind on centos only
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Sage Weil [Fri, 12 Oct 2018 21:29:28 +0000 (16:29 -0500)]
Merge PR #24249 into master
* refs/pull/24249/head:
doc/rados/troubleshooting-mon: update mondb recovery script
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Fri, 12 Oct 2018 21:16:39 +0000 (16:16 -0500)]
Merge PR #24296 into master
* refs/pull/24296/head:
osd: Handle is_stopping() by discarding item so it doesn't loop
osd: Simplify _process() logic recently added
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 12 Oct 2018 21:14:55 +0000 (16:14 -0500)]
Merge PR #24131 into master
* refs/pull/24131/head:
tests, common: introduce bufferlist::apennd benchmark.
test, common: add BufferListIterator.BenchDeref benchmark.
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Fri, 12 Oct 2018 21:14:37 +0000 (16:14 -0500)]
Merge PR #24270 into master
* refs/pull/24270/head:
osd: make 'cache drop' command require 'executable' permission
osd: rename 'drop cache' and 'get cache stats' to group them by component
doc: add documentation for 'drop cache' and 'get cache stats'
osd: don't print osdmap cache stats in 'get cache stats' command
osd: do not clear osdmap cache on 'drop cache' command
osd: offload dumping cache stats to the object store
osd: pass a stream to flush_cache commands for more verbosity
osd: implement flush_cache() method for Filestore
osd: add clear_cache and get_cache_object_count commands
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Fri, 12 Oct 2018 21:14:19 +0000 (16:14 -0500)]
Merge PR #24312 into master
* refs/pull/24312/head:
osd: kill the std::stringstream in ReplicatedBackend::do_repop_reply.
osd: bump-up the dout level in PGLog::write_log_and_missing.
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 12 Oct 2018 21:13:57 +0000 (16:13 -0500)]
Merge PR #24520 into master
* refs/pull/24520/head:
install-deps.sh: dashboard frontend needs git
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Sage Weil [Fri, 12 Oct 2018 21:13:37 +0000 (16:13 -0500)]
Merge PR #24521 into master
* refs/pull/24521/head:
ceph.in: reinstate interactive mode output
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Neha Ojha [Tue, 9 Oct 2018 22:57:15 +0000 (15:57 -0700)]
osd/PrimaryLogPG.cc: reassign size only when object size > truncate_size
Before setting size equal to op.extent.truncate_size, we need to check
if the size of the object is greater than the truncate_size. We do not
need to set size to op.extent.truncate_size, in the case where the size of
the object is less than op.extent.truncate_size.
Without this change, we were always setting size =
op.extent.truncate_size, when (seq < op.extent.truncate_seq) and
(op.extent.offset + op.extent.length > op.extent.truncate_size), were both
true. This ended up in:
1. overestimating the size of the object
2. not considering the correct size of the object, for
the later checks, which calculate op.extent.length for the read ops
3. causing crashes when trying to read more data than what was present
Fixes: http://tracker.ceph.com/issues/21931
Fixes: http://tracker.ceph.com/issues/22330
Signed-off-by: Neha Ojha <nojha@redhat.com>
Neha Ojha [Wed, 26 Sep 2018 23:31:44 +0000 (16:31 -0700)]
osd: print offset and length to track trimtrunc
Signed-off-by: Neha Ojha <nojha@redhat.com>
Matt Benjamin [Fri, 12 Oct 2018 17:02:33 +0000 (13:02 -0400)]
Merge pull request #24341 from joke-lee/WIP_FIX_RGWPOSTOBJ_VERSIONING
rgw: list bucket can not show the object uploaded by RGWPostObj when enable bucket versioning
Jason Dillaman [Fri, 12 Oct 2018 14:02:35 +0000 (10:02 -0400)]
qa/tasks/workunit: use suite branch/SHA1 when cloning workunits
Right now it's using the Ceph branch/SHA1 but it's using the suite
Git URL.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Fri, 12 Oct 2018 15:56:51 +0000 (16:56 +0100)]
Merge branch 'master' into orchestrator-fix-rook-cluster-in-name
Sage Weil [Fri, 12 Oct 2018 13:40:30 +0000 (08:40 -0500)]
mgr/DaemonState: clean up device life_expectancy values
Instead of "0.000000" for empty time values, use "".
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 12 Oct 2018 13:38:05 +0000 (08:38 -0500)]
mgr/devicehealth: warn based on life_expectancy_max
The failure interval needs to be sufficiently precise that it establishes
an approximate upper bound on the device life expectancy.
Also, deal with the fact that the max value may be '0.000000' intead of ''.
Signed-off-by: Sage Weil <sage@redhat.com>
Sebastian Wagner [Fri, 12 Oct 2018 12:44:12 +0000 (14:44 +0200)]
mgr/rook: Fix cluster name detection
`ROOK_CLUSTER_NAME` vanished from environment. Change to
'POD_NAMESPACE'.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Jason Dillaman [Thu, 11 Oct 2018 20:00:49 +0000 (16:00 -0400)]
qa/workunits/rbd: switch devstack to rocky branch and tempest to 19.0.0 tag
Fixes: http://tracker.ceph.com/issues/36410
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 12 Oct 2018 12:39:37 +0000 (08:39 -0400)]
Merge pull request #24550 from dillaman/wip-36409
qa/workunits: replace 'realpath' with 'readlink -f' in fsstress.sh
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
John Spray [Fri, 12 Oct 2018 12:05:40 +0000 (13:05 +0100)]
Merge pull request #24517 from jcsp/wip-23970-test
mgr/selftest: fix disabled module selection
Reviewed-by: John Spray <john.spray@redhat.com>
Jan Fajerski [Fri, 12 Oct 2018 10:44:39 +0000 (12:44 +0200)]
Merge pull request #24426 from Miouge1/grafana-fix1
monitoring/grafana: Fix OSD Capacity Utlization Grafana graph
Ricardo Marques [Fri, 12 Oct 2018 09:19:48 +0000 (10:19 +0100)]
Merge pull request #24511 from a2batic/grafana-doc
mgr/dashboard: Improves documentation for Grafana Setting
Reviewed-by: Kai Wagner <kwagner@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Ricardo Marques [Fri, 12 Oct 2018 09:04:02 +0000 (10:04 +0100)]
Merge pull request #24513 from rhcs-dashboard/27047-landing-page-info-visibility
mgr/dashboard: Landing Page: info visibility
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Ricardo Marques [Fri, 12 Oct 2018 09:01:39 +0000 (10:01 +0100)]
Merge pull request #24222 from votdev/bug_36109
mgr/dashboard: The RGW backend doesn't handle IPv6 properly
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Jason Dillaman [Thu, 11 Oct 2018 20:21:35 +0000 (16:21 -0400)]
qa/tasks: qemu task now uses a relative path in suite repo for test
This makes it easier to re-run tests against a suite branch without
requiring a full ceph-ci build and repo.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>