Jenkins Build Slave User [Thu, 3 May 2018 17:57:34 +0000 (17:57 +0000)]
13.1.0
Josh Durgin [Thu, 3 May 2018 17:07:57 +0000 (10:07 -0700)]
Merge pull request #21546 from dzafman/wip-22881
osd: process _scan_snaps() with all snapshots with head
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Patrick Donnelly [Thu, 3 May 2018 16:45:04 +0000 (09:45 -0700)]
Merge PR #21374 into master
* refs/pull/21374/head:
qa: add test for snap format upgrade
mds: initialize SnapServer::snaprealm_v2_since after journal replay
mds: properly distinguish cap update from snap flush
mds: update dev document of cephfs snapshot
doc: add release notes for cephfs snapshot
mds: allow snapshot by default for new filesystem
mds: close past parents after snaprealm format gets converted
mds: automaticly allow multi-active MDS after scrubbing all inodes
mds: don't mark primary dentry damaged if inode has been repaired
mds: upgrade snaprealm format during scrub
mds: allow scrubbing mdsdir
mds: cleanup scrub code
mds: show health warning if multimds with old format snapshots
mds: automaticly allow multi-active MDS after removing all old snapshots
mds: disallow multi-active MDS if snapshot was ever created by pre-mimic mds
mds: validate SnapInfo::long_name before using it
mds: don't bump snaptable last_snap when renaming snapshot
mds: properly save snaptable after upgrading version
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Mon, 30 Apr 2018 21:43:28 +0000 (14:43 -0700)]
qa: add test for snap format upgrade
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Lenz Grimmer [Thu, 3 May 2018 14:18:51 +0000 (16:18 +0200)]
Merge pull request #21677 from Devp00l/wip-convert-floating-values
mgr/dashboard: Convert floating values to bytes
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 3 May 2018 14:01:37 +0000 (16:01 +0200)]
Merge pull request #21780 from votdev/use_bootstrap_css
mgr/dashboard: Use Bootstrap CSS
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Sage Weil [Thu, 3 May 2018 13:40:25 +0000 (08:40 -0500)]
Merge pull request #21684 from liewegas/wip-23769
mon: fix slow op warning on mon, improve slow op warnings
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Lenz Grimmer [Thu, 3 May 2018 10:50:05 +0000 (12:50 +0200)]
Merge pull request #21694 from sebastian-philipp/dashboard-review-pylint
mgr/dashboard: Clean up Pylint warnings
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 3 May 2018 10:04:15 +0000 (12:04 +0200)]
Merge pull request #21774 from sebastian-philipp/dashboard-mypy-fixes
mgr/dashboard: fix two type errors found by mypy
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 3 May 2018 10:02:30 +0000 (12:02 +0200)]
Merge pull request #21787 from tspmelo/fix-checkbox-fork-awesome
mgr/dashboard: Change font-family of checkbox
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Patrick Donnelly [Wed, 2 May 2018 22:56:54 +0000 (15:56 -0700)]
Merge PR #21789 into master
* refs/pull/21789/head:
qa: fix blacklisted check for test_lifecycle
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Wed, 2 May 2018 19:50:53 +0000 (12:50 -0700)]
qa: fix blacklisted check for test_lifecycle
Caused by:
36f89c5acf0385f13be2f39bc8d30621f4bf0115
Fixes: http://tracker.ceph.com/issues/23975
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Matt Benjamin [Wed, 2 May 2018 20:40:49 +0000 (16:40 -0400)]
Merge pull request #21791 from cbodley/wip-23974
rgw: raise log level on coroutine shutdown errors
Casey Bodley [Wed, 2 May 2018 20:11:29 +0000 (16:11 -0400)]
rgw: raise log level on coroutine shutdown errors
Fixes: http://tracker.ceph.com/issues/23974
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Wed, 2 May 2018 19:48:31 +0000 (14:48 -0500)]
mon/MDSMonitor: no_reply on MMDSLoadTargets
If we don't note that we don't reply then we don't close out the routed
mon request and the op will appear as slow on the forwarding mon.
Fixes: http://tracker.ceph.com/issues/23769
Signed-off-by: Sage Weil <sage@redhat.com>
Tiago Melo [Wed, 2 May 2018 17:38:06 +0000 (18:38 +0100)]
mgr/dashboard: Change font-family of checkbox
awesome-bootstrap-checkbox was still trying to use Font Awesome,
this will force it to use Fork Awesome.
Signed-off-by: Tiago Melo <tmelo@suse.com>
Mykola Golub [Wed, 2 May 2018 17:04:37 +0000 (20:04 +0300)]
Merge pull request #21763 from dillaman/wip-23955
librbd: prevent watcher from unregistering with in-flight actions
Reviewed-by: Mykola Golub <mgolub@suse.com>
Patrick Donnelly [Wed, 2 May 2018 16:07:31 +0000 (09:07 -0700)]
Merge PR #21065 into master
* refs/pull/21065/head:
qa/cephfs: test if evicted client unmounts without hanging
qa/tasks: allow custom timeout for umount_wait()
client: don't hang when MDS sessions are evicted
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Jason Dillaman [Wed, 2 May 2018 16:05:35 +0000 (12:05 -0400)]
Merge pull request #21768 from zy751713126/pybind-note
pybind: add return note in rbd.pyx
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Lenz Grimmer [Wed, 2 May 2018 15:40:06 +0000 (17:40 +0200)]
Merge pull request #21701 from Devp00l/wip-kv-table-render-object
mgr/dashboard: Enable object rendering in KV-table
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Ricardo Dias [Wed, 2 May 2018 15:28:22 +0000 (16:28 +0100)]
Merge pull request #21781 from LenzGr/mgr-dashboard-documentation
doc: Update dashboard feature list (added RGW management)
Reviewed-by: Volker Theile <vtheile@suse.com>
Patrick Donnelly [Wed, 2 May 2018 14:21:23 +0000 (07:21 -0700)]
Merge PR #21762 into master
* refs/pull/21762/head:
mds: mark new root inode dirty
Reviewed-by: Zheng Yan <zyan@redhat.com>
Patrick Donnelly [Wed, 2 May 2018 14:19:40 +0000 (07:19 -0700)]
Merge PR #21652 into master
* refs/pull/21652/head:
client: use common interp of st_nlink for dirs
Reviewed-by: Zheng Yan <zyan@redhat.com>
Patrick Donnelly [Wed, 2 May 2018 14:19:35 +0000 (07:19 -0700)]
Merge PR #21715 into master
* refs/pull/21715/head:
mds: don't report slow request for blocked filelock request
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Wed, 2 May 2018 14:10:01 +0000 (07:10 -0700)]
Merge PR #21010 into master
* refs/pull/21010/head:
common: refactor for array size
common: Use ARRAY_SIZE macro
common: compress return logic
common: Remove multiple assignment
common: Remove unnecessary semicolon
common: addr_parsing: Cleanup and Refactor Code
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Volker Theile [Wed, 2 May 2018 13:51:11 +0000 (15:51 +0200)]
mgr/dashboard: Use Bootstrap CSS
Replace custom CSS class by Bootstrap.
Signed-off-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Wed, 2 May 2018 13:49:51 +0000 (15:49 +0200)]
doc: Update dashboard feature list (RGW management)
Updated feature list in the dashboard documentation to also
mention the RGW user/bucket management capabilities.
Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
Lenz Grimmer [Wed, 2 May 2018 13:36:04 +0000 (15:36 +0200)]
Merge pull request #21351 from votdev/dashboard_rgw_management
mgr/dashboard: Add RGW user and bucket management features
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Stephan Müller [Fri, 27 Apr 2018 15:19:51 +0000 (17:19 +0200)]
mgr/dashboard: Enable object rendering in KV-table
Now it's possible to render objects as values in our key-value table.
Signed-off-by: Stephan Müller <smueller@suse.com>
Sebastian Wagner [Wed, 2 May 2018 09:31:04 +0000 (11:31 +0200)]
mgr/dashboard: fix two type errors found by mypy
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Stephan Müller [Thu, 26 Apr 2018 13:25:04 +0000 (15:25 +0200)]
mgr/dashboard: Refactored formatter service
Added tests which caused a refactorization of the service.
Signed-off-by: Stephan Müller <smueller@suse.com>
Stephan Müller [Thu, 26 Apr 2018 10:20:01 +0000 (12:20 +0200)]
mgr/dashboard: Convert floating values to bytes
Now the 'formatter' service can convert floating values to bytes.
Signed-off-by: Stephan Müller <smueller@suse.com>
zhengyin [Wed, 2 May 2018 07:16:21 +0000 (15:16 +0800)]
pybind: add return note in rbd.pyx
Signed-off-by: Zheng Yin <zhengyin@huayun.com>
Kefu Chai [Wed, 2 May 2018 06:41:55 +0000 (14:41 +0800)]
Merge pull request #21756 from liewegas/wip-23949
mon/OSDMonitor: set FLAG_SELFMANAGED_SNAPS on cephfs snap removal
Reviewed-by: Zheng Yan <zyan@redhat.com>
Kefu Chai [Wed, 2 May 2018 04:17:44 +0000 (12:17 +0800)]
Merge pull request #21757 from liewegas/wip-osdc-warning
osdc/Objecter: fix warning
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Patrick Donnelly [Tue, 1 May 2018 22:25:04 +0000 (15:25 -0700)]
mds: mark new root inode dirty
Fixes: http://tracker.ceph.com/issues/23960
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Kefu Chai [Wed, 2 May 2018 02:00:15 +0000 (10:00 +0800)]
Merge pull request #21696 from jan--f/prometheus-file_sd-consider-defaultport
pybing/mgr/prometheus: return default port if config-key get returns …
Reveiwed-by: John Spray <john.spray@redhat.com>
Kefu Chai [Wed, 2 May 2018 01:59:12 +0000 (09:59 +0800)]
Merge pull request #21749 from b-ranto/wip-expose-time-perfcount
prometheus: Handle the TIME perf counter type metrics
Reveiwed-by: John Spray <john.spray@redhat.com>
Kefu Chai [Wed, 2 May 2018 01:58:28 +0000 (09:58 +0800)]
Merge pull request #21627 from jcsp/wip-mgr-dashboard-ssl
mgr/dashboard: add TLS
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Jason Dillaman [Tue, 1 May 2018 19:16:29 +0000 (15:16 -0400)]
librbd: prevent watcher from unregistering with in-flight actions
Fixes: http://tracker.ceph.com/issues/23955
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Sage Weil [Tue, 1 May 2018 18:56:37 +0000 (13:56 -0500)]
osdc/Objecter: fix warning
Fallout from
891f5192427a4a783d5d7194fc2556dfdc1a0ed2
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 1 May 2018 18:52:57 +0000 (13:52 -0500)]
mon: log SLOW_OPS locally
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 30 Apr 2018 21:09:43 +0000 (16:09 -0500)]
mon/MgrStatMonitor: dump mgr health checks to debug log
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 30 Apr 2018 20:54:46 +0000 (15:54 -0500)]
mgr: print daemon_health_metrics to debug log
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 27 Apr 2018 21:53:11 +0000 (16:53 -0500)]
osd: print desc for oldest slow op to osd log
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 26 Apr 2018 18:20:40 +0000 (13:20 -0500)]
osd: log 'slow op' debug messages for individual slow ops
Otherwise it is very hard to identify which OSD ops are slow when we've
seen a SLOW_OPS health warning in a qa run.
Notably, without this, bugs like http://tracker.ceph.com/issues/23769
are very challenging to track down.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 1 May 2018 17:51:55 +0000 (12:51 -0500)]
mon/OSDMonitor: set FLAG_SELFMANAGED_SNAPS on cephfs snap removal
CephFS uses a different path to remove selfmanaged snaps than librados,
so while the librados path goes through pg_pool_t::remove_unmanaged_snap(),
we open code the snap addition to the pool's removed_snaps here. If we
don't set FLAG_SELFMANAGED_SNAPS at that time, we will implicitly set it
during decode and get a CRC mismatch.
Fix by explicitly setting FLAG_SELFMANAGED_SNAPS flag here.
Fixes: http://tracker.ceph.com/issues/23949
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 1 May 2018 15:24:07 +0000 (10:24 -0500)]
mon/OSDMonitor: dump osdmaps if crc doesn't match
Dump both the json and hexdump at debug level 20.
Hunting http://tracker.ceph.com/issues/23949
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 1 May 2018 17:26:06 +0000 (12:26 -0500)]
Merge pull request #21742 from liewegas/wip-23940
osdc/Objecter: fix recursive locking in _finish_command
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Tue, 1 May 2018 17:25:42 +0000 (12:25 -0500)]
Merge pull request #21745 from liewegas/wip-pg-removal-race
osd: fix _process handling for pg vs slot race
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yuri Weinstein [Tue, 1 May 2018 16:28:24 +0000 (09:28 -0700)]
Merge pull request #20678 from ceph/wip-s3a-fix
fix s3atests that are failing for sometime
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 1 May 2018 16:27:52 +0000 (09:27 -0700)]
Merge pull request #20894 from ZVampirEM77/wip-multisite-cleanup
rgw: some cleanup for sync status
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 1 May 2018 16:27:32 +0000 (09:27 -0700)]
Merge pull request #21647 from yehudasa/wip-23859
rgw: fix for issue #21647
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Tue, 1 May 2018 16:27:10 +0000 (09:27 -0700)]
Merge pull request #21648 from yehudasa/wip-cloud-sync-7
rgw: cloud sync fixes
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Tue, 1 May 2018 12:22:09 +0000 (20:22 +0800)]
Merge pull request #21678 from idiv-biodiversity/wip-doc-scrub_load_threshold
doc: fix error in osd scrub load threshold
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jason Dillaman [Tue, 1 May 2018 11:44:17 +0000 (07:44 -0400)]
Merge pull request #21727 from trociny/wip-23929
librbd: release lock executing deep copy progress callback
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yan, Zheng [Sat, 28 Apr 2018 09:00:09 +0000 (17:00 +0800)]
mds: don't report slow request for blocked filelock request
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/22428
Patrick Donnelly [Tue, 1 May 2018 00:25:58 +0000 (17:25 -0700)]
Merge PR #21719 into master
* refs/pull/21719/head:
mds: trim log during shutdown to clean metadata
Reviewed-by: Zheng Yan <zyan@redhat.com>
Patrick Donnelly [Tue, 1 May 2018 00:24:59 +0000 (17:24 -0700)]
Merge PR #21720 into master
* refs/pull/21720/head:
mds: kick rdlock if waiting for dirfragtreelock
Reviewed-by: Zheng Yan <zyan@redhat.com>
Boris Ranto [Mon, 30 Apr 2018 23:12:02 +0000 (01:12 +0200)]
prometheus: Handle the TIME perf counter type metrics
This patch correctly sets the PERFCOUNTER_MASK to 3 so that the
PERFCOUNTER_TIME metrics are not ignored by the mgr_module code. It also
converts the TIME metrics from nanoseconds to seconds just like the ceph
perf dump does and exposes the metrics via prometheus module.
Signed-off-by: Boris Ranto <branto@redhat.com>
Patrick Donnelly [Mon, 30 Apr 2018 15:57:50 +0000 (08:57 -0700)]
common: refactor for array size
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Mon, 30 Apr 2018 15:41:35 +0000 (10:41 -0500)]
osd: fix _process handling for pg vs slot race
We could see the slot with a different PG than we expected if the old
PG was removed and a new one was instantiated in its place. We can't
just pick up the new PG pointer, however, since it isn't locked.
Fix by retrying with the slot's new pg (possibly null!). Move this check
below the other cases so that we know we are otherwise consistent with
the slot, since the next pass around we might get pg==null and skip the
to_process.empty() and requeue_seq checks entirely.
Signed-off-by: Sage Weil <sage@redhat.com>
Mykola Golub [Sun, 29 Apr 2018 08:24:42 +0000 (11:24 +0300)]
librbd: release lock executing deep copy progress callback
Fixes: http://tracker.ceph.com/issues/23929
Signed-off-by: Mykola Golub <mgolub@suse.com>
Josh Durgin [Mon, 30 Apr 2018 18:32:31 +0000 (11:32 -0700)]
Merge pull request #21706 from liewegas/wip-23860
osd/PG: fix DeferRecovery vs AllReplicasRecovered race
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 01:42:03 +0000 (18:42 -0700)]
mds: kick rdlock if waiting for dirfragtreelock
Fixes: https://tracker.ceph.com/issues/23919
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 00:17:53 +0000 (17:17 -0700)]
mds: trim log during shutdown to clean metadata
Otherwise the trimming won't advance so that the remaining inodes are marked
clean.
Fixes: http://tracker.ceph.com/issues/23923
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Mon, 30 Apr 2018 16:18:11 +0000 (11:18 -0500)]
Merge pull request #21702 from theanalyst/wip-std-mutex
osdc/Objector: use std::shared_mutex instead of boost::shared_mutex
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Patrick Donnelly [Mon, 30 Apr 2018 16:16:48 +0000 (09:16 -0700)]
Merge PR #21731 into master
* refs/pull/21731/head:
client: drop function _get_inodeno
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
John Spray [Mon, 30 Apr 2018 11:30:03 +0000 (07:30 -0400)]
mgr/dashboard: silence E741
This is a pretty questionable check because it complains
about the caller of an API instead of the API itself, if
one of the API's members/arguments is one of the
forbidden variable names such as 'O'.
The interface to pyopenssl includes an 'O' member
on the certificate object.
Signed-off-by: John Spray <john.spray@redhat.com>
Sage Weil [Mon, 30 Apr 2018 15:33:36 +0000 (10:33 -0500)]
Merge pull request #21743 from yuriw/wip-yuriw-crontab
qa/tests: removed rest suite from the mix
Mykola Golub [Mon, 30 Apr 2018 15:25:35 +0000 (18:25 +0300)]
Merge pull request #21697 from dillaman/wip-18753-1
rbd-mirror: additional thrasher testing
Reviewed-by: Mykola Golub <mgolub@suse.com>
Yuri Weinstein [Mon, 30 Apr 2018 15:20:06 +0000 (08:20 -0700)]
qa/tests: removed rest suite from the mix
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Ken Dreyer [Mon, 30 Apr 2018 15:15:21 +0000 (09:15 -0600)]
Merge pull request #21716 from smithfarm/wip-drop-obs-kludge
build/ops: rpm: Revert "ceph.spec: work around build.opensuse.org"
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Sage Weil [Mon, 30 Apr 2018 14:55:10 +0000 (09:55 -0500)]
Merge pull request #21739 from tchaikov/wip-23922
qa/suites/rados/thrash-old-clients: ms_type=simple
Reviewed-by: Sage Weil <sage@redhat.com>
Andrew Schoen [Mon, 30 Apr 2018 14:52:50 +0000 (14:52 +0000)]
Merge pull request #21685 from alfredodeza/wip-rm23874
ceph-volume failed ceph-osd --mkfs command doesn't halt the OSD creation process
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Sage Weil [Mon, 30 Apr 2018 14:52:38 +0000 (09:52 -0500)]
osdc/Objecter: fix recursive locking in _finish_command
The path
#9 Objecter::_finish_command (this=this@entry=0x7f76c00aeb30, c=c@entry=0x7f76b0000b10, r=<optimized out>, rs="osd down") at /build/
ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:4950
#10 0x00007f76d26de106 in Objecter::_check_command_map_dne (this=this@entry=0x7f76c00aeb30, c=c@entry=0x7f76b0000b10) at /build/
ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1726
#11 0x00007f76d26e52e4 in Objecter::_scan_requests (this=this@entry=0x7f76c00aeb30, s=0x7f76c00af8a0, skipped_map=skipped_map@entry=false, cluster_full=cluster_full@entry=false, pool_full_map=0x7f76be7fb330, need_resend=..., need_resend_linger=..., need_resend_command=std::map with 0 elements, sul=...,
gap_removed_snaps=0x7f76ac0016f8) at /build/
ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1120
#12 0x00007f76d26eded5 in Objecter::handle_osd_map (this=this@entry=0x7f76c00aeb30, m=m@entry=0x7f76ac0014a0) at /build/
ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1228
led to recursive lock of the session mutex (locked in _scan_requests,
and again in _finish_command).
Fix by making the callers for _finish_command (and
_check_command_map_dne) take the session lock.
Fixes: http://tracker.ceph.com/issues/23940
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Mon, 30 Apr 2018 13:57:19 +0000 (21:57 +0800)]
Merge pull request #21708 from dalgaaf/wip-da-SCA-
20180425
Various fixes for SCA issues
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 30 Apr 2018 13:53:34 +0000 (21:53 +0800)]
Merge pull request #21690 from xiexingguo/wip-pr-20304
mon, osd: add create-time for pool
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Mon, 30 Apr 2018 13:48:37 +0000 (21:48 +0800)]
Merge pull request #21659 from yangDL/master
pybind/ceph_argparse.py:'timeout' must in kwargs when call run_in_thread
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 30 Apr 2018 13:01:02 +0000 (21:01 +0800)]
qa/suites/rados/thrash-old-clients: ms_type=simple
hammer does not support async messenger, so set ms_type to "simple" for
hammer client.
Fixes: http://tracker.ceph.com/issues/23922
Signed-off-by: Kefu Chai <kchai@redhat.com>
John Spray [Fri, 27 Apr 2018 10:56:21 +0000 (06:56 -0400)]
mgr/dashboard: fix linter complaints
In addition to line ordering, there were a couple of bogus ones:
E: 30, 0: No name 'version' in module 'distutils' (no-name-in-module)
E: 30, 0: Unable to import 'distutils.version' (import-error)
E: 36, 8: No name 'wsgiserver' in module 'cherrypy' (no-name-in-module)
E: 36, 8: Unable to import 'cherrypy.wsgiserver.wsgiserver2' (import-error)
I don't know why pylint can't see these modules, but they're definitely
there, so I've added them to the ignored list in .pylintrc
Signed-off-by: John Spray <john.spray@redhat.com>
Jason Dillaman [Mon, 30 Apr 2018 12:55:12 +0000 (08:55 -0400)]
Merge pull request #21733 from trociny/wip-23938
qa/workunits/rbd: potential race in mirror disconnect test
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Rishabh Dave [Fri, 13 Apr 2018 06:14:46 +0000 (06:14 +0000)]
qa/cephfs: test if evicted client unmounts without hanging
Signed-off-by: Rishabh Dave <ridave@redhat.com>
Rishabh Dave [Fri, 13 Apr 2018 06:11:30 +0000 (06:11 +0000)]
qa/tasks: allow custom timeout for umount_wait()
Signed-off-by: Rishabh Dave <ridave@redhat.com>
Rishabh Dave [Tue, 24 Apr 2018 08:55:44 +0000 (08:55 +0000)]
client: don't hang when MDS sessions are evicted
Currently, a filesystem client hangs if a request is made after it's
eviction. Prevent the client from hanging and allow a manual unmount
in such cases.
Fixes: http://tracker.ceph.com/issues/10915
Signed-off-by: Rishabh Dave <ridave@redhat.com>
John Spray [Mon, 30 Apr 2018 11:42:18 +0000 (12:42 +0100)]
Merge pull request #21671 from jan--f/mgr-module-config-doc
doc/mgr/plugins: add note about distinction between config and kv store
Reviewed-by: John Spray <john.spray@redhat.com>
Mykola Golub [Sun, 29 Apr 2018 17:07:38 +0000 (20:07 +0300)]
qa/workunits/rbd: potential race in mirror disconnect test
(due to a typo in get_image_id command arg)
Fixes: http://tracker.ceph.com/issues/23938
Signed-off-by: Mykola Golub <mgolub@suse.com>
Jos Collin [Mon, 30 Apr 2018 04:33:55 +0000 (10:03 +0530)]
client: drop function _get_inodeno
Drop _get_inodeno() as per the comment in https://github.com/ceph/ceph/pull/21554.
Signed-off-by: Jos Collin <jcollin@redhat.com>
Patrick Donnelly [Wed, 25 Apr 2018 20:07:34 +0000 (13:07 -0700)]
client: use common interp of st_nlink for dirs
Apparently some applications use this (like mail servers) and since it's
trivial to support, let's do it. Idea is that st_nlinks for a directory is
either 0 (it is unlinked) or 2 + the number of sub-directories (which have ..
parent links).
Fixes: https://tracker.ceph.com/issues/23873
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Fri, 27 Apr 2018 20:00:58 +0000 (15:00 -0500)]
osd/PG: fix DeferRecovery vs AllReplicasRecovered race
- DeferRecovery event queued by AsyncReserver due to preemption
event. We are in Recovering state with RECOVERING bit set.
- We finish recovery, clear RECOVERING state bit, and queue
AllReplicasRecovered from PrimaryLogPG::start_recovery_ops()
- DeferRecovery event arrives, moving us from Recovering -> NotRecovering
- AllReplciasRecovered event arrives, crashing us.
This is all hard to deal with because the events are queued and may
arrive later. Solve the problem here by tolerating a delayed
DeferRecovery event: if the RECOVERING pg state bit isn't set, ignore
it (it's old). The async reserver cancel events are unpredictable.
Fixes: http://tracker.ceph.com/issues/23860
Signed-off-by: Sage Weil <sage@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 18:05:33 +0000 (11:05 -0700)]
Merge PR #21554 into master
* refs/pull/21554/head:
client: avoid second lock on client_lock
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 18:05:27 +0000 (11:05 -0700)]
Merge PR #21592 into master
* refs/pull/21592/head:
mds: filter out blacklisted clients when importing caps
mds: don't add blacklisted clients to reconnect gather set
mds: combine MDCache::{cap_exports,cap_export_targets}
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 18:05:22 +0000 (11:05 -0700)]
Merge PR #21593 into master
* refs/pull/21593/head:
mds: properly check auth subtree count in MDCache::shutdown_pass()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 18:05:16 +0000 (11:05 -0700)]
Merge PR #21601 into master
* refs/pull/21601/head:
mds: don't discover inode/dirfrag when mds is in 'starting' state
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 18:05:11 +0000 (11:05 -0700)]
Merge PR #21610 into master
* refs/pull/21610/head:
cephfs-journal-tool: wait prezero ops before destroying journal
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 18:05:06 +0000 (11:05 -0700)]
Merge PR #21625 into master
* refs/pull/21625/head:
qa: remove racy/buggy test_purge_queue_op_rate
Reviewed-by: Zheng Yan <zyan@redhat.com>
Patrick Donnelly [Sun, 29 Apr 2018 18:04:55 +0000 (11:04 -0700)]
Merge PR #21664 into master
* refs/pull/21664/head:
mds: properly trim log segments after scrub repairs something
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Sun, 29 Apr 2018 15:10:31 +0000 (10:10 -0500)]
Merge pull request #21728 from yuriw/wip-yuriw-crontab
qa/tests: fixed typo
Yuri Weinstein [Sun, 29 Apr 2018 14:57:27 +0000 (07:57 -0700)]
qa/tests: fixed typo
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
David Zafman [Sat, 28 Apr 2018 22:44:06 +0000 (15:44 -0700)]
osd: If ending on a head object get all of meta map
When ending on a head object, the head and snapshots would stay in
cleaned_meta_map until more maps arrive. The problem as that
during a scrub an eviction could occur because scrubber.start
is already past the stray object(s) so range_intersects_scrub() is false.
Fixes: http://tracker.ceph.com/issues/23909
Signed-off-by: David Zafman <dzafman@redhat.com>