Commit Graph

103810 Commits

Author SHA1 Message Date
Changcheng Liu
3a691911fc doc: update with osd addition
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
2019-11-01 13:55:41 +08:00
Prashant D
b005abe65a crush/CrushWrapper.cc: Fix sign compare compiler warning
introduced by 712a39e5c9

Signed-off-by: Prashant D <pdhange@redhat.com>
2019-11-01 01:50:36 -04:00
Kefu Chai
95aa2e5ab7 librbd: always initialize local variables
silence warnings like:

src/librbd/io/ImageRequestWQ.cc:576:7: warning: 'length' may be used uninitialized in this function [-Wmaybe-uninitialized]
       if (block_overlapping_io(&m_in_flight_extents, offset, length)) {
       ^~
...
src/librbd/io/ImageRequestWQ.cc:935:12: note: 'length' was declared here
   uint64_t length;
            ^~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-11-01 13:34:23 +08:00
Sage Weil
ae17f3678d Merge PR #31225 into master
* refs/pull/31225/head:
	mgr/telemetry: send device telemetry via per-host POST to device endpoint

Reviewed-by: Dan Mick <dmick@redhat.com>
2019-10-31 21:49:46 -05:00
Kefu Chai
739427fd44 pybind/rados: do not use wait_for_safe() anymore
in librados, wait_for_safe() is an alias of wait_for_complete(). so in
this change, wait_for_safe() calls wait_for_complete(), and the callers
of wait_for_safe() will just call wait_for_complete(), instead of
calling both of them.

also, rados_aio_create_completion() is replaced with
rados_aio_create_completion2().

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-11-01 09:40:44 +08:00
Kefu Chai
aaab90fb07 librados: add Rados::aio_create_completion(arg, cb)
which does not take safe_cb, and will take the place of
Rados::aio_create_completion(arg, cb_complete, cb_safe)

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-11-01 09:40:44 +08:00
Kefu Chai
c2d6788aaa librados: add rados_aio_create_completion2()
rados_aio_create_completion2() is almost identical to
rados_aio_create_completion(). the only difference is that the former
does not accept the `safe` callback. as it's an alias of `complete`
callback since af01db76f6

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-11-01 09:40:44 +08:00
Kefu Chai
46fa68eb10 librados: mark wait_for_safe() functions deprecated
safe is an alias of completed since
af01db76f6. there is no need to have
two callbacks for tracking the state of an async operation anymore.

in this change, wait_for_safe() and friends are marked "deprecated"

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-11-01 09:40:44 +08:00
Patrick Donnelly
a3352d7e9a
Merge PR #31046 into master
* refs/pull/31046/head:
	doc: hide page contents for Ceph Internals

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2019-10-31 16:42:18 -07:00
Willem Jan Withagen
9d388ef334 test: only compile ceph_test_bmap_alloc_replay WITH_BLUESTORE
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2019-10-31 22:05:40 +01:00
Patrick Donnelly
ced05b9eb3
Merge PR #31206 into master
* refs/pull/31206/head:
	qa: test fs:upgrade when running upgrade suite

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-10-31 13:08:34 -07:00
Sage Weil
d214f5e4ca mgr/ssh: simplify get_services call for 'mds update'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:26:49 -05:00
Sage Weil
3acb8d9e9d mgr/ssh: make _get_services take service *id* or service *name*
Name is the group, id is the instance.  A bit confusing, but this is what
orchestrator.py uses.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:26:01 -05:00
Sage Weil
298a0b3f17 mgr/ssh: fix 'service ls' on stopped services
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
1a3d0e872e mgr/ssh: move some code around
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
332daeac35 doc/mgr/orchestrator_cli: 'service ls' works for ssh
See 7fc78b6342 merge commit.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
f92b0061dd doc/mgr/orchestrator_cli: we already completed mds ops for rook+ssh
See f5bc2bd74a merge.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-31 14:25:05 -05:00
Sage Weil
46867fd67b Merge PR #31270 into master
* refs/pull/31270/head:
	ceph-daemon: no extra newline needed in authorized_keys file
	ceph-daemon: use client.admin keyring during bootstrap

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-10-31 10:40:59 -05:00
Ilya Dryomov
f41de0bec1
Merge pull request #31265 from idryomov/wip-krbd-unmap-msgr1
qa/suites/krbd: run unmap subsuite with msgr1 only

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-31 15:45:19 +01:00
Varsha Rao
4159ebc31b mds: Reorganize class members in MDCache header
Fixes: https://tracker.ceph.com/issues/42191
Signed-off-by: Varsha Rao <varao@redhat.com>
2019-10-31 17:57:48 +05:30
Patrick Seidensal
417517c624 mgr/dashboard: AttributeError: 'NoneType' object has no attribute 'items' in smart data integration
Fixes: https://tracker.ceph.com/issues/42443

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
2019-10-31 12:52:17 +01:00
Volker Theile
b315f2eeea
mgr/dashboard: Remove convertion to seconds (#31262)
mgr/dashboard: Remove convertion to seconds

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ni-Feng Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-10-31 12:07:31 +01:00
Volker Theile
0562fc9a4b
mgr/dashboard: edit/clone/copy rbd image after its data is rec… (#31245)
mgr/dashboard: edit/clone/copy rbd image after its data is received

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-10-31 12:05:06 +01:00
Nathan Cutler
14cdd8e95f
Merge pull request #31247 from smithfarm/wip-bri-regression
backport-resolve-issue: "recognize that Target version is populated" and "prune duplicate URLs"

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2019-10-31 12:02:58 +01:00
Ernesto Puerta
ae6ab3047b
mgr/dashboard: fix LazyUUID4 not serializable
- Patch older versions of cherrypy (<11.1.0) to include `unique_id`
field in Request items.
- Add unit tests to verify Debug mode plugin
- Fix RGW Client test
- Fix Tools test

Fixes: https://tracker.ceph.com/issues/42565
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2019-10-31 10:22:15 +01:00
Sage Weil
fc60989bf7 mgr/MgrClient: fix open condition
Do not open a mgr daemon session if we are a client using a non-client
key to authenticate.  This is a bit of a corner case, but it can
happen when using the mon. key do bootstrap functions.

This aligns the MgrClient condition with the mgr/DaemonServer.cc
handle_report condition, which rejects non-daemon client connections
based on the connection entity type, not the auth identity.

Fixes: https://tracker.ceph.com/issues/42566
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 21:23:45 -05:00
Abhishek Lekshmanan
f62c6e8cba mgr/telemetry: add rgw metadata
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 16:56:38 -05:00
Patrick Donnelly
35b0b52153
Merge PR #31231 into master
* refs/pull/31231/head:
	qa: add tests for CephFS admin commands
	mds/MDSRank: report state to mgr as mds id, not rank

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-10-30 12:22:48 -07:00
Sage Weil
57c6e51755 ceph-daemon: no extra newline needed in authorized_keys file
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 14:09:36 -05:00
Sage Weil
df40a49eb8 ceph-daemon: use client.admin keyring during bootstrap
It's usually okay to use the mon. key for CLI commands, except we had a
mgr but that prevented you from issuing mgr commands correctly.  We have
the new client.admin key available, so use that instead.

Update tests to not --skip-ssh (now that it doesn't hang).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 14:07:52 -05:00
Sage Weil
d2c66f3879 Merge PR #31264 into master
* refs/pull/31264/head:
	ceph-daemon: deal with lack of TemporaryDirectory on py2
	ceph-daemon: make StringIO usage py2 compatible
	ceph-daemon: make ConfigParser py2 compatible

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2019-10-30 14:04:07 -05:00
Ilya Dryomov
5011cc926c qa/suites/krbd: run unmap subsuite with msgr1 only
pre-single-major.yaml kernel doesn't have any of the monitor client
fixes that came in 4.6.  If the connection is closed, it closes the
session and retries only after 10 seconds.  On top of that, there is
nothing to prevent it from picking the same monitor when reconnecting.
This means that when given both v1 and v2 ports (which look like two
different monitors), it is susceptible to mount_timeout (60 seconds):

  $ sudo rbd map img
  rbd: sysfs write failed
  In some cases useful info is found in syslog - try "dmesg | tail".
  rbd: map failed: (5) Input/output error

  [  822.242313] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  832.265494] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  842.296175] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  852.326924] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  862.357611] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  872.388373] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)
  [  882.676136] libceph: mon0 172.21.15.132:3300 socket closed (con state CONNECTING)

