]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agotest_cephfs_shell: initialize stderr for run_cephfs_shell_cmd() 31626/head
Rishabh Dave [Wed, 13 Nov 2019 13:22:18 +0000 (18:52 +0530)]
test_cephfs_shell: initialize stderr for run_cephfs_shell_cmd()

Since teuthology initializes stderr to None by default, absence of this
breaks the tests accessing stderr of commands executed within the test
when the execution is using teuthology.

Fixes: https://tracker.ceph.com/issues/42806
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge PR #31501 into master
Sage Weil [Tue, 12 Nov 2019 00:09:29 +0000 (18:09 -0600)]
Merge PR #31501 into master

* refs/pull/31501/head:
ceph-mon: bind to public_addrv if set (before public_addr or public_network)
common/options: add public_addrv
common/options: fix ADDRVEC parsing
ceph-daemon: support --mon-addrv for deploy subcommand

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #30914 into master
Patrick Donnelly [Mon, 11 Nov 2019 23:21:30 +0000 (15:21 -0800)]
Merge PR #30914 into master

* refs/pull/30914/head:
ceph: Add doc for deploying cephfs-nfs cluster using rook

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #31540 into master
Sage Weil [Mon, 11 Nov 2019 21:50:55 +0000 (15:50 -0600)]
Merge PR #31540 into master

* refs/pull/31540/head:
ceph-daemon: make ps1 a raw string

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: make ps1 a raw string 31540/head
Michael Fritch [Mon, 11 Nov 2019 21:07:49 +0000 (14:07 -0700)]
ceph-daemon: make ps1 a raw string

python3 interprets '\u' as a unicode escape

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31024 into master
Patrick Donnelly [Mon, 11 Nov 2019 20:21:34 +0000 (12:21 -0800)]
Merge PR #31024 into master

* refs/pull/31024/head:
doc: improve in mount.ceph man page
doc: describe mds_namespace option in mount.ceph man page

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #30911 into master
Patrick Donnelly [Mon, 11 Nov 2019 20:03:21 +0000 (12:03 -0800)]
Merge PR #30911 into master

* refs/pull/30911/head:
doc/ceph-fuse: describe -n option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Douglas Fuller <dfuller@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge PR #30657 into master
Patrick Donnelly [Mon, 11 Nov 2019 18:45:10 +0000 (10:45 -0800)]
Merge PR #30657 into master

* refs/pull/30657/head:
test_cephfs_shell: pass arg to "help" in test_help
cephfs-shell: set exit_code when an error occurs
cephfs-shell: print traceback only when debug switch is on
cephfs-shell: catch libcephfs.Error only in onecmd()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31452 into master
Patrick Donnelly [Mon, 11 Nov 2019 18:41:24 +0000 (10:41 -0800)]
Merge PR #31452 into master

* refs/pull/31452/head:
Add chown ceph:ceph for /tmp/ceph.mon.keyring

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31538 into master
Sage Weil [Mon, 11 Nov 2019 18:14:35 +0000 (12:14 -0600)]
Merge PR #31538 into master

* refs/pull/31538/head:
ceph-daemon: do not fetch daemon detail when removing a cluster
ceph-daemon: ls: add --no-detail

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: do not fetch daemon detail when removing a cluster 31538/head
Sage Weil [Mon, 11 Nov 2019 17:05:00 +0000 (11:05 -0600)]
ceph-daemon: do not fetch daemon detail when removing a cluster

It's slow and not needed.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: ls: add --no-detail
Sage Weil [Mon, 11 Nov 2019 17:04:22 +0000 (11:04 -0600)]
ceph-daemon: ls: add --no-detail

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31387 into master
Sage Weil [Mon, 11 Nov 2019 16:15:45 +0000 (10:15 -0600)]
Merge PR #31387 into master

* refs/pull/31387/head:
src/CMakeLists: remove leading 'v' from 'git describe' version

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #31524 into master
Sage Weil [Mon, 11 Nov 2019 16:15:18 +0000 (10:15 -0600)]
Merge PR #31524 into master

