]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agocmake: define mgr_cap_obj library when WITH_MGR=OFF 31326/head
Casey Bodley [Fri, 1 Nov 2019 20:04:37 +0000 (16:04 -0400)]
cmake: define mgr_cap_obj library when WITH_MGR=OFF

resolves the cmake error when WITH_MGR=OFF:

  Error evaluating generator expression:

    $<TARGET_OBJECTS:mgr_cap_obj>

  Objects of target "mgr_cap_obj" referenced but no such target exists.
Call Stack (most recent call first):
  src/mon/CMakeLists.txt:34 (add_library)

Signed-off-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge PR #31318 into master
Sage Weil [Fri, 1 Nov 2019 18:44:32 +0000 (13:44 -0500)]
Merge PR #31318 into master

* refs/pull/31318/head:
ceph.spec.in: run pathfix.py
ceph-daemon: use /usr/bin/python, not /usr/bin/env python

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31226 into master
Sage Weil [Fri, 1 Nov 2019 17:03:38 +0000 (12:03 -0500)]
Merge PR #31226 into master

* refs/pull/31226/head:
mgr/telemetry: add stats about crush map
mgr/telemetry: add rgw metadata
mgr/telemetry: include fs size (files, bytes, snaps)
mds: report r{files,bytes,snaps} via perfcounters
mgr/telemetry: mds cache stats
mgr/telemetry: add some rbd metadata
mgr/telemetry: note whether osd cluster_network is in use
mgr/telemetry: add host counts
mgr/telemetry: add more pool metadata
mgr/telemetry: remove crush rule name
mgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count
mgr/telemetry: add CephFS metadata

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge PR #25374 into master
Sage Weil [Fri, 1 Nov 2019 16:58:11 +0000 (11:58 -0500)]
Merge PR #25374 into master

* refs/pull/25374/head:
osd: add flag to prevent truncate_seq copy in copy-from operation

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31256 into master
Sage Weil [Fri, 1 Nov 2019 16:57:03 +0000 (11:57 -0500)]
Merge PR #31256 into master