Unlike newer kernels that return ETIMEDOUT, it returns EIO.

Newer kernels are much more aggressive about retries and will pick
a different monitor when reconnecting, hence they are always able to
establish the session in time.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2019-10-30 19:51:55 +01:00
Patrick Donnelly
9dc07d8096
qa: add tests for CephFS admin commands
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-10-30 11:44:26 -07:00
Sage Weil
9c9bb19d43 ceph-daemon: deal with lack of TemporaryDirectory on py2
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 13:29:49 -05:00
Sage Weil
749a0bdb61 ceph-daemon: make StringIO usage py2 compatible
Otherwise,

Traceback (most recent call last):
  File "../src/ceph-daemon", line 1698, in <module>
    r = args.func()
  File "../src/ceph-daemon", line 767, in command_bootstrap
    with StringIO() as f:
AttributeError: StringIO instance has no attribute '__exit__'

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 13:29:49 -05:00
Sage Weil
93570a501b ceph-daemon: make ConfigParser py2 compatible
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-30 13:29:49 -05:00
Tiago Melo
a7daa902a6 mgr/dashboard: Remove convertion to seconds
This is no longer need since the values are already in seconds.

Fixes: https://tracker.ceph.com/issues/42567

Signed-off-by: Tiago Melo <tmelo@suse.com>
2019-10-30 15:15:18 -01:00
Patrick Donnelly
25f4a0357c
Merge PR #31195 into master
* refs/pull/31195/head:
	vstart: Fix /dev/tty No such device or address

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-10-30 09:09:06 -07:00
Jason Dillaman
f4d99f796a
Merge pull request #31161 from trociny/wip-42488
rbd-mirror: mirrored clone should be same format 

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-30 12:07:30 -04:00
Jason Dillaman
5f823f8575
Merge pull request #31149 from wonderpow/master1
cls/rbd: add snapshot_add raise -ESTALE test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-30 12:07:12 -04:00
Jason Dillaman
922385c6c2
Merge pull request #31140 from Gangbiao/add-pybind-test-case
test/pybind: add create_snap rasie ImageExists test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-30 12:06:41 -04:00
Jason Dillaman
b50e6f5894
Merge pull request #30994 from JackSlateur/rbd_merged_du
rbd: add --merge to disk-usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-10-30 12:06:08 -04:00
Lenz Grimmer
5df7223985
mgr/dashboard: remove space in tox.ini deps (#31246)
mgr/dashboard: remove space in tox.ini deps

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-10-30 15:32:15 +00:00
Volker Theile
4385ce4805 vstart: Fix /dev/tty No such device or address
Running on Jenkins slave or as a daemon there will be no writable console.

Fixes: https://tracker.ceph.com/issues/42487

Signed-off-by: Volker Theile <vtheile@suse.com>
2019-10-30 15:52:28 +01:00
Nathan Cutler
49ab75109f backport-resolve-issue: prune duplicate URLs
I have seen PR descriptions with a single backport tracker URL mentioned twice.
When backport-resolve-issue hit one of these, it would say:

Found backport tracker: https://tracker.ceph.com/issues/39272
Found backport tracker: https://tracker.ceph.com/issues/39272
-----------------------------------------------------------------
INFO:root:Tracker https://tracker.ceph.com/issues/39272 links to PR https://github.com/ceph/ceph/pull/29153
INFO:root:Backport Tracker 39272 target version already populated with correct value v12.2.13
INFO:root:Backport Tracker 39272 status is already set to Resolved
-----------------------------------------------------------------
INFO:root:Tracker https://tracker.ceph.com/issues/39272 links to PR https://github.com/ceph/ceph/pull/29153
INFO:root:Backport Tracker 39272 target version already populated with correct value v12.2.13
INFO:root:Backport Tracker 39272 status is already set to Resolved
=================================================================

This commit fixes the issue.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-10-30 14:30:08 +01:00
Lenz Grimmer
f61d002825
mgr/dashboard: Allow removal of single notification (#31048)
mgr/dashboard: Allow removal of single notification

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-10-30 12:32:37 +00:00
Lenz Grimmer
fb29d02330
mgr/dashboard: Use checkbox for multi selection (#30495)
mgr/dashboard: Use checkbox for multi selection

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-10-30 11:58:15 +00:00
Alfonso Martínez
da72765d8e mgr/dashboard: edit/clone/copy rbd image after its data is received
Fixes: https://tracker.ceph.com/issues/42561
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2019-10-30 12:31:13 +01:00
Nathan Cutler
2566d95e31
Merge pull request #31193 from rhcs-dashboard/wip-42507-master
mgr/dashboard: update dashboard CODEOWNERShip

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2019-10-30 11:54:18 +01:00
Nathan Cutler
942e7385b6 backport-resolve-issue: recognize that Target version is populated
Due to a regression, the script stopped recognizing that a Backport tracker
issue's "Target version" field is populated.

Fixes: af43b3cc3b
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-10-30 11:46:24 +01:00