Commit Graph

104083 Commits

Author SHA1 Message Date
Sage Weil
c35b2c3a20 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>
2019-11-11 18:09:29 -06:00
Patrick Donnelly
cadc79ba7e
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>
2019-11-11 15:21:30 -08:00
Sage Weil
b1f4b2cc27 Merge PR #31540 into master
* refs/pull/31540/head:
	ceph-daemon: make ps1 a raw string

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-11 15:50:55 -06:00
Michael Fritch
ebcc1b5e71
ceph-daemon: make ps1 a raw string
python3 interprets '\u' as a unicode escape

Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-11 14:10:56 -07:00
Patrick Donnelly
8971dd7cdc
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>
2019-11-11 12:21:34 -08:00
Patrick Donnelly
452a5136c7
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>
2019-11-11 12:03:21 -08:00
Patrick Donnelly
23236901b4
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>
2019-11-11 10:45:10 -08:00
Patrick Donnelly
aab5c7a2ad
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>
2019-11-11 10:41:24 -08:00
Sage Weil
ee8110901f 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>
2019-11-11 12:14:35 -06:00
Sage Weil
bc4c323163 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>
2019-11-11 11:05:00 -06:00
Sage Weil
c3967801bc ceph-daemon: ls: add --no-detail
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-11 11:04:22 -06:00
Sage Weil
0f9d1b2756 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>
2019-11-11 10:15:45 -06:00
Sage Weil
de290d5473 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>
2019-11-11 10:15:19 -06:00
Lenz Grimmer
825979c5c2
mgr/dashboard: Improve position of MDS chart tooltip (#31368)
mgr/dashboard: Improve position of MDS chart tooltip

Reviewed-by: Volker Theile <vtheile@suse.com>
2019-11-11 15:29:11 +00:00
Sage Weil
427350e3d6 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>
2019-11-11 09:28:01 -06:00
Lenz Grimmer
635cd8b750
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>
2019-11-11 13:19:54 +00:00
Sebastian Wagner
7f01793881
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>
2019-11-11 14:00:24 +01:00
Volker Theile
d50d5be101 mgr/ssh: Fix various Python issues.
Signed-off-by: Volker Theile <vtheile@suse.com>
2019-11-11 11:52:35 +01:00
Lenz Grimmer
ec70182320
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>
2019-11-11 09:58:39 +00:00
Volker Theile
8593c7e259 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>
2019-11-11 10:26:21 +01:00
Nathan Cutler
b55f6d861f
Merge pull request #31419 from smithfarm/wip-cbs-5
ceph-backport.sh: guess component with --existing-pr

Reviewed-by: Laura Paduano <lpaduano@suse.com>
2019-11-11 09:31:24 +01:00
oneoneonepig
ef0f78971d 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>
2019-11-11 04:50:49 +00:00
J. Eric Ivancich
c619ed809c
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>
2019-11-10 13:16:49 -05:00
Jan Fajerski
2615bf700d
Merge pull request #31492 from jan--f/c-v-add-part-size
ceph-volume: add proper size attribute to partitions
2019-11-10 17:25:26 +01:00
Sage Weil
8c1dd82f38 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>
2019-11-10 09:08:56 -06:00
J. Eric Ivancich
7715cd4b6a
Merge pull request #30853 from ivancich/wip-tune-sharded-bucket-listing
rgw: reduce per-shard entry count during ordered bucket listing
2019-11-10 00:07:15 -05:00
J. Eric Ivancich
b30c452cac
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>
2019-11-10 00:06:21 -05:00
Sage Weil
35512c17c2 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>
2019-11-09 20:38:49 -06:00
Sage Weil
2e9edae1a1 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>
2019-11-09 20:38:35 -06:00
Sage Weil
938c528395 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>
2019-11-09 15:41:21 -06:00
Sage Weil
4ef7c2504b common/options: add public_addrv
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-09 15:41:21 -06:00
Sage Weil
489ca8cf5d 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>
2019-11-09 15:39:19 -06:00
Sage Weil
9f0a4e74e6 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>
2019-11-09 08:01:37 -06:00
J. Eric Ivancich
729c0ba136 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>
2019-11-09 00:17:43 -05:00
Sage Weil
b545ea2063 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>
2019-11-08 22:40:38 -06:00
Sage Weil
fc2e765079 mgr/ssh: take IP, CIDR, or addrvec for new mon(s)
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-08 22:39:45 -06:00
Sage Weil
faf0b1945b 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>
2019-11-08 22:37:39 -06:00
Sage Weil
55f5550ded 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>
2019-11-08 21:14:36 -06:00
Sage Weil
b885dd1bf2 Merge PR #31500 into master
* refs/pull/31500/head:
	ceph-daemon: set ssh public identity

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-08 21:12:13 -06:00
Sage Weil
4f32077ae4 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>
2019-11-08 17:33:41 -06:00
Sage Weil
df238aebe6 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>
2019-11-08 16:46:02 -06:00
Sage Weil
ef4bad75da common/options: fix ADDRVEC parsing
We never actually had any of these yet.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-08 16:29:35 -06:00
Sage Weil
5fc6d191bf ceph-daemon: support --mon-addrv for deploy subcommand
This maps directly to the public_addrv option.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-08 16:22:11 -06:00
Sage Weil
10a04dead9 ceph-daemon: set ssh public identity
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-08 15:50:19 -06:00
Alfredo Deza
2c49134d0c
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>
2019-11-08 16:36:36 -05:00
Sage Weil
bab40e2669 ceph-daemon: customize the bash prompt for shell + enter
[ceph: root@gnit /]#

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-08 14:17:17 -06:00
Sage Weil
05f5f0dd7f 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>
2019-11-08 13:28:45 -06:00
Patrick Donnelly
19a08227fb
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>
2019-11-08 10:43:46 -08:00
Patrick Donnelly
a12b9a21e5
Merge PR #31115 into master
* refs/pull/31115/head:
	mds: Reorganize class members in MDSTableClient header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-08 10:41:47 -08:00
Patrick Donnelly
1b4e210969
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>
2019-11-08 10:06:08 -08:00