Commit Graph

86192 Commits

Author SHA1 Message Date
Patrick Donnelly
36f89c5acf
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>
2018-05-02 09:07:31 -07:00
Jason Dillaman
9936fcb7ff
Merge pull request #21768 from zy751713126/pybind-note
pybind: add return note in rbd.pyx

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-05-02 12:05:35 -04:00
Lenz Grimmer
c608185e1e
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>
2018-05-02 17:40:06 +02:00
Ricardo Dias
08ea6a2a1a
Merge pull request #21781 from LenzGr/mgr-dashboard-documentation
doc: Update dashboard feature list (added RGW management)

Reviewed-by: Volker Theile <vtheile@suse.com>
2018-05-02 16:28:22 +01:00
Patrick Donnelly
7810dde42c
Merge PR #21762 into master
* refs/pull/21762/head:
	mds: mark new root inode dirty

Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-05-02 07:21:23 -07:00
Patrick Donnelly
40a8d1ca18
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>
2018-05-02 07:19:40 -07:00
Patrick Donnelly
3e30775d19
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>
2018-05-02 07:19:35 -07:00
Patrick Donnelly
046dc7bb0d
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>
2018-05-02 07:10:01 -07:00
Lenz Grimmer
acc94ded43 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>
2018-05-02 15:49:51 +02:00
Lenz Grimmer
bcfd227f47
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>
2018-05-02 15:36:04 +02:00
Stephan Müller
98fc5f9b50 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>
2018-05-02 12:04:10 +02:00
zhengyin
33e03ad66d pybind: add return note in rbd.pyx
Signed-off-by: Zheng Yin <zhengyin@huayun.com>
2018-05-02 15:16:21 +08:00
Kefu Chai
65a74d40fd
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>
2018-05-02 14:41:55 +08:00
Kefu Chai
9a661747b2
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>
2018-05-02 12:17:44 +08:00
Patrick Donnelly
d75842f8f1
mds: mark new root inode dirty
Fixes: http://tracker.ceph.com/issues/23960

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-05-01 20:20:13 -07:00
Kefu Chai
7e4f7c7718
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>
2018-05-02 10:00:15 +08:00
Kefu Chai
932b93ea16
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>
2018-05-02 09:59:12 +08:00
Kefu Chai
a5e815b992
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>
2018-05-02 09:58:28 +08:00
Sage Weil
61398a052c osdc/Objecter: fix warning
Fallout from 891f519242

Signed-off-by: Sage Weil <sage@redhat.com>
2018-05-01 13:56:37 -05:00
Sage Weil
1124839204 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>
2018-05-01 13:46:47 -05:00
Sage Weil
6024c5c52c 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>
2018-05-01 12:39:03 -05:00
Sage Weil
c335bc16a4
Merge pull request #21742 from liewegas/wip-23940
osdc/Objecter: fix recursive locking in _finish_command

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-05-01 12:26:06 -05:00
Sage Weil
edcbb1bf15
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>
2018-05-01 12:25:42 -05:00
Yuri Weinstein
b28ab5616d
Merge pull request #20678 from ceph/wip-s3a-fix
fix s3atests that are failing for sometime

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-05-01 09:28:24 -07:00
Yuri Weinstein
61a66b4e14
Merge pull request #20894 from ZVampirEM77/wip-multisite-cleanup
rgw: some cleanup for sync status

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-05-01 09:27:52 -07:00
Yuri Weinstein
f0e5e624b0
Merge pull request #21647 from yehudasa/wip-23859
rgw: fix for issue #21647 

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-05-01 09:27:32 -07:00
Yuri Weinstein
1d2b8b8025
Merge pull request #21648 from yehudasa/wip-cloud-sync-7
rgw: cloud sync fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-05-01 09:27:10 -07:00
Kefu Chai
35b1e7ea63
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>
2018-05-01 20:22:09 +08:00
Jason Dillaman
ff82e168f6
Merge pull request #21727 from trociny/wip-23929
librbd: release lock executing deep copy progress callback

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-05-01 07:44:17 -04:00
Yan, Zheng
e4160d7e78 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
2018-05-01 12:54:29 +08:00
Patrick Donnelly
49365c70dc
Merge PR #21719 into master
* refs/pull/21719/head:
	mds: trim log during shutdown to clean metadata

Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-04-30 17:26:07 -07:00
Patrick Donnelly
8153cfa696
Merge PR #21720 into master
* refs/pull/21720/head:
	mds: kick rdlock if waiting for dirfragtreelock

Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-04-30 17:25:01 -07:00
Boris Ranto
056bc08d51 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>
2018-05-01 01:20:44 +02:00
Patrick Donnelly
db3b6ca546
common: refactor for array size
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-04-30 13:43:54 -07:00
Sage Weil
7dbcc772f6 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>
2018-04-30 15:38:59 -05:00
Mykola Golub
93b9eb7dd8 librbd: release lock executing deep copy progress callback
Fixes: http://tracker.ceph.com/issues/23929
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-04-30 22:24:19 +03:00
Josh Durgin
625c6895fb
Merge pull request #21706 from liewegas/wip-23860
osd/PG: fix DeferRecovery vs AllReplicasRecovered race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-04-30 11:32:31 -07:00
Patrick Donnelly
9e12aa5d3b
mds: kick rdlock if waiting for dirfragtreelock
Fixes: https://tracker.ceph.com/issues/23919

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-04-30 10:04:08 -07:00
Patrick Donnelly
c60ef1b806
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>
2018-04-30 09:58:10 -07:00
Sage Weil
f459de15aa
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>
2018-04-30 11:18:11 -05:00
Patrick Donnelly
cec1fa0998
Merge PR #21731 into master
* refs/pull/21731/head:
	client: drop function _get_inodeno

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-04-30 09:16:48 -07:00
John Spray
1e768b3f4e 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>
2018-04-30 16:39:40 +01:00
Sage Weil
c584061d16
Merge pull request #21743 from yuriw/wip-yuriw-crontab
qa/tests: removed rest suite from the mix
2018-04-30 10:33:36 -05:00
Mykola Golub
6b752a3859
Merge pull request #21697 from dillaman/wip-18753-1
rbd-mirror: additional thrasher testing

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-04-30 18:25:35 +03:00
Yuri Weinstein
42fa821724 qa/tests: removed rest suite from the mix
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2018-04-30 08:20:06 -07:00
Ken Dreyer
a630681c65 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>
2018-04-30 09:15:23 -06:00
Sage Weil
854f44b247
Merge pull request #21739 from tchaikov/wip-23922
qa/suites/rados/thrash-old-clients: ms_type=simple

Reviewed-by: Sage Weil <sage@redhat.com>
2018-04-30 09:55:10 -05:00
Andrew Schoen
2f15a4fba3
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>
2018-04-30 14:52:50 +00:00
Sage Weil
891f519242 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>
2018-04-30 09:52:38 -05:00
Kefu Chai
e62bc6bcd6
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>
2018-04-30 21:57:19 +08:00