]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Alfredo Deza [Thu, 11 Jul 2019 15:56:07 +0000 (11:56 -0400)]
ceph-volume tests: verify that wipefs tries several times
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
845e62cb4ba2636325304db2c2d65a185ace25cf )
Alfredo Deza [Thu, 11 Jul 2019 13:34:10 +0000 (09:34 -0400)]
ceph-volume lvm.zap: retry wipefs several times to prevent race condition failures
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
b7b8b106fa485d3b8345b583fbc7f74e30cbc03e )
Kefu Chai [Tue, 10 Sep 2019 12:36:24 +0000 (20:36 +0800)]
Merge pull request #30283 from tchaikov/wip-nautilus-c++17
nautilus: cmake: enforce C++17 instead of relying on cmake-compile-features
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Tue, 10 Sep 2019 06:56:59 +0000 (14:56 +0800)]
cmake: enforce C++17 instead of relying on cmake-compile-features
this change is a follow-up of #30114
in FindBoost.cmake, we try to deduce the C++ flags by checking the C++
features offered by different C++ standard like C++98, C++11 and C++14
against the ones required by different boost component. then choose the
C++ dialect based on the `CXX_STANDARD` and `COMPILE_FEATURES`.
in the case of nautilus, since cmake 3.5.1 does not offer
CXX_STANDARD=17 support by then, we have to add `-std=c++17` to
`CMAKE_CXX_FLAGS` manually. but unfortunately, the
`cmake-compile-features` machinary does not check `CMAKE_CXX_FLAGS` for
the default C++ standard required by the project. so it falls back to
the minimal C++ standard required by the target.
since Boost::fiber and Boost::context share the same C++ feature set
dependencies which can be fulfilled by C++11, and by default,
`CXX_EXTENSIONS` is enabled, `--std=gnu++11` is used as we are using gcc
in our building hosts. so we have CXX_FLAGS like:
-std=c++17 ... -std=gnu++11
when compiling targets linked against Boost::context. and it seems the
last one takes effect. that's why some targets failed to compile if
the makefiles were generated with cmake 3.5.1.
in this change, `INTERFACE_COMPILE_FEATURES <features>` is replaced with
`CXX_STANDARD 17`. this renders this setting a no-op, as CMake 3.5.1
does not translate this setting to any CXX_FLAGS. but this does not
hurt, as we use C++17 project-wide, and C++17 is able to offer all
compile features required by Boost::context.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts: this change is not cherry-picked from master, because in
master, we use cmake 3.10 and up which offers the support of
`CXX_STANDARD=17`, hence cmake is able to bump up the C++ standard
to C++17 instead of falling back to C++11.
Nathan Cutler [Thu, 5 Sep 2019 13:07:54 +0000 (15:07 +0200)]
Merge pull request #30114 from tchaikov/wip-nautilus-CXX_FLAGS
nautilus: seastar,dmclock: use CXX_FLAGS from parent project
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
David Galloway [Wed, 4 Sep 2019 00:35:16 +0000 (20:35 -0400)]
Merge branch 'nautilus' of github.com:ceph/ceph into nautilus
Kefu Chai [Tue, 3 Sep 2019 16:53:24 +0000 (00:53 +0800)]
dmclock: pick up change to use specified C++ settings if any
see https://github.com/ceph/dmclock/pull/73
so dmclock won't pass `-std=c++11` even if the parent project already
have `-std=c++17` in CXX_FLAGS.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
fb83b331de9636e5de3d756e490748d5bfb9c4dc )
Conflicts: dmclock
this change is not cherry-picked from master, because master is using
a different dmclock version. so in this change, only the minimum fix
is included.
Kefu Chai [Tue, 3 Sep 2019 16:47:54 +0000 (00:47 +0800)]
seastar: pick up change in fmt submodule
see https://github.com/ceph/fmt/pull/1
so fmt won't fallback to C++11 if `CMAKE_CXX_STANDARD` is not set
Signed-off-by: Kefu Chai <kchai@redhat.com>
this change is not cherry-picked from master, because
- the seastar submodule in nautilus is not in sync with that in
master
- master is not using fmt submodule included by seastar anymore
- master is using cmake 3.10, so there is no need to address
this issue in master on fmt front.
Alfredo Deza [Tue, 3 Sep 2019 14:58:55 +0000 (10:58 -0400)]
Merge pull request #30093 from jan--f/wip-41614-nautilus
nautilus: ceph-volume: lvm list is O(n^2)
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Jenkins Build Slave User [Tue, 3 Sep 2019 13:19:58 +0000 (13:19 +0000)]
14.2.3
Rishabh Dave [Mon, 19 Aug 2019 13:33:21 +0000 (19:03 +0530)]
ceph-volume: test number of times LVs list was created
Add a test that cofirm that the LVs list was created only once when
calling devices.lvm.listing.list()
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
20d6264538dab444c0ef13f40c6c21ec3d2057f8 )
Rishabh Dave [Wed, 14 Aug 2019 15:57:38 +0000 (21:27 +0530)]
ceph-volume: reuse list of LVs
Avoid creating of list of LVs in different methods of the same module
and resue them.
Fixes: https://tracker.ceph.com/issues/37490
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
ab3a58e78124a984d162b2f63992d01c5e59e2a7 )
Yuri Weinstein [Thu, 29 Aug 2019 14:43:24 +0000 (07:43 -0700)]
Merge pull request #29945 from trociny/wip-41475-nautilus
nautilus: pybind/mgr/rbd_support: ignore missing support for RBD namespaces
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Thu, 29 Aug 2019 14:42:53 +0000 (07:42 -0700)]
Merge pull request #29975 from theanalyst/nautilus-beast-endpoint-fix
nautilus: rgw: asio: check the remote endpoint before processing requests
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 28 Aug 2019 19:03:15 +0000 (12:03 -0700)]
Merge pull request #29977 from yuriw/wip-yuriw-41513-nautilus
qa/tests: adding mgr.x into the restart/upgrade sequence before monitors
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 28 Aug 2019 18:49:59 +0000 (11:49 -0700)]
qa/tests: adding mgr.x into the restart/upgrade sequence before monitors
Fixes: https://tracker.ceph.com/issues/41513
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Abhishek Lekshmanan [Wed, 7 Aug 2019 15:09:32 +0000 (17:09 +0200)]
rgw: asio: check the remote endpoint before processing requests
`socket.remote_endpoint()` can throw exceptions corresponding to errors in the
`getpeername` syscall, make sure these are handled.
Fixes: CVE-2019-10222, https://tracker.ceph.com/issues/40018
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
caa653196856ecdf50519a9a33195d5c4e3372af )
Conflicts:
src/rgw/rgw_asio_frontend.cc
conflicts due to missing yield ctx in nautilus
Jason Dillaman [Wed, 31 Jul 2019 18:19:28 +0000 (14:19 -0400)]
pybind/mgr/rbd_support: ignore missing OSD support for RBD namespaces
During upgrades, the OSDs might not yet have been upgraded yet and
therefore might be missing namespace support.
Fixes: https://tracker.ceph.com/issues/41029
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
10c0c806819741012e1c440c38fac17682125d9a )
Jason Dillaman [Wed, 31 Jul 2019 18:13:54 +0000 (14:13 -0400)]
pybind/rbd: new OperationNotSupported exception
This will help catch errors where the backing OSDs do not support
a given RBD feature.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
97c1a120b7e7d934dd5d2456fd1fb4c1d0e891ec )
Yuri Weinstein [Tue, 27 Aug 2019 18:38:58 +0000 (11:38 -0700)]
Merge pull request #29918 from badone/wip-nautilus-tracker-41518-grafana-server
nautilus: qa/ceph-ansible: Disable dashboard
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Alfredo Deza [Tue, 27 Aug 2019 11:48:27 +0000 (07:48 -0400)]
Merge pull request #29899 from alfredodeza/nautilus-rm41378
nautilus ceph-volume tests set the noninteractive flag for Debian
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Brad Hubbard [Tue, 27 Aug 2019 03:50:47 +0000 (13:50 +1000)]
nautilus: qa/ceph-ansible: Disable dashboard
Recently a dashboard playbook was added which will fail without a
grafana server so disabling the dashboard
Fixes: https://tracker.ceph.com/issues/41521
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
131f5a145adf21d402e39ac2c151664eb8ccec76 )
Alfredo Deza [Wed, 21 Aug 2019 18:15:32 +0000 (14:15 -0400)]
ceph-volume tests set the noninteractive flag for Debian, to avoid prompts in apt
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
89231c9a60a46ba0691f787efbfe5ab35f05c679 )
Yuri Weinstein [Thu, 22 Aug 2019 16:39:37 +0000 (09:39 -0700)]
Merge pull request #29805 from yuriw/wip-yuriw-41384-nautilus
qa/tests: changed running rbd tests test_librbd_python.sh from…
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 21 Aug 2019 19:38:00 +0000 (12:38 -0700)]
qa/tests: changed running rbd tests test_librbd_python.sh from tag: v14.2.2
Fixes: https://tracker.ceph.com/issues/41384
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Wed, 21 Aug 2019 19:14:08 +0000 (12:14 -0700)]
Merge pull request #29801 from smithfarm/wip-41263-nautilus
nautilus: rgw_file: advance_mtime() takes RGWFileHandle::mutex unconditionally
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Matt Benjamin [Thu, 8 Aug 2019 20:21:24 +0000 (16:21 -0400)]
rgw_file: dont deadlock in advance_mtime()
Fixes: https://tracker.ceph.com/issues/41173
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
0d3338c2d2271bbf6f4c7774ad175f7ee42d07f6 )
Yuri Weinstein [Wed, 21 Aug 2019 15:25:37 +0000 (08:25 -0700)]
Merge pull request #28862 from liewegas/wip-bluefs-extents-nautilus
nautilus: os/bluestore/bluefs_types: consolidate contiguous extents
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Kefu Chai [Wed, 21 Aug 2019 07:23:12 +0000 (15:23 +0800)]
Merge pull request #29191 from mynaramana/patch-1
doc/rados: Correcting some typos in the clay code documentation
Reviewed-by: Kefu Chai <kchai@redhat.com>
Myna V [Fri, 16 Aug 2019 06:28:44 +0000 (11:58 +0530)]
doc/rados: Correcting some typos in the clay code documentation
Signed-off-by: Myna <mynaramana@gmail.com>
Yuri Weinstein [Tue, 20 Aug 2019 21:43:23 +0000 (14:43 -0700)]
Merge pull request #29551 from pdvian/wip-40882-nautilus
nautilus: rbd: Reduce log level for cls/journal and cls/rbd expected errors
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Tue, 20 Aug 2019 21:42:40 +0000 (14:42 -0700)]
Merge pull request #29722 from dillaman/wip-39499-nautilus
nautilus: librbd: snapshot object maps can go inconsistent during copyup
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 20 Aug 2019 21:42:14 +0000 (14:42 -0700)]
Merge pull request #29723 from dillaman/wip-40511-nautilus
nautilus: librbd: improve journal performance to match expected degredation
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 20 Aug 2019 21:41:39 +0000 (14:41 -0700)]
Merge pull request #29725 from dillaman/wip-41078-nautilus
nautilus: mgr/rbd_support: support scheduling long-running background operations
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Tue, 20 Aug 2019 16:14:12 +0000 (09:14 -0700)]
Merge pull request #29745 from liewegas/wip-bluestore-no-cgroup-nautilus
nautilus: os/bluestore: do not set osd_memory_target default from cgroup limit
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Sage Weil [Mon, 1 Jul 2019 14:33:22 +0000 (09:33 -0500)]
os/bluestore/bluefs_types: consolidate contiguous extents
If we allocate a new extent that is contiguous with the last extent,
just extend it. This avoids having long vectors of continguous extents
when a single large extent would suffice--especially with log files.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
4f3ce9bc201c20d10d739d42e3f7018408f110a6 )
Sage Weil [Fri, 9 Aug 2019 17:25:59 +0000 (12:25 -0500)]
os/bluestore: do not set osd_memory_target default from cgroup limit
On the aarch64 box I'm testing, this gives us a value of
7378697629483768832 , which is not what we want.
I think we are better off relying on this limit being explicitly set via
environment variables (POD_* by kuberentes/rook) or via the command line.
This partially reverts
5c6b533697814af8acfd9e731a2599b2294687ef , but not
all of it, since we wan to keep the option itself, as it is now used by
common/config.cc when dealing with the POD_MEMORY_LIMIT env var.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
9346d3c3bcde7d0a68e21a554eb7fc836df78ba9 )
Yuri Weinstein [Mon, 19 Aug 2019 16:14:00 +0000 (09:14 -0700)]
Merge pull request #29650 from pdvian/wip-40945-nautilus
nautilus: mgr/dashboard: RGW User quota validation is not working correctly
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Yuri Weinstein [Mon, 19 Aug 2019 16:13:01 +0000 (09:13 -0700)]
Merge pull request #29678 from pdvian/wip-40948-nautilus
nautilus: core: Better default value for osd_snap_trim_sleep
Reviewed-by: Neha Ojha <nojha@redhat.com>
Jason Dillaman [Thu, 13 Jun 2019 19:22:54 +0000 (15:22 -0400)]
librbd: tweaks to improve throughput for journaled IO
Increase the per-object append flush bytes to 1MiB to mimic the 16MiB
in-memory writeback cache. Finally, default enable the new journal
writethrough until flush option.
Performance results comparing no journal, pre-change, and post-change:
no journal original modified
4K 40310.84 7223.73 27427.27
32K 21530.37 3256.39 10284.05
256K 3159.67 564.73 1627.16
4M 223.03 48.03 91.91
Fixes: http://tracker.ceph.com/issues/40072
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
5f3b043896762fa97eb35648f8639004c45f5978 )
Jason Dillaman [Wed, 12 Jun 2019 17:36:24 +0000 (13:36 -0400)]
librbd: new rbd_journal_object_writethrough_until_flush option
When set to true, the journal will not attempt to batch appends until
after it receives the the first flush request from the user.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
172ad649fb8a2410bdc078a5752b2ca09dc03ac2 )
Conflicts:
src/librbd/io/ImageRequest.cc: trivial resolution
Jason Dillaman [Thu, 13 Jun 2019 00:06:11 +0000 (20:06 -0400)]
journal: support dynamically updating recorder flush options
Default to disabling writeback-style append flushes unless overridden
by a call to 'set_append_batch_options'.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
c0322a13c83f590067a120212620ebba15fc8661 )
Jason Dillaman [Thu, 13 Jun 2019 14:21:33 +0000 (10:21 -0400)]
journal: fix broken append batching implementation
The original flush_interval/bytes/age batching options no longer
actually do anything. Integrate these better with the max in-flight
AIO handling.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a4e160e410ab3743515338510cb1e369a641152f )
Jason Dillaman [Thu, 13 Jun 2019 13:45:32 +0000 (09:45 -0400)]
journal: improve logging on recorder append path
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
84e48ddbf58d4028c4195d9c80634f895f62f2be )
Mykola Golub [Thu, 13 Jun 2019 11:05:17 +0000 (12:05 +0100)]
journal: wait for in flight advance sets on stopping recorder
Before object overflow detection optimization (
83461c42b ) the
overflow was detected when trying to send data, so when an object
set was advanced we always had some data and flush always
completed later. But now we detect overflow on client side, it
may happen when buffer is empty and flush may complete
when "advance object set" is still in flight.
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
340726ec89c4a2b57905aa1be328d55c96758fee )
Mykola Golub [Fri, 24 May 2019 06:07:51 +0000 (07:07 +0100)]
journal: optimize object overflow detection
Previously to detect overflow we were sending journal append
requests until -EOVERFLOW is returned by osd. This means that we
had at least one waste (rejected) request per object set (though
there may be more if the number of in-flight appends is not
limited).
We can easily predict when the osd will start to return
-EOVERFLOW and avoid such additional requests.
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
83461c42b03cf7d407ac3c5d02043cca1e908015 )
Casey Bodley [Mon, 19 Aug 2019 14:38:06 +0000 (10:38 -0400)]
Merge pull request #27684 from liewegas/wip-rgw-pgs-nautilus
nautilus: rgw: remove rgw_num_rados_handles; set autoscale parameters or rgw metadata pools
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 19 Aug 2019 14:37:47 +0000 (07:37 -0700)]
Merge pull request #29478 from xiaoxichen/wip-41002
nautilus: cephfs: client: unlink dentry for inode with llref=0
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Nathan Cutler [Mon, 19 Aug 2019 14:08:36 +0000 (16:08 +0200)]
Merge pull request #29724 from dillaman/wip-40888-nautilus
nautilus: doc/rbd: initial live-migration documentation
Reviewed-by: Mykola Golub <mgolub@suse.com>
Sage Weil [Fri, 5 Apr 2019 22:37:57 +0000 (17:37 -0500)]
rgw: pass mostly_omap flag when opening/creating pools
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
af30e3a512dd1e5c51639d1f823b99ed9b43fb50 )
Sage Weil [Thu, 4 Apr 2019 11:41:22 +0000 (06:41 -0500)]
rgw/rgw_rados: pass mostly_omap flag when opening/creating pools
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
c4b830069372302ee93687d417d04ad39f600c4e )
Abhishek Lekshmanan [Mon, 19 Aug 2019 10:50:37 +0000 (12:50 +0200)]
rgw: move rgw_init_ioctx() to rgw_tools.cc
move rgw_init_ioctx() out of rgw_rados.cc so that it doesn't need to be
duplicated by services/svc_rados.cc
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
1cf90269057ed18636879edef28b6e038352e335 )
Conflicts:
src/rgw/rgw_gc.cc
include conflicts with scope_guard, added rgw_tools include as well which
introduces rgw_init_ioctx
Adam C. Emerson [Wed, 30 Jan 2019 19:26:33 +0000 (14:26 -0500)]
rgw: Get rid of num_rados_handles infrastructure in RGWSI_RADOS
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
5666b4c41a70bac75e26b44a2cec1bd895d8375d )
Adam C. Emerson [Wed, 23 Jan 2019 21:01:40 +0000 (16:01 -0500)]
rgw: Get rid of num_rados_handles infrastructure in RGWRados
Since we aren't supporting multiple handles, don't have the overhead.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
042776bbf64c34dc817980d52cebdd069492b0e6 )
Abhishek Lekshmanan [Thu, 15 Aug 2019 15:25:22 +0000 (17:25 +0200)]
rgw: Remove rgw_num_rados_handles option
This has been deprecated for some time and underlies much of the
complexity of the RADOS service.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
55180511e5e5a2d9965a1bad17218ee64e023484 )
Conflicts:
PendingReleaseNotes
updated to reflect current nautilus status
Jason Dillaman [Tue, 16 Jul 2019 17:54:16 +0000 (13:54 -0400)]
mon/mgr: add 'rbd_support' to list of always-on mgr modules
The 'rbd_support' mgr module provides many background functions that
are required by the 'rbd' CLI performance queries, as well as future
background long-running maintenance tasks.
Fixes: http://tracker.ceph.com/issues/40790
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
7231aab4b844729c1c35da37515dce58026c26a2 )
Conflicts:
src/mon/MgrMonitor.cc: trivial resolution
Jason Dillaman [Fri, 2 Aug 2019 15:57:29 +0000 (11:57 -0400)]
pybind/mgr/rbd_support: use image ids to detect duplicate tasks
This helps to to avoid the case where new tasks were not being scheduled
when an image name was re-used after having a task created under the
same name.
Fixes: https://tracker.ceph.com/issues/41032
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
7adb17f83106b2cba87cf343c23fd6d2d26ae0b3 )
Venky Shankar [Wed, 31 Jul 2019 05:47:02 +0000 (01:47 -0400)]
pybind/rbd: fix call to unregister_osd_perf_queries
.. should be invoked as self.unregister_osd_perf_queries()
rather than self.module.unregister_osd_perf_queries().
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
37a9b5375ff3793ea39ba7d13618aa977c8b302d )
Jason Dillaman [Fri, 26 Jul 2019 11:01:59 +0000 (07:01 -0400)]
pybind/mgr: don't log exception when cannot find RBD task by id
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
7ccf0b3229e674b625e396ca3b1e6f737214e125 )
Jason Dillaman [Thu, 25 Jul 2019 16:36:19 +0000 (12:36 -0400)]
pybind/mgr: handle duplicate rbd task commands
The 'ceph' CLI will duplicate commands within teuthology to test
the MONs idempotency. This shouldn't be required for the MGR module,
but we can keep a fixed set of completed tests to handle this
possible command replay.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9bdc376c5505aa97532ea15ff6286db9beafd1ec )
Jason Dillaman [Tue, 23 Jul 2019 16:49:50 +0000 (12:49 -0400)]
qa: test case for new rbd background tasks
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
63a8f6c2c38d0e31f5b34be649b80dc48b0bfc93 )
Jason Dillaman [Mon, 22 Jul 2019 15:04:53 +0000 (11:04 -0400)]
pybind/mgr: rbd tasks now provide a dict to the progress events
This dict will include an origin key fixed to 'rbd_support' as well
as pool and image references.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
e87aff5a90e115cbe7108e0dc89f60092fbe7d64 )
Jason Dillaman [Mon, 22 Jul 2019 15:01:39 +0000 (11:01 -0400)]
pybind/mgr: mark progress events as failed if an error occurs
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b99ae27d493319caf8d903446d2fb4cbf563e282 )
Jason Dillaman [Mon, 22 Jul 2019 15:00:47 +0000 (11:00 -0400)]
pybind/mgr: support marking progress events as failed
The failed events can also include a failure message to indicate
the reason for the failure.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d78ddaabdf18525dc2b79fe2ddde1ca08385cd01 )
Conflicts:
src/pybind/mgr/progress/module.py: tweaked missing backport for task start/stop times
Jason Dillaman [Tue, 2 Jul 2019 23:54:49 +0000 (19:54 -0400)]
pybind/mgr: new 'rbd task' background task management
Fixes: http://tracker.ceph.com/issues/40621
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
b7a826df9f7e18db8ea561c08a0571aaba811f0f )
Jason Dillaman [Tue, 23 Jul 2019 16:50:59 +0000 (12:50 -0400)]
pybind/rbd: new OperationCanceled exception
This allows the error to be directly caught instead of attempting
to parse the OSError.errno
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
2e85381665a28167cc01d3ef66a577502b79e7ed )
Jason Dillaman [Mon, 15 Jul 2019 21:35:37 +0000 (17:35 -0400)]
pybind/rbd: flatten, remove, trash_remove, migration progress callback
This callback can be used to track progress and also to attempt to cancel
the operation while it's in-progress by returning a negative error code
from the callback.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
6dc8249c7ba2553acb686a2462de93239f1f07b4 )
Jason Dillaman [Mon, 22 Jul 2019 13:48:26 +0000 (09:48 -0400)]
librbd: abort an image removal if block objects cannot be removed
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
361e51f3fb4f146048995e5adbeb8ff90685fc53 )
Jason Dillaman [Tue, 16 Jul 2019 02:12:08 +0000 (22:12 -0400)]
librbd: allow ProgressCtx::update_progress to cancel maintenance ops
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
026df758aee8168338c8b44d4551b55000c6ed2e )
Jason Dillaman [Fri, 19 Jul 2019 15:20:38 +0000 (11:20 -0400)]
doc/rbd: initial live-migration documentation
Fixes: http://tracker.ceph.com/issues/40486
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
20c80dfd3fac134a1e897f17d7b2f2082024d9e9 )
Conflicts:
doc/rbd/rbd-operations.rst: did not backport restructuring
Ilya Dryomov [Thu, 25 Apr 2019 14:43:48 +0000 (16:43 +0200)]
librbd: the first post-migration snapshot isn't always dirty
Currently, the first post-migration snapshot is always marked EXISTS
(i.e. dirty). This is wrong, because the data can be inherited from
a pre-migration snapshot, handled by deep copy.
Mark all post-migration snapshots EXISTS_CLEAN in this case.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
5b9d85c13638965cbb5c1fa9dfc43a17984d19df )
Ilya Dryomov [Mon, 22 Apr 2019 10:21:07 +0000 (12:21 +0200)]
librbd: don't update snapshot object maps if copyup data is all zeros
If the data read from the parent is all zeros, deep copyup isn't
performed. However snapshot object maps are updated unconditionally,
causing inconsistencies where nonexistent objects are marked
OBJECT_EXISTS or OBJECT_EXISTS_CLEAN.
Fixes: http://tracker.ceph.com/issues/39435
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
4456dc3939816a8bcb36dfc771adb1c699b37b0f )
Ilya Dryomov [Mon, 22 Apr 2019 10:12:33 +0000 (12:12 +0200)]
librbd: avoid repeatedly invoking is_zero() in CopyupRequest
Invoke is_zero() just once, either in handle_read_from_parent() or
handle_deep_copy().
Initialize m_copyup_is_zero to true to preserve existing behavior:
on an empty bufferlist is_zero() returns true.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
b01133661e3bc1814f66df3de70aefd005965b27 )
Yuri Weinstein [Sun, 18 Aug 2019 15:31:30 +0000 (08:31 -0700)]
Merge pull request #29436 from wjwithagen/wip-41038-nautilus
nautilus: cmake: update FindBoost.cmake
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:31:07 +0000 (08:31 -0700)]
Merge pull request #29454 from pdvian/wip-40734-nautilus
nautilus: mgr/diskprediction_cloud: Service unavailable
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:26:16 +0000 (08:26 -0700)]
Merge pull request #29352 from Devp00l/wip-40658-nautilus
nautilus: mgr/dashboard: Pool graph/sparkline points do not display the correct values
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:25:14 +0000 (08:25 -0700)]
Merge pull request #29354 from Devp00l/wip-40982-nautilus
nautilus: mgr/dashboard: Fix the table mouseenter event handling test
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:23:53 +0000 (08:23 -0700)]
Merge pull request #29524 from pdvian/wip-40846-nautilus
nautilus: mgr/dashboard: controllers/grafana is not Python3 compatible
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:22:33 +0000 (08:22 -0700)]
Merge pull request #29566 from pdvian/wip-40885-nautilus
nautilus: mon/MgrMonitor: fix null deref when invalid formatter is specified
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Yuri Weinstein [Sun, 18 Aug 2019 15:21:55 +0000 (08:21 -0700)]
Merge pull request #29671 from neha-ojha/wip-40322-nautilus
nautilus: mon/OSDMonitor: allow pg_num to increase when require_osd_release < N
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:21:06 +0000 (08:21 -0700)]
Merge pull request #29682 from b-ranto/wip-push-dash
nautilus: rpm: Require ceph-grafana-dashboards
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:18:30 +0000 (08:18 -0700)]
Merge pull request #29308 from smithfarm/wip-40518-nautilus
nautilus: rgw: RGWGC add perfcounter retire counter
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:17:56 +0000 (08:17 -0700)]
Merge pull request #29326 from smithfarm/wip-40540-nautilus
nautilus: rgw: multisite: 'radosgw-admin bilog trim' stops after 1000 entries
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:17:29 +0000 (08:17 -0700)]
Merge pull request #29328 from smithfarm/wip-40237-nautilus
nautilus: rbd: profile rbd OSD cap should add class rbd metadata_list cap by default.
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:16:57 +0000 (08:16 -0700)]
Merge pull request #29329 from smithfarm/wip-40501-nautilus
nautilus: rbd: [cli] 'export' should handle concurrent IO completions
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:16:27 +0000 (08:16 -0700)]
Merge pull request #29409 from pdvian/wip-40600-nautilus
nautilus: rgw_file: fix readdir eof() calc--caller stop implies !eof
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:15:41 +0000 (08:15 -0700)]
Merge pull request #29410 from pdvian/wip-40627-nautilus
nautilus: rgw_file: advance_mtime() should consider namespace expiration
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Sun, 18 Aug 2019 15:13:14 +0000 (08:13 -0700)]
Merge pull request #29499 from pdvian/wip-40848-nautilus
nautilus: rgw: Don't crash on copy when metadata directive not supplied
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Neha Ojha [Fri, 16 Aug 2019 16:31:11 +0000 (09:31 -0700)]
Merge pull request #29697 from pdvian/wip-41084-nautilus
nautilus: core: Change default for bluestore_fsck_on_mount_deep as false
Reviewed-by: Neha Ojha <nojha@redhat.com>
Alfredo Deza [Fri, 16 Aug 2019 13:55:08 +0000 (09:55 -0400)]
Merge pull request #29660 from jan--f/wip-41248-nautilus
nautilus: ceph-volume: simple functional tests drop test for lvm zap
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Jan Fajerski [Wed, 14 Aug 2019 12:36:58 +0000 (14:36 +0200)]
ceph-volume: don't try to test lvm zap on simple tests
Fixes: https://tracker.ceph.com/issues/41245
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
081109859a06f1b2ff6652dce07da4ddf6fb258e )
Alfredo Deza [Fri, 16 Aug 2019 11:45:06 +0000 (07:45 -0400)]
Merge pull request #29702 from jan--f/wip-41308-nautilus
nautilus: ceph-volume: [filestore,bluestore] single type strategies fail after tracking devices as sets
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 16 Aug 2019 11:43:52 +0000 (07:43 -0400)]
Merge pull request #29689 from jan--f/wip-41299-nautilus
nautilus: batch functional idempotency test fails since message is now on stderr
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Nathan Cutler [Fri, 16 Aug 2019 09:15:20 +0000 (11:15 +0200)]
Merge pull request #29455 from pdvian/wip-40672-nautilus
nautilus: doc: fix rgw ldap username token
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Jan Fajerski [Thu, 15 Aug 2019 11:28:42 +0000 (13:28 +0200)]
ceph-volume: fix batch functional tests, idempotent test must check stderr
Fixes: https://tracker.ceph.com/issues/41295
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
88807110f3014e7a2a39c37ae5c64bb3ab107d80 )
Jan Fajerski [Thu, 15 Aug 2019 10:20:00 +0000 (12:20 +0200)]
ceph-volume: don't keep device lists as sets
This was introduced by #27754. The explicit device lists were cast to
sets but other parts of the code where not updated accordingly. To avoid
touching all code places, only cast to sets for disjoint test and keep
lists otherwise.
Fixes: https://tracker.ceph.com/issues/41292
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
0534cf188a671096d5ddb9d48cdae3dccc6c0b18 )
Jan Fajerski [Fri, 16 Aug 2019 08:28:08 +0000 (10:28 +0200)]
Merge pull request #29690 from jan--f/wip-41082-nautilus
nautilus: ceph-volume: batch gets confused when the same device is passed in two device lists
Neha Ojha [Wed, 31 Jul 2019 20:08:24 +0000 (13:08 -0700)]
common/options.cc: common/options.cc: change default value of bluestore_fsck_on_umount_deep to false
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
8c86c3a5b4bdca258016019f63359f52aa8cd84b )
Neha Ojha [Wed, 31 Jul 2019 00:05:18 +0000 (17:05 -0700)]
common/options.cc: change default value of bluestore_fsck_on_mount_deep to false
Fixes: https://tracker.ceph.com/issues/41017
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
7c03f088f1004d4e26b6bdea8fa58f8455f1d6a2 )
Yuri Weinstein [Thu, 15 Aug 2019 20:04:32 +0000 (13:04 -0700)]
Merge pull request #29645 from yuriw/wip-yuriw-upgrade-rbd-nautilus
qa/tests: added rbd_fsx tests to the tests mix