* refs/pull/31256/head:
mgr/MgrClient: fix open condition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/dashboard: AttributeError: 'NoneType' object has no attrib… (#31078)
Lenz Grimmer [Fri, 1 Nov 2019 15:44:33 +0000 (15:44 +0000)]
mgr/dashboard: AttributeError: 'NoneType' object has no attrib… (#31078)

mgr/dashboard: Fixed AttributeError: 'NoneType' in smart data integration

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoceph.spec.in: run pathfix.py 31318/head
Kefu Chai [Fri, 1 Nov 2019 15:18:23 +0000 (10:18 -0500)]
ceph.spec.in: run pathfix.py

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31320 into master
Sage Weil [Fri, 1 Nov 2019 14:10:28 +0000 (09:10 -0500)]
Merge PR #31320 into master

* refs/pull/31320/head:
ceph-daemon: fix os.mkdir call

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoceph-daemon: fix os.mkdir call 31320/head
Sage Weil [Fri, 1 Nov 2019 14:05:49 +0000 (09:05 -0500)]
ceph-daemon: fix os.mkdir call

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31314 into master
Sage Weil [Fri, 1 Nov 2019 13:57:33 +0000 (08:57 -0500)]
Merge PR #31314 into master

* refs/pull/31314/head:
mgr/orchestrator_cli: pass default value to "req=False" params

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31315 into master
Sage Weil [Fri, 1 Nov 2019 13:56:36 +0000 (08:56 -0500)]
Merge PR #31315 into master

* refs/pull/31315/head:
ceph-daemon: create ~/.ssh if not exist

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: create ~/.ssh if not exist 31315/head
Kefu Chai [Fri, 1 Nov 2019 09:39:35 +0000 (17:39 +0800)]
ceph-daemon: create ~/.ssh if not exist

there is chance that /root/.ssh does not exist yet, when we are trying
to add key to authorized_keys.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/telemetry: add stats about crush map 31226/head
Sage Weil [Fri, 1 Nov 2019 12:58:54 +0000 (07:58 -0500)]
mgr/telemetry: add stats about crush map

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: use /usr/bin/python, not /usr/bin/env python
Sage Weil [Fri, 1 Nov 2019 12:19:20 +0000 (07:19 -0500)]
ceph-daemon: use /usr/bin/python, not /usr/bin/env python

This works around noise from the rpm build:

*** ERROR: ambiguous python shebang in /usr/sbin/ceph-daemon: #!/usr/bin/env python. Change it to python3 (or python2) explicitly.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31045 from tchaikov/wip/librados/no-more-ack-commit
Kefu Chai [Fri, 1 Nov 2019 12:06:20 +0000 (20:06 +0800)]
Merge pull request #31045 from tchaikov/wip/librados/no-more-ack-commit

librados,test,rgw: cleanups to deprecate safe_cb related functions

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31311 from tchaikov/wip/rbd/cleanup
Jason Dillaman [Fri, 1 Nov 2019 11:47:26 +0000 (07:47 -0400)]
Merge pull request #31311 from tchaikov/wip/rbd/cleanup

librbd: always initialize local variables

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #30912 from dillaman/wip-42265
Mykola Golub [Fri, 1 Nov 2019 11:41:28 +0000 (13:41 +0200)]
Merge pull request #30912 from dillaman/wip-42265

mgr: add 'rbd' profiles to support 'rbd_support' module commands

Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31244 from changchengx/deploy_doc
Kefu Chai [Fri, 1 Nov 2019 10:15:15 +0000 (18:15 +0800)]
Merge pull request #31244 from changchengx/deploy_doc

doc: update with osd addition

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31196 from liewegas/wip-osdmon-iec
Kefu Chai [Fri, 1 Nov 2019 10:00:38 +0000 (18:00 +0800)]
Merge pull request #31196 from liewegas/wip-osdmon-iec

mon/OSDMonitor: expand iec_options for 'osd pool set'

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agorgw: use new aio_create_completion() 31045/head
Kefu Chai [Fri, 1 Nov 2019 02:17:05 +0000 (10:17 +0800)]
rgw: use new aio_create_completion()

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agojournal: use new aio_create_completion()
Kefu Chai [Tue, 29 Oct 2019 17:35:35 +0000 (01:35 +0800)]
journal: use new aio_create_completion()

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/librados_test_stub: implement aio_create_completion2() and friends
Kefu Chai [Tue, 29 Oct 2019 17:14:39 +0000 (01:14 +0800)]
test/librados_test_stub: implement aio_create_completion2() and friends

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrbd: use new aio_create_completion()
Kefu Chai [Tue, 29 Oct 2019 07:08:57 +0000 (15:08 +0800)]
librbd: use new aio_create_completion()

to silence warnings like:

src/librbd/Utils.h:139:48: warning: 'static librados::v14_2_0::AioCompletion* librados::v14_2_0::Rados::aio_create_completion(void*, librados::callback_t, librados::callback_t)' is deprecated
[-Wdeprecated-declarations]
   return librados::Rados::aio_create_completion(
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^
     obj, &detail::rados_callback<T, MF>, nullptr);
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/libradosstriper: use new aio_create_completion()
Kefu Chai [Tue, 29 Oct 2019 12:12:42 +0000 (20:12 +0800)]
test/libradosstriper: use new aio_create_completion()

to silence -Wdeprecated-declarations warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocls/journal: s/create_completion/create_completion2/
Kefu Chai [Tue, 22 Oct 2019 11:20:10 +0000 (19:20 +0800)]
cls/journal: s/create_completion/create_completion2/

src/cls/journal/cls_journal_client.cc:154:72: warning: 'static librados::v14_2_0::AioCompletion* librados::v14_2_0::Rados::aio_create_completion(void*, librados::callback_t, librados::callback_t)' is
deprecated [-Wdeprecated-declarations]
       librados::Rados::aio_create_completion(this, rados_callback, NULL);
                                                                        ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agorgw: s/create_completion/create_completion2/
Kefu Chai [Tue, 22 Oct 2019 11:14:16 +0000 (19:14 +0800)]
rgw: s/create_completion/create_completion2/

to silence the warnings like

s_user_client.cc:151:77: warning: 'static librados::v14_2_0::AioCompletion* librados::v14_2_0::Rados::aio_create_completion(void*, librados::callback_t, librados::callback_t)' is deprecated
[-Wdeprecated-declarations]
   AioCompletion *c = librados::Rados::aio_create_completion(NULL, NULL, NULL);
                                                                             ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: s/aio_create_completion/aio_create_completion2/
Kefu Chai [Tue, 22 Oct 2019 08:03:41 +0000 (16:03 +0800)]
librados: s/aio_create_completion/aio_create_completion2/

the former is deprecated

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibradosstriper: s/create_completion/create_completion2/
Kefu Chai [Tue, 22 Oct 2019 08:03:21 +0000 (16:03 +0800)]
libradosstriper: s/create_completion/create_completion2/

replace `librados::Rados::aio_create_completion(arg, complete_cb,
safe_cb)` with `librados::Rados::aio_create_completion(arg,
complete_cb)`

the former is deprecated

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotools: s/rados_aio_create_completion/rados_aio_create_completion2/
Kefu Chai [Tue, 22 Oct 2019 07:35:51 +0000 (15:35 +0800)]
tools: s/rados_aio_create_completion/rados_aio_create_completion2/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest: s/rados_aio_create_completion/rados_aio_create_completion2/
Kefu Chai [Tue, 22 Oct 2019 07:32:37 +0000 (15:32 +0800)]
test: s/rados_aio_create_completion/rados_aio_create_completion2/

the former is deprecated and replaced with the latter

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:08:07 +0000 (15:08 +0800)]
test: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agorgw: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:07:35 +0000 (15:07 +0800)]
rgw: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:06:57 +0000 (15:06 +0800)]
librados: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotest/ceph_kvstorebench: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 07:06:35 +0000 (15:06 +0800)]
test/ceph_kvstorebench: s/wait_for_safe/wait_for_complete/

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agotools/rados: s/wait_for_safe/wait_for_complete/
Kefu Chai [Tue, 22 Oct 2019 06:53:59 +0000 (14:53 +0800)]
tools/rados: s/wait_for_safe/wait_for_complete/

