]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoceph-daemon: don't deref symlinks during chown 32137/head
Michael Fritch [Tue, 10 Dec 2019 04:42:43 +0000 (21:42 -0700)]
ceph-daemon: don't deref symlinks during chown

- consolidate move/copy loop logic
- chown the actual file and not the symlink

Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #32124 into master
Patrick Donnelly [Tue, 10 Dec 2019 03:52:41 +0000 (19:52 -0800)]
Merge PR #32124 into master

* refs/pull/32124/head:
doc/cephfs/disaster-recovery-experts: Add link for scrub and note for scrub_path

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #27894 into master
Patrick Donnelly [Tue, 10 Dec 2019 01:05:52 +0000 (17:05 -0800)]
Merge PR #27894 into master

* refs/pull/27894/head:
cephfs-shell: Add default list to df
cephfs-shell: Add tests for df command
cephfs-shell: Fix 'df' command errors

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32131 into master
Patrick Donnelly [Tue, 10 Dec 2019 00:39:36 +0000 (16:39 -0800)]
Merge PR #32131 into master

* refs/pull/32131/head:
codeowners: Add ceph2.py to @ceph/orchestrators

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32038 into master
Patrick Donnelly [Tue, 10 Dec 2019 00:36:59 +0000 (16:36 -0800)]
Merge PR #32038 into master

* refs/pull/32038/head:
doc: reorganize CephFS landing page and ToC

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge PR #32098 into master
Sage Weil [Tue, 10 Dec 2019 00:29:41 +0000 (18:29 -0600)]
Merge PR #32098 into master

* refs/pull/32098/head:
ceph-daemon: py2: tolerate whitespace before config key name

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge pull request #32037 from smithfarm/wip-43152-workaround
Nathan Cutler [Mon, 9 Dec 2019 23:42:16 +0000 (00:42 +0100)]
Merge pull request #32037 from smithfarm/wip-43152-workaround

build/ops: make-dist: default to no dashboard frontend build parallelism

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #32088 from idryomov/wip-krbd-exclusive-lock-fixups
Ilya Dryomov [Mon, 9 Dec 2019 21:59:13 +0000 (22:59 +0100)]
Merge pull request #32088 from idryomov/wip-krbd-exclusive-lock-fixups

qa: krbd_exclusive_option.sh: update for recent kernel changes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge PR #32046 into master
Sage Weil [Mon, 9 Dec 2019 21:34:57 +0000 (15:34 -0600)]
Merge PR #32046 into master

* refs/pull/32046/head:
mgr/DaemonServer: fix 'osd ok-to-stop' for EC pools

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #31489 into master
Sage Weil [Mon, 9 Dec 2019 20:46:39 +0000 (14:46 -0600)]
Merge PR #31489 into master

* refs/pull/31489/head:
pybind/rados: add WriteOp::writesame() and test WriteOp::writesame()
pybind/rados: add Ioctx::aio_writesame() and test Ioctx::aio_writesame()
pybind/rados: add Ioctx::writesame() and test Ioctx::writesame()

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge PR #29214 into master
Sage Weil [Mon, 9 Dec 2019 20:46:09 +0000 (14:46 -0600)]
Merge PR #29214 into master

* refs/pull/29214/head:
mgr: templatize/generalize metrics collection interface

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32102 into master
Sage Weil [Mon, 9 Dec 2019 20:44:37 +0000 (14:44 -0600)]
Merge PR #32102 into master

* refs/pull/32102/head:
mgr/diskprediction_local: import scipy early to fix self-test deadlock

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #31794 from dillaman/wip-42889
Jason Dillaman [Mon, 9 Dec 2019 17:47:47 +0000 (12:47 -0500)]
Merge pull request #31794 from dillaman/wip-42889

librbd: disable zero-copy writes by default

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
5 years agoMerge pull request #32105 from junxfl/test1
Jason Dillaman [Mon, 9 Dec 2019 17:37:37 +0000 (12:37 -0500)]
Merge pull request #32105 from junxfl/test1

librbd: fix rbd_open_by_id, rbd_open_by_id_read_only

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #32109 from yehudasa/wip-42868
Daniel Gryniewicz [Mon, 9 Dec 2019 17:23:12 +0000 (12:23 -0500)]
Merge pull request #32109 from yehudasa/wip-42868

rgw: list buckets: don't return buckets if limit=0