* refs/pull/31524/head:
mgr/ssh: Fix various Python issues.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
5 years agomgr/dashboard: Improve position of MDS chart tooltip (#31368)
Lenz Grimmer [Mon, 11 Nov 2019 15:29:11 +0000 (15:29 +0000)]
mgr/dashboard: Improve position of MDS chart tooltip (#31368)

mgr/dashboard: Improve position of MDS chart tooltip

Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #31512 into master
Sage Weil [Mon, 11 Nov 2019 15:28:01 +0000 (09:28 -0600)]
Merge PR #31512 into master

* refs/pull/31512/head:
mgr/ssh: allow passing LV to 'orchestrator osd create'

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/dashboard: Fix data point alignment in MDS counters chart (#31288)
Lenz Grimmer [Mon, 11 Nov 2019 13:19:54 +0000 (13:19 +0000)]
mgr/dashboard: Fix data point alignment in MDS counters chart (#31288)

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31519 from votdev/fix_ssh_vagrant
Sebastian Wagner [Mon, 11 Nov 2019 13:00:24 +0000 (14:00 +0100)]
Merge pull request #31519 from votdev/fix_ssh_vagrant

mgr/ssh: Install SSH public key in Vagrantfile box fails

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/ssh: Fix various Python issues. 31524/head
Volker Theile [Mon, 11 Nov 2019 10:52:35 +0000 (11:52 +0100)]
mgr/ssh: Fix various Python issues.

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: RBD tests must use pools with power-of-two pg_n… (#31490)
Lenz Grimmer [Mon, 11 Nov 2019 09:58:39 +0000 (09:58 +0000)]
mgr/dashboard: RBD tests must use pools with power-of-two pg_n… (#31490)

mgr/dashboard: RBD tests must use pools with power-of-two pg_num

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/ssh: Install SSH public key in Vagrantfile box fails 31519/head
Volker Theile [Mon, 11 Nov 2019 09:15:18 +0000 (10:15 +0100)]
mgr/ssh: Install SSH public key in Vagrantfile box fails

The current implementation to copy the host users SSH public key into the Vagrant box does not work with Vagrant 2.2.6.

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31419 from smithfarm/wip-cbs-5
Nathan Cutler [Mon, 11 Nov 2019 08:31:24 +0000 (09:31 +0100)]
Merge pull request #31419 from smithfarm/wip-cbs-5

ceph-backport.sh: guess component with --existing-pr

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoAdd chown ceph:ceph for /tmp/ceph.mon.keyring 31452/head
oneoneonepig [Thu, 7 Nov 2019 05:01:53 +0000 (13:01 +0800)]
Add chown ceph:ceph for /tmp/ceph.mon.keyring

The keyring will be 600 by default with the owner of the current user who issues the command, which will make command "sudo -u ceph ceph-mon --mkfs" fail since the user "ceph" don't have access to the keyring file.
Because of that, the mon data directory won't have keyring and when "sudo systemctl start ceph-mon" it will show error "unable to read magic from mon data"

Signed-off-by: Jeffrey Chu <peihuachu1112@gmail.com>
5 years agoMerge pull request #31271 from ivancich/wip-fix-cancel-bucket-reshard
J. Eric Ivancich [Sun, 10 Nov 2019 18:16:49 +0000 (13:16 -0500)]
Merge pull request #31271 from ivancich/wip-fix-cancel-bucket-reshard

rgw: allow reshard log entries for non-existent buckets to be cancelled

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge pull request #31492 from jan--f/c-v-add-part-size
Jan Fajerski [Sun, 10 Nov 2019 16:25:26 +0000 (17:25 +0100)]
Merge pull request #31492 from jan--f/c-v-add-part-size

ceph-volume: add proper size attribute to partitions

5 years agomgr/ssh: allow passing LV to 'orchestrator osd create' 31512/head
Sage Weil [Sun, 10 Nov 2019 15:08:56 +0000 (09:08 -0600)]
mgr/ssh: allow passing LV to 'orchestrator osd create'

In this case,

 ceph orchestrator osd create smithi009:/dev/vg_nvme/lv_1

produced

    "0": [
        {
            "devices": [
                "/dev/nvme0n1"
            ],
            "lv_name": "lv_1",
            "lv_path": "/dev/vg_nvme/lv_1",
            "lv_size": "89.40g",
            "lv_tags": "ceph.block_device=/dev/vg_nvme/lv_1,ceph.block_uuid=a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l,ceph.cephx_lockbox_secret=,ceph.cluster_fsid=5d6d2c1c-0362-11ea-825a-001a4aab830c,ceph.cluster_name=ceph,ceph.crush_device_class=None,ceph.encrypted=0,ceph.osd_fsid=04175a6e-55e7-4244-b683-79da76f723af,ceph.osd_id=0,ceph.type=block,ceph.vdo=0",
            "lv_uuid": "a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l",
            "name": "lv_1",
            "path": "/dev/vg_nvme/lv_1",
            "tags": {
                "ceph.block_device": "/dev/vg_nvme/lv_1",
                "ceph.block_uuid": "a1vfDi-0jor-VEPK-DZVd-K90y-cqG1-QoXr9l",
                "ceph.cephx_lockbox_secret": "",
                "ceph.cluster_fsid": "5d6d2c1c-0362-11ea-825a-001a4aab830c",
                "ceph.cluster_name": "ceph",
                "ceph.crush_device_class": "None",
                "ceph.encrypted": "0",
                "ceph.osd_fsid": "04175a6e-55e7-4244-b683-79da76f723af",
                "ceph.osd_id": "0",
                "ceph.type": "block",
                "ceph.vdo": "0"
            },
            "type": "block",
            "vg_name": "vg_nvme"
        }
    ],

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #30853 from ivancich/wip-tune-sharded-bucket-listing
J. Eric Ivancich [Sun, 10 Nov 2019 05:07:15 +0000 (00:07 -0500)]
Merge pull request #30853 from ivancich/wip-tune-sharded-bucket-listing

rgw: reduce per-shard entry count during ordered bucket listing

5 years agoMerge pull request #31323 from ivancich/wip-autoclean-reshard-long-entries
J. Eric Ivancich [Sun, 10 Nov 2019 05:06:21 +0000 (00:06 -0500)]
Merge pull request #31323 from ivancich/wip-autoclean-reshard-long-entries

rgw: auto-clean reshard queue entries for non-existent buckets

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
5 years agoMerge PR #31505 into master
Sage Weil [Sun, 10 Nov 2019 02:38:49 +0000 (20:38 -0600)]
Merge PR #31505 into master

* refs/pull/31505/head:
mgr/ssh: take IP, CIDR, or addrvec for new mon(s)

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31507 into master
Sage Weil [Sun, 10 Nov 2019 02:38:35 +0000 (20:38 -0600)]
Merge PR #31507 into master

* refs/pull/31507/head:
ceph-daemon: ceph/daemon-base:latest-master-devel

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-mon: bind to public_addrv if set (before public_addr or public_network) 31501/head
Sage Weil [Fri, 8 Nov 2019 22:35:28 +0000 (16:35 -0600)]
ceph-mon: bind to public_addrv if set (before public_addr or public_network)

This lets you specify a precise addrvec for the monitor to bind to,
instead of inferring a v1 or v2 address from the port number, or assuming
both with default ports, or v2 only with an unrecognized port.

I unfortunately don't quite remember why I didn't make public_addr a
ADDRVEC option way back in nautilus--I only remmeber that it was going to
cause problems.  Adding a separate addrv option here is safe.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agocommon/options: add public_addrv
Sage Weil [Fri, 8 Nov 2019 22:29:50 +0000 (16:29 -0600)]
common/options: add public_addrv

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31474 into master
Sage Weil [Sat, 9 Nov 2019 21:39:19 +0000 (15:39 -0600)]
Merge PR #31474 into master

* refs/pull/31474/head:
mgr/devicehealth: ensure we don't store empty objects

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoceph-daemon: ceph/daemon-base:latest-master-devel 31507/head
Sage Weil [Sat, 9 Nov 2019 14:01:37 +0000 (08:01 -0600)]
ceph-daemon: ceph/daemon-base:latest-master-devel

The -devel one rebuilds daily, while latest-master rebuilds when
ceph-container.git changes.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agorgw: reduce per-shard entry count during ordered bucket listing 30853/head
J. Eric Ivancich [Mon, 14 Oct 2019 20:21:35 +0000 (16:21 -0400)]
rgw: reduce per-shard entry count during ordered bucket listing

Currently, if a client requests the 1000 next entries from a bucket,
each bucket index shard will receive a request for the 1000 next
entries. When there are hundreds, thousands, or tens of thousands of
bucket index shards, this results in a huge amplification of the
request, even though only 1000 entries will be returned.

These changes reduce the per-bucket index shard requests. These also
allow re-requests in edge cases where all of one shard's returned
entries are consumed. Finally these changes improve the determination
of whether the resulting list is truncated.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge PR #31498 into master
Sage Weil [Sat, 9 Nov 2019 04:40:38 +0000 (22:40 -0600)]
Merge PR #31498 into master

* refs/pull/31498/head:
ceph-daemon: customize the bash prompt for shell + enter

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/ssh: take IP, CIDR, or addrvec for new mon(s) 31505/head
Sage Weil [Sat, 9 Nov 2019 04:39:10 +0000 (22:39 -0600)]
mgr/ssh: take IP, CIDR, or addrvec for new mon(s)

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31499 into master
Sage Weil [Sat, 9 Nov 2019 04:37:39 +0000 (22:37 -0600)]
Merge PR #31499 into master

* refs/pull/31499/head:
ceph-daemon: the 'ceph' command may not be installed

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: the 'ceph' command may not be installed 31499/head
Sage Weil [Fri, 8 Nov 2019 21:36:49 +0000 (15:36 -0600)]
ceph-daemon: the 'ceph' command may not be installed

...even though there are legacy data dirs in /var/lib/ceph.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31500 into master
Sage Weil [Sat, 9 Nov 2019 03:12:13 +0000 (21:12 -0600)]
Merge PR #31500 into master

* refs/pull/31500/head:
ceph-daemon: set ssh public identity

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #31472 into master
Sage Weil [Fri, 8 Nov 2019 23:33:40 +0000 (17:33 -0600)]
Merge PR #31472 into master

* refs/pull/31472/head:
mon/MonMap: encode (more) valid compat monmap when we have v2-only addrs

Reviewed-by: Xiaoxi Chen <superdebuger@gmail.com>
5 years agoMerge PR #31471 into master
Sage Weil [Fri, 8 Nov 2019 22:46:02 +0000 (16:46 -0600)]
Merge PR #31471 into master

* refs/pull/31471/head:
mgr/DaemonServer: warn when we reject reports

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agocommon/options: fix ADDRVEC parsing
Sage Weil [Fri, 8 Nov 2019 22:29:35 +0000 (16:29 -0600)]
common/options: fix ADDRVEC parsing

We never actually had any of these yet.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: support --mon-addrv for deploy subcommand
Sage Weil [Fri, 8 Nov 2019 22:11:19 +0000 (16:11 -0600)]
ceph-daemon: support --mon-addrv for deploy subcommand

This maps directly to the public_addrv option.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: set ssh public identity 31500/head
Sage Weil [Fri, 8 Nov 2019 21:50:02 +0000 (15:50 -0600)]
ceph-daemon: set ssh public identity

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31421 from alfredodeza/wip-bz1768523
Alfredo Deza [Fri, 8 Nov 2019 21:36:36 +0000 (16:36 -0500)]
Merge pull request #31421 from alfredodeza/wip-bz1768523

ceph-volume: allow to skip restorecon calls

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastien Han <shan@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
5 years agoceph-daemon: customize the bash prompt for shell + enter 31498/head
Sage Weil [Fri, 8 Nov 2019 20:17:17 +0000 (14:17 -0600)]
ceph-daemon: customize the bash prompt for shell + enter

[ceph: root@gnit /]#

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31493 into master
Sage Weil [Fri, 8 Nov 2019 19:28:45 +0000 (13:28 -0600)]
Merge PR #31493 into master

* refs/pull/31493/head:
ceph-daemon: 'profile ...' not 'allow profile ...'
mgr/ssh: 'profile ...' not 'allow profile ...'
mgr/orchestrator_cli: rearrange things a bit
doc/mgr/orchestrator_cli: remove irrelevant line
mgr/ssh: learn to deploy rbd-mirror daemons
mgr/orchestrator: add rbd-mirror commands and hooks
ceph-daemon: learn to deploy rbd-mirror daemon
mgr/ssh: handle lack of node hints more gracefully
mgr/ssh: factor out update_{rgw,mds} into common helper
mgr/ssh: fix update_rgw, update_mgr

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #30890 into master
Patrick Donnelly [Fri, 8 Nov 2019 18:43:46 +0000 (10:43 -0800)]
Merge PR #30890 into master

* refs/pull/30890/head:
mgr: invoke plugin shutdown on SIG{TERM,INT} signals.
mgr/volumes: guard volume delete by waiting for pending ops
mgr/volumes: cleanup libcephfs handles when stopping
Revert "qa/suites/rados/mgr/tasks/module_selftest: whitelist mgr client getting backlisted"

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31115 into master
Patrick Donnelly [Fri, 8 Nov 2019 18:41:47 +0000 (10:41 -0800)]
Merge PR #31115 into master

* refs/pull/31115/head:
mds: Reorganize class members in MDSTableClient header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31400 into master
Patrick Donnelly [Fri, 8 Nov 2019 18:06:08 +0000 (10:06 -0800)]
Merge PR #31400 into master

* refs/pull/31400/head:
mds: establish session with mgr only after added to FSMap
mds: do not register as a service daemon
mds: do not try to diagnose cause of MDSMap removal
mds: fix handling of initial MDS states
mds: remove unnecessary const qualifier
mds: cleanup type decl and map iteration
mds: define stream operator for mds_info_t

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agomds: establish session with mgr only after added to FSMap 31400/head
Patrick Donnelly [Wed, 6 Nov 2019 03:51:17 +0000 (19:51 -0800)]
mds: establish session with mgr only after added to FSMap

Note that we now sub to the mgrmap after init because the MgrClient
connection to the mgr is driven by receipt of the MgrMap.

This is important so that the MDS does not have metadata with the mgr
when the mons are ignoring the MDS otherwise due to CompatSet
incompatibilities.

Fixes: https://tracker.ceph.com/issues/41538
Fixes: https://tracker.ceph.com/issues/42635
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: do not register as a service daemon
Patrick Donnelly [Thu, 7 Nov 2019 07:07:20 +0000 (23:07 -0800)]
mds: do not register as a service daemon

This commit undoes the service daemon registration for the MDS. It doesn't look
absolutely necessary and it causes the MDS to be listed twice in the `ceph
versions` output:

    $ ceph versions
        ...
        "mds": {
            "ceph version v15.0.0-6915-g0143b904676 (0143b9046763ea1801efa8358a0c033ec862cea9) octopus (dev)": 3
        },
        "mds": {
            "unknown": 3
        },
        "overall": {
            "ceph version v15.0.0-6915-g0143b904676 (0143b9046763ea1801efa8358a0c033ec862cea9) octopus (dev)": 10,
            "unknown": 3
        }

Fixing that requires looking for duplicates or ignoring MDSs in the
service daemons when the mon processes `ceph versions`. I have a feeling
that it wasn't actually designed to be used by the MDS this way however.
Additionally, the reason for "unknown" version is because the metadata
sent to the mgr does not include "ceph_version".

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: do not try to diagnose cause of MDSMap removal
Patrick Donnelly [Wed, 6 Nov 2019 08:26:51 +0000 (00:26 -0800)]
mds: do not try to diagnose cause of MDSMap removal

The Monitors send an empty MDSMap to an MDS it is removing. The MDS
can't diagnose the cause. Instead suggest looking at the cluster/monitor
logs.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: fix handling of initial MDS states
Patrick Donnelly [Wed, 6 Nov 2019 03:39:59 +0000 (19:39 -0800)]
mds: fix handling of initial MDS states

Few things here:

- Make explicit the check for getting removed from the MDSMap. This was
  only done before by checking if MDS held a rank which does not check the
  case where a standby is removed from the FSMap.

- Use mds_info_t::dump to simplify various debug output.

- Add a few sanity asserts for invalid state transitions.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: remove unnecessary const qualifier
Patrick Donnelly [Wed, 6 Nov 2019 04:42:01 +0000 (20:42 -0800)]
mds: remove unnecessary const qualifier

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: cleanup type decl and map iteration
Patrick Donnelly [Wed, 6 Nov 2019 03:37:19 +0000 (19:37 -0800)]
mds: cleanup type decl and map iteration

This is a trivial refactor.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomds: define stream operator for mds_info_t
Patrick Donnelly [Wed, 6 Nov 2019 03:34:41 +0000 (19:34 -0800)]
mds: define stream operator for mds_info_t

This also cleans up the output to be more readable/useful in debug
output.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #29437 into master
Sage Weil [Fri, 8 Nov 2019 17:49:00 +0000 (11:49 -0600)]
Merge PR #29437 into master

* refs/pull/29437/head:
mgr/diskprediction_local: Reverted dependencies, added HGST models
mgr/diskprediction_local: Updated dependencies in ceph.spec.in, debian/control to match requirements.txt
mgr/diskprediction_local: Updated Red Hat developed prediction model. Updated module options to choose between Red Hat and ProphetStor models.
mgr/diskprediction_local: Updated prediction models to use only supported python packages.
mgr/diskprediction_local: Replaced old models and updated predictor.

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: 'profile ...' not 'allow profile ...' 31493/head
Sage Weil [Fri, 8 Nov 2019 17:29:29 +0000 (11:29 -0600)]
ceph-daemon: 'profile ...' not 'allow profile ...'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: 'profile ...' not 'allow profile ...'
Sage Weil [Fri, 8 Nov 2019 17:29:12 +0000 (11:29 -0600)]
mgr/ssh: 'profile ...' not 'allow profile ...'

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator_cli: rearrange things a bit
Sage Weil [Fri, 8 Nov 2019 17:26:49 +0000 (11:26 -0600)]
mgr/orchestrator_cli: rearrange things a bit

Group services together

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/mgr/orchestrator_cli: remove irrelevant line
Sage Weil [Fri, 8 Nov 2019 17:12:17 +0000 (11:12 -0600)]
doc/mgr/orchestrator_cli: remove irrelevant line

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: learn to deploy rbd-mirror daemons
Sage Weil [Fri, 8 Nov 2019 17:04:27 +0000 (11:04 -0600)]
mgr/ssh: learn to deploy rbd-mirror daemons

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/orchestrator: add rbd-mirror commands and hooks
Sage Weil [Fri, 8 Nov 2019 16:12:27 +0000 (10:12 -0600)]
mgr/orchestrator: add rbd-mirror commands and hooks

This is somewhat different from the other services in that the name is
basically unused: we have a single pool of rbd-mirror daemons for the
whole cluster.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-volume: add proper size attribute to partitions 31492/head
Jan Fajerski [Fri, 8 Nov 2019 16:54:00 +0000 (17:54 +0100)]
ceph-volume: add proper size attribute to partitions

Fixes: https://tracker.ceph.com/issues/42710
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoceph-daemon: learn to deploy rbd-mirror daemon
Sage Weil [Fri, 8 Nov 2019 16:46:45 +0000 (10:46 -0600)]
ceph-daemon: learn to deploy rbd-mirror daemon

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: handle lack of node hints more gracefully 31488/head
Sage Weil [Fri, 8 Nov 2019 16:29:17 +0000 (10:29 -0600)]
mgr/ssh: handle lack of node hints more gracefully

RuntimeError: Remote method threw exception: TypeError: object of type 'NoneType' has no len()

isn't friendly

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: factor out update_{rgw,mds} into common helper
Sage Weil [Fri, 8 Nov 2019 15:26:44 +0000 (09:26 -0600)]
mgr/ssh: factor out update_{rgw,mds} into common helper

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/ssh: fix update_rgw, update_mgr
Sage Weil [Fri, 8 Nov 2019 15:23:49 +0000 (09:23 -0600)]
mgr/ssh: fix update_rgw, update_mgr

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31467 into master
Sage Weil [Fri, 8 Nov 2019 16:10:46 +0000 (10:10 -0600)]
Merge PR #31467 into master

* refs/pull/31467/head:
ceph-daemon: Add basic unittest infrastructure and cmake integration
ceph-daemon: Move ceph-daemon executable to own directory

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: Add basic unittest infrastructure and cmake integration 31467/head
Thomas Bechtold [Thu, 7 Nov 2019 16:47:02 +0000 (17:47 +0100)]
ceph-daemon: Add basic unittest infrastructure and cmake integration

To be able to write unittests, add a tox.ini (for testing in venvs)
and a first single test case as example.
Tests can be executed with eg:

$ tox

Or by running the usual:

$ ./run-make-check.sh

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agoceph-daemon: Move ceph-daemon executable to own directory
Thomas Bechtold [Thu, 7 Nov 2019 15:41:23 +0000 (16:41 +0100)]
ceph-daemon: Move ceph-daemon executable to own directory

Moving ceph-daemon into src/ceph-daemon/ makes it simpler to add extra
code (eg. tox.ini, README, unittests, ...) specific to ceph-daemon.
That way related files are in a single directory.

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
5 years agomgr/dashboard: RBD tests must use pools with power-of-two pg_num 31490/head
Ricardo Marques [Fri, 8 Nov 2019 15:33:18 +0000 (15:33 +0000)]
mgr/dashboard: RBD tests must use pools with power-of-two pg_num

Fixes: https://tracker.ceph.com/issues/42709
Signed-off-by: Ricardo Marques <rimarques@suse.com>
5 years agoMerge PR #31477 into master
Sage Weil [Fri, 8 Nov 2019 15:15:50 +0000 (09:15 -0600)]
Merge PR #31477 into master

* refs/pull/31477/head:
ceph-daemon: unmount osd data dir during `adopt`

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-backport.sh/interactive_setup: abort if Step 3 fails 31419/head
Nathan Cutler [Fri, 8 Nov 2019 14:14:10 +0000 (15:14 +0100)]
ceph-backport.sh/interactive_setup: abort if Step 3 fails

Fixes confusing error message reported by a user:

Setup step 3 of 4 - remote repos
---------------------------------------------------------------------
Searching "git remote -v" for remote repos

ceph-backport.sh: ERROR: Cannot auto-determine fork remote
ceph-backport.sh: (Could not find GitHub user callithea's fork of ceph/ceph in
"git remote -v")
ceph-backport.sh: ERROR: (internal error) fork_remote not set, even after
completing Steps 1-3 of interactive setup
ceph-backport.sh: This could be reported as a bug!

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge PR #31478 into master
Sage Weil [Fri, 8 Nov 2019 13:22:59 +0000 (07:22 -0600)]
Merge PR #31478 into master

* refs/pull/31478/head:
ceph-daemon: add --skip-pull
ceph-daemon: add explicit pull at bootstrap start

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #31177 into master
Sage Weil [Fri, 8 Nov 2019 13:22:05 +0000 (07:22 -0600)]
Merge PR #31177 into master

* refs/pull/31177/head:
doc: update with zone bucket and straw2 addition

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31476 into master
Sage Weil [Fri, 8 Nov 2019 13:11:20 +0000 (07:11 -0600)]
Merge PR #31476 into master

* refs/pull/31476/head:
ceph-daemon: make mon container privileged

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
5 years agoceph-daemon: add --skip-pull 31478/head
Sage Weil [Fri, 8 Nov 2019 13:10:53 +0000 (07:10 -0600)]
ceph-daemon: add --skip-pull

It occurs to me there might be cases where the user *doesn't* want to pull
the latest image (e.g., because it is a partially disconnected enviroment,
and they know the image is already in the local registry).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31464 into master
Sage Weil [Fri, 8 Nov 2019 13:08:46 +0000 (07:08 -0600)]
Merge PR #31464 into master

* refs/pull/31464/head:
ceph-daemon: help users find the shell/CLI too
ceph-daemon: enable the dashboard during bootstrap
ceph-daemon: add CLI helper to bootstrap

Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Kai Wagner <kwagner@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #31479 from rishabh-d-dave/cv-dd-sync
Jan Fajerski [Fri, 8 Nov 2019 13:01:29 +0000 (14:01 +0100)]
Merge pull request #31479 from rishabh-d-dave/cv-dd-sync

ceph-volume: use fsync for dd command

5 years agoMerge pull request #29041 from jan--f/c-v-too-small-disks-unavailable
Jan Fajerski [Fri, 8 Nov 2019 12:52:45 +0000 (13:52 +0100)]
Merge pull request #29041 from jan--f/c-v-too-small-disks-unavailable

ceph-volume: reject disks smaller then 5GB in inventory

5 years agoMerge pull request #31260 from trociny/wip-42405
Jason Dillaman [Fri, 8 Nov 2019 12:35:41 +0000 (07:35 -0500)]
Merge pull request #31260 from trociny/wip-42405

rbd-mirror: removing non-primary trash snapshot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31188 from zy751713126/rbd_features
Jason Dillaman [Fri, 8 Nov 2019 12:35:05 +0000 (07:35 -0500)]
Merge pull request #31188 from zy751713126/rbd_features

librbd: features converting bitmask and string API

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31457 from jschmid1/ssh_orch_dev_env
Sebastian Wagner [Fri, 8 Nov 2019 12:20:49 +0000 (13:20 +0100)]
Merge pull request #31457 from jschmid1/ssh_orch_dev_env

mgr/ssh: update ssh-orch bootstrap guide (Vagrantfile & docs)

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: do not show non-pool data in pool details (#31456)
Lenz Grimmer [Fri, 8 Nov 2019 11:36:22 +0000 (11:36 +0000)]
mgr/dashboard: do not show non-pool data in pool details (#31456)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Fix grafana dashboards (#31219)
Lenz Grimmer [Fri, 8 Nov 2019 11:08:11 +0000 (11:08 +0000)]
mgr/dashboard: Fix grafana dashboards (#31219)

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #31189 from bk201/wip-42075
Lenz Grimmer [Fri, 8 Nov 2019 10:58:38 +0000 (10:58 +0000)]
Merge pull request #31189 from bk201/wip-42075

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31021 from sebastian-philipp/python-common-make-drive-selection
Sebastian Wagner [Fri, 8 Nov 2019 10:20:50 +0000 (11:20 +0100)]
Merge pull request #31021 from sebastian-philipp/python-common-make-drive-selection

python-common: Add drive selection

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoceph-backport.sh: increment version number
Nathan Cutler [Tue, 5 Nov 2019 15:48:53 +0000 (16:48 +0100)]
ceph-backport.sh: increment version number

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-backport.sh: fix interactive setup brokenness
Nathan Cutler [Thu, 7 Nov 2019 17:14:29 +0000 (18:14 +0100)]
ceph-backport.sh: fix interactive setup brokenness

A user did "ceph-backport.sh --setup" and entered the interactive setup routine.
After entering a valid GitHub personal access token, she got the following
message:

ceph-backport.sh: my GitHub username is callithea
ceph-backport.sh: You must provide a valid GitHub personal access token
ceph-backport.sh: ERROR: problem detected in your setup
ceph-backport.sh: Run "ceph-backport.sh --setup" to fix

and the script aborted. This commit fixes the issue.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-backport.sh: allow cherry-picking from non-master (via --force)
Nathan Cutler [Wed, 6 Nov 2019 13:29:28 +0000 (14:29 +0100)]
ceph-backport.sh: allow cherry-picking from non-master (via --force)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-backport.sh --existing-pr: do not clobber existing labels
Nathan Cutler [Tue, 5 Nov 2019 17:55:32 +0000 (18:55 +0100)]
ceph-backport.sh --existing-pr: do not clobber existing labels

Fixes: https://tracker.ceph.com/issues/42657
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-backport.sh: --existing-pr ... --force should update PR body
Nathan Cutler [Tue, 5 Nov 2019 15:51:31 +0000 (16:51 +0100)]
ceph-backport.sh: --existing-pr ... --force should update PR body

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-backport.sh: guess component with --existing-pr
Nathan Cutler [Tue, 5 Nov 2019 15:45:36 +0000 (16:45 +0100)]
ceph-backport.sh: guess component with --existing-pr

Fixes: https://tracker.ceph.com/issues/42656
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoceph-volume: use fsync for dd command 31479/head
Rishabh Dave [Fri, 8 Nov 2019 07:04:27 +0000 (12:34 +0530)]
ceph-volume: use fsync for dd command

fsync makes sure that data and metadata is actually written to device
being zapped before finishing.

Fixes: https://tracker.ceph.com/issues/39156
Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoceph-daemon: add explicit pull at bootstrap start
Sage Weil [Fri, 8 Nov 2019 03:43:37 +0000 (21:43 -0600)]
ceph-daemon: add explicit pull at bootstrap start

This is less confusing for users since the pull can be slow and the
uid/gid check is a weird thing to hang on for a long time.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: unmount osd data dir during `adopt` 31477/head
Michael Fritch [Fri, 8 Nov 2019 00:13:18 +0000 (17:13 -0700)]
ceph-daemon: unmount osd data dir during `adopt`

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-daemon: make mon container privileged 31476/head
Sage Weil [Thu, 7 Nov 2019 23:14:52 +0000 (17:14 -0600)]
ceph-daemon: make mon container privileged

libudev needs to be privileged in order to query the underlying hardware
devices, as reported by the 'ceph device ...' command set, and to scrape
smart metrics, etc.

Signed-off-by: Sage Weil <sage@redhat.com>