wait_for_safe() and friend are deprecated, so use wait_for_complete()
instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/orchestrator_cli: pass default value to "req=False" params 31314/head
Kefu Chai [Fri, 1 Nov 2019 09:22:25 +0000 (17:22 +0800)]
mgr/orchestrator_cli: pass default value to "req=False" params

in mds_add() command, both "num" and "hosts" are optional, so they
should have default values of "None". this change was introduced in
c35db383.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc: update with osd addition 31244/head
Changcheng Liu [Wed, 30 Oct 2019 09:07:01 +0000 (17:07 +0800)]
doc: update with osd addition

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
5 years agolibrbd: always initialize local variables 31311/head
Kefu Chai [Fri, 1 Nov 2019 05:32:24 +0000 (13:32 +0800)]
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>
5 years agoMerge PR #31225 into master
Sage Weil [Fri, 1 Nov 2019 02:49:46 +0000 (21:49 -0500)]
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>
5 years agopybind/rados: do not use wait_for_safe() anymore
Kefu Chai [Tue, 22 Oct 2019 06:18:10 +0000 (14:18 +0800)]
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>
5 years agolibrados: add Rados::aio_create_completion(arg, cb)
Kefu Chai [Tue, 22 Oct 2019 07:34:08 +0000 (15:34 +0800)]
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>
5 years agolibrados: add rados_aio_create_completion2()
Kefu Chai [Tue, 22 Oct 2019 06:15:58 +0000 (14:15 +0800)]
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 af01db76f63a22178509b402776da54164af1eb0

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agolibrados: mark wait_for_safe() functions deprecated
Kefu Chai [Tue, 22 Oct 2019 06:10:16 +0000 (14:10 +0800)]
librados: mark wait_for_safe() functions deprecated