5 years agocodeowners: Add ceph2.py to @ceph/orchestrators 32131/head
Sebastian Wagner [Mon, 9 Dec 2019 16:46:57 +0000 (17:46 +0100)]
codeowners: Add ceph2.py to @ceph/orchestrators

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #32053 from votdev/left_align_badges
Lenz Grimmer [Mon, 9 Dec 2019 16:44:56 +0000 (16:44 +0000)]
Merge pull request #32053 from votdev/left_align_badges

mgr/dashboard: Left align badge datatable columns

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #31927 from bk201/wip-43072
Lenz Grimmer [Mon, 9 Dec 2019 16:42:54 +0000 (16:42 +0000)]
Merge pull request #31927 from bk201/wip-43072

mgr/dashboard: hide in-use devices when creating OSDs

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #32084 from votdev/auth_service_observable
Lenz Grimmer [Mon, 9 Dec 2019 16:34:50 +0000 (16:34 +0000)]
Merge pull request #32084 from votdev/auth_service_observable

mgr/dashboard: Use Observable in auth.service

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
5 years agomgr/dashboard: Improve badge column template. (#32026)
Lenz Grimmer [Mon, 9 Dec 2019 16:32:03 +0000 (16:32 +0000)]
mgr/dashboard: Improve badge column template. (#32026)

mgr/dashboard: Improve badge column template.

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge PR #31907 into master
Sage Weil [Mon, 9 Dec 2019 16:30:26 +0000 (10:30 -0600)]
Merge PR #31907 into master

* refs/pull/31907/head:
mgr/dashboard: properly handle a missing rbd-mirror service status
mgr: cull service daemons when the last instance has been removed
mgr: ensure new daemons are properly indexed by hostname

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoqa: kernel.sh: unlock before rolling back 32088/head
Ilya Dryomov [Wed, 4 Dec 2019 18:08:46 +0000 (19:08 +0100)]
qa: kernel.sh: unlock before rolling back

"rbd snap rollback" expects an unlocked image, but we may get there
locked if object map is enabled (or if lock_on_read is specified in
rbd_default_map_options).

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoqa: krbd_exclusive_option.sh: update for recent kernel changes
Ilya Dryomov [Wed, 4 Dec 2019 14:26:54 +0000 (15:26 +0100)]
qa: krbd_exclusive_option.sh: update for recent kernel changes

Since 5.3:
- a plain "rbd map" acquires the lock, so it's not different from
  "rbd map -o exclusive" in this regard
- if the lock is held by the exclusive peer, I/O is failed right away
  instead of blocking
- lock_timeout option is respected only by "rbd map" and not by I/O

Since 5.5:
- if the mapping is read-only, the lock isn't acquired

Added blacklisting test case, dropped lock_timeout test case.

Fixes: https://tracker.ceph.com/issues/43127
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
5 years agoMerge PR #32009 into master
Sage Weil [Mon, 9 Dec 2019 14:23:44 +0000 (08:23 -0600)]
Merge PR #32009 into master

* refs/pull/32009/head:
doc: removes kube-helm installation instructions

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agolibrbd: fix rbd_open_by_id, rbd_open_by_id_read_only 32105/head
yangjun [Sun, 8 Dec 2019 01:09:53 +0000 (09:09 +0800)]
librbd: fix rbd_open_by_id, rbd_open_by_id_read_only

These methods incorrectly delete ImageCtx on error, resulting
in double-free heap corruption.

Fixes: https://tracker.ceph.com/issues/43178
Signed-off-by: yangjun <yangjun@cmss.chinamobile.com>
5 years agoMerge PR #31800 into master
Sage Weil [Mon, 9 Dec 2019 13:17:57 +0000 (07:17 -0600)]
Merge PR #31800 into master

* refs/pull/31800/head:
doc: Update commands in bootstrap.rst
Update doc/bootstrap.rst
Update doc/bootstrap.rst
Merge branch 'master' into wip-doc-prompts-update
doc: Update commands in bootstrap.rst

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: py2: tolerate whitespace before config key name 32098/head
Sage Weil [Fri, 6 Dec 2019 21:43:23 +0000 (15:43 -0600)]
ceph-daemon: py2: tolerate whitespace before config key name

The py2 ConfigParser doesn't like whitespace before the config option
name.  (The py3 version doesn't care.)  Filter it out before parsing.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc/cephfs/disaster-recovery-experts: Add link for scrub and note for scrub_path 32124/head
Varsha Rao [Mon, 9 Dec 2019 12:47:41 +0000 (18:17 +0530)]
doc/cephfs/disaster-recovery-experts: Add link for scrub and note for scrub_path

Fixes: https://tracker.ceph.com/issues/22204
Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #32106 from taodd/ceph-volume-fix-env
Jan Fajerski [Mon, 9 Dec 2019 10:46:18 +0000 (11:46 +0100)]
Merge pull request #32106 from taodd/ceph-volume-fix-env

ceph-volume: fix the integer overflow

5 years agomgr/dashboard: add smartctl data as a details tab of a host (#30594)
Lenz Grimmer [Mon, 9 Dec 2019 09:42:23 +0000 (09:42 +0000)]
mgr/dashboard: add smartctl data as a details tab of a host (#30594)

mgr/dashboard: add smartctl data as a details tab of a host

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #29687 into master
Sage Weil [Sun, 8 Dec 2019 21:24:13 +0000 (15:24 -0600)]
Merge PR #29687 into master

* refs/pull/29687/head:
test/store_test: test coverage for anti-spillover framework.
os/bluestore: introduce bluestore_volume_selection_reserved cfg option.
os/bluestore: beautify RocksDBBlueFSVolumeSelector::dump output
os/bluestore: introduce 'bluestore bluefs stats' admin socket command
os/bluestore: implement more intelligent DB volume space managment for BlueFS.
os/kv: add static method to parse RocksDB options
os/bluestore: introduce volume selector abstraction to BlueFS

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32108 into master
Sage Weil [Sun, 8 Dec 2019 19:26:32 +0000 (13:26 -0600)]
Merge PR #32108 into master

* refs/pull/32108/head:
ceph-daemon: remove prepare-host

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoceph-daemon: remove prepare-host 32108/head
Sage Weil [Sun, 8 Dec 2019 05:39:17 +0000 (23:39 -0600)]
ceph-daemon: remove prepare-host

I thought I took this out of the PR but somehow it got merged in... must
have repushed and old branch and not realized.  :/

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #31959 into master
Sage Weil [Sun, 8 Dec 2019 16:15:48 +0000 (10:15 -0600)]
Merge PR #31959 into master

* refs/pull/31959/head:
os/bluestore/BlueStore.cc: set priorities for compression stats

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge PR #31995 into master
Sage Weil [Sun, 8 Dec 2019 16:15:17 +0000 (10:15 -0600)]
Merge PR #31995 into master

* refs/pull/31995/head:
msg/async: No need lock for func _filter_addrs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #32101 into master
Sage Weil [Sun, 8 Dec 2019 16:14:50 +0000 (10:14 -0600)]
Merge PR #32101 into master

* refs/pull/32101/head:
mgr/orchestrator_cli: make rgw rm take realm+zone
qa/tasks/mgr/test_orchestrator_cli: fix rgw add test

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agorgw: list buckets: don't return buckets if limit=0 32109/head
Yehuda Sadeh [Sun, 8 Dec 2019 11:08:46 +0000 (03:08 -0800)]
rgw: list buckets: don't return buckets if limit=0

Fixes: https://tracker.ceph.com/issues/42868
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
5 years agomgr/orchestrator_cli: make rgw rm take realm+zone 32101/head
Sage Weil [Sat, 7 Dec 2019 14:15:17 +0000 (08:15 -0600)]
mgr/orchestrator_cli: make rgw rm take realm+zone

And adjust test accordingly

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-volume: fix the type mismatch, covert the tries and interval to int from string. 32106/head
taodd [Sun, 8 Dec 2019 02:10:59 +0000 (10:10 +0800)]
ceph-volume: fix the type mismatch, covert the tries and interval to int from string.
Fixes: https://tracker.ceph.com/issues/43186
Signed-off-by: dongdong tao <dongdong.tao@canonical.com>
5 years agomgr/diskprediction_local: import scipy early to fix self-test deadlock 32102/head
Sage Weil [Sat, 7 Dec 2019 21:34:59 +0000 (15:34 -0600)]
mgr/diskprediction_local: import scipy early to fix self-test deadlock

We are seeing a hang on centos7 (but not ubuntu 18.04) from

        from .predictor import get_diskfailurepredictor_path

in _predict_life_expentancy.

Doing that same predictor import at the top of the file doesn't help--it
hangs right when the diskpredictor_local module is loaded.  Commenting
out the import scipy in predictor.py avoids the hang.

I'm not sure why, but doing the full scipy import here appears to work
around the problem.

Fixes: https://tracker.ceph.com/issues/42764
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32043 into master
Sage Weil [Sat, 7 Dec 2019 20:43:07 +0000 (14:43 -0600)]
Merge PR #32043 into master

* refs/pull/32043/head:
os/bluestore: default bluestore_block_size 1T -> 100G

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge PR #32044 into master
Sage Weil [Sat, 7 Dec 2019 20:42:49 +0000 (14:42 -0600)]
Merge PR #32044 into master

* refs/pull/32044/head:
mon/OSDMonitor: make memory autotune disable itself if no rocksdb

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge PR #31581 into master
Sage Weil [Sat, 7 Dec 2019 18:35:58 +0000 (12:35 -0600)]
Merge PR #31581 into master

* refs/pull/31581/head:
mon: fix mon_sync_max_payload_size type
mon: cap keys in mon_sync messages
mon/MonitorDBStore: improve get_chunk_tx limits
mon/MonitorDBStore: better size estimation for Transaction

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #32048 into master
Sage Weil [Sat, 7 Dec 2019 18:35:20 +0000 (12:35 -0600)]
Merge PR #32048 into master

* refs/pull/32048/head:
mon/PGMap: use NONE for 'pg ls[-*]' output too

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge PR #32039 into master
Sage Weil [Sat, 7 Dec 2019 18:28:15 +0000 (12:28 -0600)]
Merge PR #32039 into master

* refs/pull/32039/head:
test: Improve races by using kill_daemons which waits for OSDs terminate
test: run-standalone.sh: Only run execs in the subdirectories of qa/standalone
test: Use activate_osd() when restarting OSDs
test: osd-scrub-snaps.sh: Fix race with osd restart and doing a scrub

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoqa/tasks/mgr/test_orchestrator_cli: fix rgw add test
Sage Weil [Sat, 7 Dec 2019 14:14:59 +0000 (08:14 -0600)]
qa/tasks/mgr/test_orchestrator_cli: fix rgw add test

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32010 into master
Sage Weil [Sat, 7 Dec 2019 14:05:49 +0000 (08:05 -0600)]
Merge PR #32010 into master

* refs/pull/32010/head:
mgr/ssh: Add module to static type checking from tox.
mgr/orchestrator: Add mypy static type checking

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32023 into master
Sage Weil [Sat, 7 Dec 2019 14:05:24 +0000 (08:05 -0600)]
Merge PR #32023 into master

* refs/pull/32023/head:
qa/tasks/mgr/test_orchestrator_cli: test with valid network or IP
qa/orchestrator: do not test "mon update 3 host1"

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Joshua Schmid <jschmid@suse.de>
5 years agotest: Improve races by using kill_daemons which waits for OSDs terminate 32039/head
David Zafman [Fri, 6 Dec 2019 20:44:57 +0000 (12:44 -0800)]
test: Improve races by using kill_daemons which waits for OSDs terminate

osd-backfill-space.sh: More sleep time to make sure the backfill gets started

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoqa/tasks/mgr/test_orchestrator_cli: test with valid network or IP 32023/head
Sage Weil [Fri, 6 Dec 2019 21:54:06 +0000 (15:54 -0600)]
qa/tasks/mgr/test_orchestrator_cli: test with valid network or IP

Passing 'network' will fail with

Error EINVAL: Failed to parse host list: '['host1:network', 'host2:network', 'host3:network']': u'network' does not appear to be an IPv4 or IPv6 address

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge PR #32096 into master
Sage Weil [Sat, 7 Dec 2019 03:23:55 +0000 (21:23 -0600)]
Merge PR #32096 into master

* refs/pull/32096/head:
ceph-daemon: fix firewalld error case

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #32097 into master
Sage Weil [Sat, 7 Dec 2019 03:23:43 +0000 (21:23 -0600)]
Merge PR #32097 into master

* refs/pull/32097/head:
ceph-daemon: fix bootstrap ownership of tmp monmap file

Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge PR #32051 into master
Sage Weil [Fri, 6 Dec 2019 22:19:09 +0000 (16:19 -0600)]
Merge PR #32051 into master

* refs/pull/32051/head:
mgr: simply exit on SIGINT or SIGTERM

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoceph-daemon: fix bootstrap ownership of tmp monmap file 32097/head
Sage Weil [Fri, 6 Dec 2019 21:14:31 +0000 (15:14 -0600)]
ceph-daemon: fix bootstrap ownership of tmp monmap file

The file is created with mode 0644 by the ceph:ceph user, but root
cannot write to that.  Instead, create the tmp file owned by root, write
to it, then chown it to user ceph.

Fixes e92929d86dce2297d3e02ec88c6830224aefc061

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoceph-daemon: fix firewalld error case 32096/head
Sage Weil [Fri, 6 Dec 2019 20:20:07 +0000 (14:20 -0600)]
ceph-daemon: fix firewalld error case

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agodoc: reorganize CephFS landing page and ToC 32038/head
Patrick Donnelly [Thu, 5 Dec 2019 17:42:47 +0000 (09:42 -0800)]
doc: reorganize CephFS landing page and ToC

Fixes: https://tracker.ceph.com/issues/42016
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #32021 from falcon78921/wip-doc-43130
Neha Ojha [Fri, 6 Dec 2019 19:52:05 +0000 (11:52 -0800)]
Merge pull request #32021 from falcon78921/wip-doc-43130

doc: fixed broken reference link for Graphviz

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #32017 from dzafman/wip-revert-verify-upmap
David Zafman [Fri, 6 Dec 2019 17:29:40 +0000 (09:29 -0800)]
Merge pull request #32017 from dzafman/wip-revert-verify-upmap

Revert "crush: remove invalid upmap items"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agotest: run-standalone.sh: Only run execs in the subdirectories of qa/standalone
David Zafman [Fri, 6 Dec 2019 17:01:41 +0000 (09:01 -0800)]
test: run-standalone.sh: Only run execs in the subdirectories of qa/standalone

This will ignore scripts placed at the qa/standalone level, though
I'm not sure if we should be putting any tests there.  It does
allow support scripts present like ceph-helper.sh without modifying
run-standalone.sh to ignore it.

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #31589 from zhengchengyao/mv_snapshot
Jason Dillaman [Fri, 6 Dec 2019 15:22:22 +0000 (10:22 -0500)]
Merge pull request #31589 from zhengchengyao/mv_snapshot

librbd:move all snapshot API functions in internal.cc over to api/Snapshot.cc

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #31767 from pritha-srivastava/wip-rgw-mfa-set-versioning
Casey Bodley [Fri, 6 Dec 2019 15:18:56 +0000 (10:18 -0500)]
Merge pull request #31767 from pritha-srivastava/wip-rgw-mfa-set-versioning

rgw: adding mfa code validation when bucket versioning status is changed

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
5 years agomgr/dashboard: adapt to create_osds parameters change (#31928)
Lenz Grimmer [Fri, 6 Dec 2019 14:57:27 +0000 (14:57 +0000)]
mgr/dashboard: adapt to create_osds parameters change (#31928)

mgr/dashboard: adapt to create_osds parameters change

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agomgr/dashboard: add smart data to hosts page 30594/head
Patrick Seidensal [Tue, 24 Sep 2019 20:22:22 +0000 (22:22 +0200)]
mgr/dashboard: add smart data to hosts page

Fixes: https://tracker.ceph.com/issues/42064
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
5 years agomgr/dashboard: Use Observable in auth.service 32084/head
Volker Theile [Fri, 6 Dec 2019 14:12:27 +0000 (15:12 +0100)]
mgr/dashboard: Use Observable in auth.service

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #31062 from dillaman/wip-42355
Laura Paduano [Fri, 6 Dec 2019 09:42:03 +0000 (10:42 +0100)]
Merge pull request #31062 from dillaman/wip-42355

mgr/dashboard: support RBD mirroring bootstrap create/import

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agomgr/dashboard: Cleanup code (#32031)
Lenz Grimmer [Fri, 6 Dec 2019 08:57:49 +0000 (08:57 +0000)]
mgr/dashboard: Cleanup code (#32031)

mgr/dashboard: Cleanup code

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge pull request #31949 from dillaman/wip-42748
Mykola Golub [Fri, 6 Dec 2019 08:43:47 +0000 (10:43 +0200)]
Merge pull request #31949 from dillaman/wip-42748

rbd: incorporate rbd-mirror daemon status in mirror pool status

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agomgr/dashboard: Left align badge datatable columns 32053/head
Volker Theile [Fri, 6 Dec 2019 07:04:27 +0000 (08:04 +0100)]
mgr/dashboard: Left align badge datatable columns

Signed-off-by: Volker Theile <vtheile@suse.com>
5 years agoMerge PR #29964 into master
Patrick Donnelly [Fri, 6 Dec 2019 05:42:12 +0000 (21:42 -0800)]
Merge PR #29964 into master

* refs/pull/29964/head:
qa/cephfs: test conf file reading for CephFS shell
qa/cephfs: allow passing conf to methods that runs shell command
qa/vstart_runner: add a method to create temporary file
test_cephfs_shell: update test since shell can now read ceph.conf
src/vstart.sh: add cephfs-shell section to ceph.conf
cephfs-shell: read shell variables from ceph.conf

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr: templatize/generalize metrics collection interface 29214/head
Venky Shankar [Tue, 10 Sep 2019 13:49:04 +0000 (09:49 -0400)]
mgr: templatize/generalize metrics collection interface

templatize metrics collection so as to reuse quering routines.
`MetricCollector` can be subclassed and along with implementing
` process_reports()` to process incoming metrics data.

also, generalize metrics data in `MMgrReport` and metric query
configuration in `MMgrConfigure`.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
5 years agoqa/cephfs: test conf file reading for CephFS shell 29964/head
Rishabh Dave [Sat, 7 Sep 2019 16:37:40 +0000 (22:07 +0530)]
qa/cephfs: test conf file reading for CephFS shell

Adds tests that checks -
* reading conf option
* reading conf option after setting it twice
* reading conf option after setting it after a reset

Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoqa/cephfs: allow passing conf to methods that runs shell command
Rishabh Dave [Tue, 10 Sep 2019 12:04:21 +0000 (17:34 +0530)]
qa/cephfs: allow passing conf to methods that runs shell command

Add an argument to the methods that issues CephFS shell command to
accept path to the ceph.conf file.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoqa/vstart_runner: add a method to create temporary file
Rishabh Dave [Tue, 10 Sep 2019 11:27:53 +0000 (16:57 +0530)]
qa/vstart_runner: add a method to create temporary file

The method's signature is kept identical to the method in teuthology.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agotest_cephfs_shell: update test since shell can now read ceph.conf
Rishabh Dave [Wed, 13 Nov 2019 12:42:13 +0000 (18:12 +0530)]
test_cephfs_shell: update test since shell can now read ceph.conf

In the test
test_cephfs_shell.TestMisc.test_issue_cephfs_shell_cmd_at_invocation,
don't set the shell option with in the command to be tested since
CephFS shell can now read it's value from ceph.conf.

Also, add methods to set config options for vstart as well teuthology
testing.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agosrc/vstart.sh: add cephfs-shell section to ceph.conf
Rishabh Dave [Wed, 28 Aug 2019 14:47:22 +0000 (20:17 +0530)]
src/vstart.sh: add cephfs-shell section to ceph.conf

And set "debug" to true, so that developers can see tracebacks in case
cephfs-shell crashes.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agocephfs-shell: read shell variables from ceph.conf
Rishabh Dave [Wed, 28 Aug 2019 13:57:29 +0000 (19:27 +0530)]
cephfs-shell: read shell variables from ceph.conf

Read ceph.conf and initialize shell variables by reading options set
under section cephfs-shell. If there are sections/options that are
duplicated in ceph.conf, CephFS shell overrides the options with the
values last.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
5 years agoMerge PR #31897 into master
Patrick Donnelly [Fri, 6 Dec 2019 00:05:59 +0000 (16:05 -0800)]
Merge PR #31897 into master

* refs/pull/31897/head:
doc: obsolete entries for allow_standby_replay
wip-doc: entries obsoleted by allow_standby_replay

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #31403 into master
Patrick Donnelly [Thu, 5 Dec 2019 23:58:26 +0000 (15:58 -0800)]
Merge PR #31403 into master

* refs/pull/31403/head:
vstart.sh: highlight presence of stray conf

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr: simply exit on SIGINT or SIGTERM 32051/head
Sage Weil [Thu, 5 Dec 2019 23:18:07 +0000 (17:18 -0600)]
mgr: simply exit on SIGINT or SIGTERM

The python modules don't reliable shut down.  We've fixed a few shutdown
bugs chasing https://tracker.ceph.com/issues/42744.

This was compounded by https://tracker.ceph.com/issues/42981, which seems
to suggest something in the python module teardown is screwing with the
signal handlers.

Now that df507cde8d71063d5873a42f668156e4c32e86f9 is there, the mgr will
blacklist all rados clients the mgr instantiates, which means we can just
exit immediately and let the blacklisting clean things up.

Works-around: https://tracker.ceph.com/issues/42981
Fixes: https://tracker.ceph.com/issues/42744
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agotest: Use activate_osd() when restarting OSDs
David Zafman [Thu, 5 Dec 2019 23:13:31 +0000 (15:13 -0800)]
test: Use activate_osd() when restarting OSDs

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agotest: osd-scrub-snaps.sh: Fix race with osd restart and doing a scrub
David Zafman [Thu, 5 Dec 2019 17:48:09 +0000 (09:48 -0800)]
test: osd-scrub-snaps.sh: Fix race with osd restart and doing a scrub

Fixes: https://tracker.ceph.com/issues/43150
Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoMerge PR #29421 into master
Patrick Donnelly [Thu, 5 Dec 2019 21:18:49 +0000 (13:18 -0800)]
Merge PR #29421 into master

* refs/pull/29421/head:
qa/cephfs: add tests for ACLs
qa/cephfs: allow running tests from xfstests-dev
qa/tasks: add methods to get monitor's sockets
qa/cephfs: don't crash if mountpoint dir is already deleted
vstart_runner.py: set omit_sudo's default value to False
qa/vstart_runner.py: fix get_keyring_path()
qa/cephfs: don't abort if mountpoint is already present
qa/cephfs: allow specifying mountpoint for kernel mounts
qa/cephfs: allow specifying mountpoints for FUSE mounts
qa/vstart_runner.py: allow specifying mountpoint for local FUSE mounts
qa/mount.py: allow setting mountpoint
qa/vstart_runner.py: add a method to create a temporary directory

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomon/PGMap: use NONE for 'pg ls[-*]' output too 32048/head
Sage Weil [Thu, 5 Dec 2019 20:37:02 +0000 (14:37 -0600)]
mon/PGMap: use NONE for 'pg ls[-*]' output too

We already show CRUSH_ITEM_NONE as NONE in the 'pg dump' output as of
57bac8ea88e5cdcb3854852d439f7e6cbf9df900; do the same for 'pg ls' (which
is the friendlier of the two and what users should be using anyway!).

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomgr/DaemonServer: fix 'osd ok-to-stop' for EC pools 32046/head
Sage Weil [Thu, 5 Dec 2019 18:59:31 +0000 (12:59 -0600)]
mgr/DaemonServer: fix 'osd ok-to-stop' for EC pools

We need to pay attention to account for CRUSH_ITEM_NONE entries in the
EC PG acting set.

Fixes: https://tracker.ceph.com/issues/43151
Signed-off-by: Sage Weil <sage@redhat.com>
5 years agomon/OSDMonitor: make memory autotune disable itself if no rocksdb 32044/head
Sage Weil [Thu, 5 Dec 2019 19:34:19 +0000 (13:34 -0600)]
mon/OSDMonitor: make memory autotune disable itself if no rocksdb

Currently, we crash (failed assertion). Instead, just disable autotuning.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoos/bluestore: default bluestore_block_size 1T -> 100G 32043/head
Sage Weil [Thu, 5 Dec 2019 18:58:12 +0000 (12:58 -0600)]
os/bluestore: default bluestore_block_size 1T -> 100G

This makes vstart *way* faster.  This option is only really relevant
for dev test environments.  We bumped it up back in dbdd1d9b6ec286982b5e86d4c51f831cc16afc12
from 10G just to make ENOSPC less common in dev/test.  Let's see if 100G
is a better balance.

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #31926 from yuvalif/wip-yuval-fix-pubsub-record-format
Casey Bodley [Thu, 5 Dec 2019 18:55:31 +0000 (13:55 -0500)]
Merge pull request #31926 from yuvalif/wip-yuval-fix-pubsub-record-format

rgw/pubsub: fix records/event json format to match documentation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #32036 from zdover23/wip-doc-troubleshooting-pg-verb-fix
Kefu Chai [Thu, 5 Dec 2019 17:45:36 +0000 (01:45 +0800)]
Merge pull request #32036 from zdover23/wip-doc-troubleshooting-pg-verb-fix

doc: s/achieve/achieves/ (Fixed a verb disagreement)

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agodoc: obsolete entries for allow_standby_replay 31897/head
Rodrigo Severo [Thu, 5 Dec 2019 16:41:33 +0000 (13:41 -0300)]
doc: obsolete entries for allow_standby_replay

Nautilus release presented the allow_standby_replay fs setting that obsdoleted
several MDS config entries:  mds_standby_for_*, mon_force_standby_active, and
mds_standby_replay.

Removing entries instead of just marking them as "Obsolete' as per batrick
suggestion.

Signed-off-by: Rodrigo Severo <rodrigo@fabricadeideias.com>
5 years agobuild/ops: make-dist: default to no dashboard frontend build parallelism 32037/head
Nathan Cutler [Thu, 5 Dec 2019 16:38:39 +0000 (17:38 +0100)]
build/ops: make-dist: default to no dashboard frontend build parallelism

Work around a race condition in the dashboard frontend parallel build code.

References: https://tracker.ceph.com/issues/43152
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agodoc: s/achieve/achieves (Fixed a verb disagreement) 32036/head
Zac Dover [Thu, 5 Dec 2019 16:16:01 +0000 (02:16 +1000)]
doc: s/achieve/achieves (Fixed a verb disagreement)

This bug changes a clause of the form "When x remains in y status
and never achieve a z status" to a clause of the form "When x remains
in y status and never achieves a  z status".

The change is one of "achieve" to "achieves".

Signed-off-by: Zac Dover <zac.dover@gmail.com>
5 years agoMerge pull request #31830 from joke-lee/rgw-sts-crash-token-not-base64
Casey Bodley [Thu, 5 Dec 2019 15:41:45 +0000 (10:41 -0500)]
Merge pull request #31830 from joke-lee/rgw-sts-crash-token-not-base64

rgw: fix rgw crash when token is not base64 encode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #31483 from zhangsw/fix-rgw-reshard-left
Casey Bodley [Thu, 5 Dec 2019 15:34:31 +0000 (10:34 -0500)]
Merge pull request #31483 from zhangsw/fix-rgw-reshard-left

rgw: fix a bug that bucket instance obj can't be removed after resharding completed

Reviewed-by: Eric J. Ivancich <ivancich@redhat.com>
Reviewed-by: Mark Kogan <mkogan@redhat.com>
5 years agoMerge PR #31989 into master
Sage Weil [Thu, 5 Dec 2019 15:33:52 +0000 (09:33 -0600)]
Merge PR #31989 into master

* refs/pull/31989/head:
mgr/MgrClient: fix 'tell mgr.x ...'

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30878 from zhangsw/fix-rgw-lc-zerodays
Daniel Gryniewicz [Thu, 5 Dec 2019 15:31:40 +0000 (10:31 -0500)]
Merge pull request #30878 from zhangsw/fix-rgw-lc-zerodays

rgw: Expiration days can't be zero and  transition days can be zero

5 years agoMerge PR #31795 into master
Sage Weil [Thu, 5 Dec 2019 15:09:07 +0000 (09:09 -0600)]
Merge PR #31795 into master

* refs/pull/31795/head:
mgr/ssh: 'ssh {check,prepare}-host <host>'
mgr/ssh: return err from _run_ceph_daemon
ceph-daemon: add check-host and prepare-host

Reviewed-by: Sebastian Wagner <swagner@suse.com>
5 years agoMerge PR #32004 into master
Sage Weil [Thu, 5 Dec 2019 15:05:11 +0000 (09:05 -0600)]
Merge PR #32004 into master

* refs/pull/32004/head:
mgr/restful: allow shutdown before we've fully started up

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #30498 from jecluis/wip-mon-no-config
Kefu Chai [Thu, 5 Dec 2019 14:59:56 +0000 (22:59 +0800)]
Merge pull request #30498 from jecluis/wip-mon-no-config

mon: allow running without a config file

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/dashboard: block mirroring bootstrap UI 31062/head
Jason Dillaman [Wed, 30 Oct 2019 18:55:41 +0000 (14:55 -0400)]
mgr/dashboard: block mirroring bootstrap UI

Two new modal windows allow an admin to create a base64-encoded bootstrap token
which can then be imported into dashboard on another cluster. The bootstrap
token embeds all the necessary data required to connect to a peer cluster for
RBD mirroring.

Fixes: http://tracker.ceph.com/issues/42355
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agomgr/dashboard: integrate site name into block mirroring overview
Jason Dillaman [Tue, 22 Oct 2019 17:58:31 +0000 (13:58 -0400)]
mgr/dashboard: integrate site name into block mirroring overview

The site name is used to differentiate clusters for RBD mirroring.
The local site name is now displayed on the block mirroring
overview page. It also includes a new modal window to edit the site
name.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>