safe is an alias of completed since
af01db76f63a22178509b402776da54164af1eb0. 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>
5 years agoMerge PR #31046 into master
Patrick Donnelly [Thu, 31 Oct 2019 23:42:18 +0000 (16:42 -0700)]
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>
5 years agoMerge PR #31206 into master
Patrick Donnelly [Thu, 31 Oct 2019 20:08:34 +0000 (13:08 -0700)]
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>
5 years agoMerge PR #31270 into master
Sage Weil [Thu, 31 Oct 2019 15:40:59 +0000 (10:40 -0500)]
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>
5 years agoMerge pull request #31265 from idryomov/wip-krbd-unmap-msgr1
Ilya Dryomov [Thu, 31 Oct 2019 14:45:19 +0000 (15:45 +0100)]
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>
5 years agomgr/dashboard: AttributeError: 'NoneType' object has no attribute 'items' in smart... 31078/head
Patrick Seidensal [Wed, 23 Oct 2019 12:31:36 +0000 (14:31 +0200)]
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>
5 years agomgr/dashboard: Remove convertion to seconds (#31262)
Volker Theile [Thu, 31 Oct 2019 11:07:31 +0000 (12:07 +0100)]
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>
5 years agomgr/dashboard: edit/clone/copy rbd image after its data is rec… (#31245)
Volker Theile [Thu, 31 Oct 2019 11:05:06 +0000 (12:05 +0100)]
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>
5 years agoMerge pull request #31247 from smithfarm/wip-bri-regression
Nathan Cutler [Thu, 31 Oct 2019 11:02:58 +0000 (12:02 +0100)]
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>
5 years agomgr/MgrClient: fix open condition 31256/head
Sage Weil [Wed, 30 Oct 2019 14:39:47 +0000 (09:39 -0500)]
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>
5 years agomgr/telemetry: add rgw metadata
Abhishek Lekshmanan [Wed, 30 Oct 2019 20:34:43 +0000 (15:34 -0500)]
mgr/telemetry: add rgw metadata

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31231 into master
Patrick Donnelly [Wed, 30 Oct 2019 19:22:48 +0000 (12:22 -0700)]
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>
5 years agoceph-daemon: no extra newline needed in authorized_keys file 31270/head
Sage Weil [Wed, 30 Oct 2019 19:09:36 +0000 (14:09 -0500)]
ceph-daemon: no extra newline needed in authorized_keys file

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: use client.admin keyring during bootstrap
Sage Weil [Wed, 30 Oct 2019 15:05:24 +0000 (10:05 -0500)]
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>
5 years agoMerge PR #31264 into master
Sage Weil [Wed, 30 Oct 2019 19:04:07 +0000 (14:04 -0500)]
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>
5 years agoqa/suites/krbd: run unmap subsuite with msgr1 only 31265/head
Ilya Dryomov [Tue, 29 Oct 2019 15:19:14 +0000 (16:19 +0100)]
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>
5 years agoqa: add tests for CephFS admin commands 31231/head
Patrick Donnelly [Wed, 30 Oct 2019 17:21:22 +0000 (10:21 -0700)]
qa: add tests for CephFS admin commands

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoceph-daemon: deal with lack of TemporaryDirectory on py2 31264/head
Sage Weil [Wed, 30 Oct 2019 18:22:43 +0000 (13:22 -0500)]
ceph-daemon: deal with lack of TemporaryDirectory on py2

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make StringIO usage py2 compatible
Sage Weil [Wed, 30 Oct 2019 15:33:52 +0000 (10:33 -0500)]
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>
5 years agoceph-daemon: make ConfigParser py2 compatible
Sage Weil [Wed, 30 Oct 2019 15:32:00 +0000 (10:32 -0500)]
ceph-daemon: make ConfigParser py2 compatible

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/dashboard: Remove convertion to seconds 31262/head
Tiago Melo [Wed, 30 Oct 2019 16:13:01 +0000 (15:13 -0100)]
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>
5 years agoMerge PR #31195 into master
Patrick Donnelly [Wed, 30 Oct 2019 16:09:06 +0000 (09:09 -0700)]
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>
5 years agoMerge pull request #31161 from trociny/wip-42488
Jason Dillaman [Wed, 30 Oct 2019 16:07:30 +0000 (12:07 -0400)]
Merge pull request #31161 from trociny/wip-42488

rbd-mirror: mirrored clone should be same format

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31149 from wonderpow/master1
Jason Dillaman [Wed, 30 Oct 2019 16:07:12 +0000 (12:07 -0400)]
Merge pull request #31149 from wonderpow/master1

cls/rbd: add snapshot_add raise -ESTALE test case

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31140 from Gangbiao/add-pybind-test-case
Jason Dillaman [Wed, 30 Oct 2019 16:06:41 +0000 (12:06 -0400)]
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>
5 years agoMerge pull request #30994 from JackSlateur/rbd_merged_du
Jason Dillaman [Wed, 30 Oct 2019 16:06:08 +0000 (12:06 -0400)]
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>
5 years agomgr/dashboard: remove space in tox.ini deps (#31246)
Lenz Grimmer [Wed, 30 Oct 2019 15:32:15 +0000 (15:32 +0000)]
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>
5 years agovstart: Fix /dev/tty No such device or address 31195/head
Volker Theile [Tue, 29 Oct 2019 14:24:22 +0000 (15:24 +0100)]
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>
5 years agobackport-resolve-issue: prune duplicate URLs 31247/head
Nathan Cutler [Wed, 30 Oct 2019 13:30:08 +0000 (14:30 +0100)]
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>
5 years agomgr/dashboard: Allow removal of single notification (#31048)
Lenz Grimmer [Wed, 30 Oct 2019 12:32:37 +0000 (12:32 +0000)]
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>
5 years agomgr/dashboard: Use checkbox for multi selection (#30495)
Lenz Grimmer [Wed, 30 Oct 2019 11:58:15 +0000 (11:58 +0000)]
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>
5 years agomgr/dashboard: edit/clone/copy rbd image after its data is received 31245/head
Alfonso Martínez [Wed, 30 Oct 2019 11:31:13 +0000 (12:31 +0100)]
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>
5 years agoMerge pull request #31193 from rhcs-dashboard/wip-42507-master
Nathan Cutler [Wed, 30 Oct 2019 10:54:18 +0000 (11:54 +0100)]
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>
5 years agobackport-resolve-issue: recognize that Target version is populated
Nathan Cutler [Wed, 30 Oct 2019 10:44:56 +0000 (11:44 +0100)]
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: af43b3cc3b05e70ec248ad5c23da6fbd4c2e78a1
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30988 from smithfarm/wip-bri-multi
Nathan Cutler [Wed, 30 Oct 2019 10:31:21 +0000 (11:31 +0100)]
Merge pull request #30988 from smithfarm/wip-bri-multi

backport-resolve-issue: resolve multiple backport issues

5 years agomgr/dashboard: remove space in tox.ini deps 31246/head
Sebastian Wagner [Wed, 30 Oct 2019 10:20:02 +0000 (11:20 +0100)]
mgr/dashboard: remove space in tox.ini deps

Fixes: https://tracker.ceph.com/issues/42469
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #31163 from callithea/wip-issue-42489
Nathan Cutler [Wed, 30 Oct 2019 10:02:30 +0000 (11:02 +0100)]
Merge pull request #31163 from callithea/wip-issue-42489

doc: Small update of SubmittingPatches-backports

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #30879 from smithfarm/wip-cbs-check-missing-milestone
Nathan Cutler [Wed, 30 Oct 2019 09:30:01 +0000 (10:30 +0100)]
Merge pull request #30879 from smithfarm/wip-cbs-check-missing-milestone

ceph-backport.sh: implement --milestones feature and more-careful vetting

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #29930 from IlsooByun/rocksdb_ver
Kefu Chai [Wed, 30 Oct 2019 02:11:01 +0000 (10:11 +0800)]
Merge pull request #29930 from IlsooByun/rocksdb_ver

cmake: require RocksDB 5.14 or higher

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomds/MDSRank: report state to mgr as mds id, not rank
Sage Weil [Tue, 29 Oct 2019 19:17:47 +0000 (14:17 -0500)]
mds/MDSRank: report state to mgr as mds id, not rank

Introduced by 625dffe65c0f8001b3b6ca6d0b12732a1a103849, which added
periodic scrub stats reporting.

Fixes: https://tracker.ceph.com/issues/42494
Fixes: https://tracker.ceph.com/issues/41525
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #30369 into master
Patrick Donnelly [Tue, 29 Oct 2019 22:32:18 +0000 (15:32 -0700)]
Merge PR #30369 into master

* refs/pull/30369/head:
doc/cephfs: add doc for cephfs io path

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr/telemetry: include fs size (files, bytes, snaps)
Sage Weil [Tue, 29 Oct 2019 19:03:24 +0000 (14:03 -0500)]
mgr/telemetry: include fs size (files, bytes, snaps)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomds: report r{files,bytes,snaps} via perfcounters
Sage Weil [Tue, 29 Oct 2019 19:00:15 +0000 (14:00 -0500)]
mds: report r{files,bytes,snaps} via perfcounters

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/telemetry: mds cache stats
Sage Weil [Tue, 29 Oct 2019 18:53:50 +0000 (13:53 -0500)]
mgr/telemetry: mds cache stats

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/telemetry: add some rbd metadata
Sage Weil [Tue, 29 Oct 2019 18:30:15 +0000 (13:30 -0500)]
mgr/telemetry: add some rbd metadata

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31201 into master
Patrick Donnelly [Tue, 29 Oct 2019 19:39:06 +0000 (12:39 -0700)]
Merge PR #31201 into master

* refs/pull/31201/head:
doc: document rank option for journal reset

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agomgr/telemetry: note whether osd cluster_network is in use
Sage Weil [Tue, 29 Oct 2019 18:20:07 +0000 (13:20 -0500)]
mgr/telemetry: note whether osd cluster_network is in use

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/telemetry: add host counts
Sage Weil [Tue, 29 Oct 2019 18:14:40 +0000 (13:14 -0500)]
mgr/telemetry: add host counts

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/telemetry: add more pool metadata
Sage Weil [Tue, 29 Oct 2019 18:05:30 +0000 (13:05 -0500)]
mgr/telemetry: add more pool metadata

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/telemetry: remove crush rule name
Sage Weil [Tue, 29 Oct 2019 16:29:46 +0000 (11:29 -0500)]
mgr/telemetry: remove crush rule name

This is a user-specified string and could contain identifying info.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31181 into master
Sage Weil [Tue, 29 Oct 2019 18:39:40 +0000 (13:39 -0500)]
Merge PR #31181 into master

* refs/pull/31181/head:
ceph-daemon: only pass podman -it if need an interactive shell

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agomgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count
Sage Weil [Tue, 29 Oct 2019 16:14:30 +0000 (11:14 -0500)]
mgr/telemetry: include min_mon_release and msgr v1 vs v2 addr count

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/telemetry: add CephFS metadata
Sage Weil [Tue, 29 Oct 2019 16:08:42 +0000 (11:08 -0500)]
mgr/telemetry: add CephFS metadata

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31159 from alfredodeza/wip-rm42484
Alfredo Deza [Tue, 29 Oct 2019 16:05:11 +0000 (12:05 -0400)]
Merge pull request #31159 from alfredodeza/wip-rm42484

ceph-volume tests remove xenial from functional testing

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agomgr/telemetry: send device telemetry via per-host POST to device endpoint 31225/head
Sage Weil [Tue, 29 Oct 2019 14:28:18 +0000 (09:28 -0500)]
mgr/telemetry: send device telemetry via per-host POST to device endpoint

We do not want to associate devices with clusters because that may
communicate unnecessary information about the association between vendors
and clusters (which, when large, are potentially identifying).

Instead, do a POST per host with all of the devices on that host only.

The devices endpoint does not log the POST time, so these per-host
records won't be associated with each other.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agotest/pybind: add create_snap rasie ImageExists test case 31140/head
Gangbiao Liu [Wed, 23 Oct 2019 02:26:02 +0000 (10:26 +0800)]
test/pybind: add create_snap rasie ImageExists test case

Signed-off-by: Gangbiao Liu <liugangbiao@cmss.chinamobile.com>
5 years agoMerge pull request #31222 from sebastian-philipp/python-common-avoid-setup_requires
Kefu Chai [Tue, 29 Oct 2019 15:07:39 +0000 (23:07 +0800)]
Merge pull request #31222 from sebastian-philipp/python-common-avoid-setup_requires

python-common: avoid using setup_requires in setup.py

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/dashboard: Allow removal of single notification 31048/head
Tiago Melo [Fri, 4 Oct 2019 12:10:52 +0000 (12:10 +0000)]
mgr/dashboard: Allow removal of single notification

Signed-off-by: Tiago Melo <tmelo@suse.com>