]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sebastian Wagner [Fri, 23 Jul 2021 08:09:08 +0000 (10:09 +0200)]
doc/cephadm: MON IP change
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Sebastian Wagner [Fri, 23 Jul 2021 07:54:14 +0000 (09:54 +0200)]
doc/cephadm: Move some sections from mon.rst to serivce-management.rst
Avoid duplication and instead only reference the corresponding sections.
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Kefu Chai [Fri, 23 Jul 2021 06:18:11 +0000 (14:18 +0800)]
Merge pull request #42449 from kevinzs2048/wip-test-sanitize
qa/run-tox-mgr-dashboard: Do not write to /tmp/test_sanitize_password…
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 23 Jul 2021 02:55:29 +0000 (10:55 +0800)]
Merge pull request #41794 from ceph/dependabot/pip/src/ceph-volume/plugin/zfs/pip-19.2
ceph-volume: bump pip in /src/ceph-volume/plugin/zfs
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 23 Jul 2021 01:57:33 +0000 (09:57 +0800)]
ceph-volume: bump pip in /src/ceph-volume/plugin/zfs
Bumps [pip](https://github.com/pypa/pip) from 9.0.1 to 19.2.
- [Release notes](https://github.com/pypa/pip/releases)
- [Changelog](https://github.com/pypa/pip/blob/main/NEWS.rst)
- [Commits](pypa/pip@9.0.1...19.2)
---
updated-dependencies:
- dependency-name: pip
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 23 Jul 2021 01:51:52 +0000 (09:51 +0800)]
Merge pull request #42255 from tchaikov/wip-cmake-mgr-cleanup
cmake: install mgr module separately
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Kefu Chai [Fri, 23 Jul 2021 01:47:53 +0000 (09:47 +0800)]
Merge pull request #42437 from rzarzynski/wip-crimson-generic-alienstore
crimson/os: generalize AlienStore beyond BlueStore.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
Casey Bodley [Thu, 22 Jul 2021 17:23:56 +0000 (13:23 -0400)]
Merge pull request #42455 from dang/wip-dang-zipper-get_obj_state
RGW - Zipper - Make default args match in get_obj_state
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Adam C. Emerson [Thu, 22 Jul 2021 15:59:29 +0000 (11:59 -0400)]
Merge pull request #42247 from pritha-srivastava/wip-rgw-sts-session-policy-fixes
rgw/sts: createbucket op should take session_policies into account
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Casey Bodley [Thu, 22 Jul 2021 15:52:02 +0000 (11:52 -0400)]
Merge pull request #42249 from kalebskeithley/rgw-51599
rgw: cleanup virtual dtor decls and defns
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Daniel Gryniewicz [Thu, 22 Jul 2021 15:48:08 +0000 (11:48 -0400)]
RGW - Zipper - Make default args match in get_obj_state
The default arg for follow_olh was different between the base class and
the Rados class. Fix it so they're the same.
Fixes: https://tracker.ceph.com/issues/51677
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
Neha Ojha [Thu, 22 Jul 2021 15:46:33 +0000 (08:46 -0700)]
Merge pull request #42365 from PracticalMetal/typo
doc: Fix typos and grammar in ecbackend.rst
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Patrick Donnelly [Thu, 22 Jul 2021 14:56:40 +0000 (07:56 -0700)]
Merge PR #42431 into master
* refs/pull/42431/head:
cmake: add "mypy" back to tox envlist of "qa""
qa/tasks/vstart_runner: add optional "sudo" param to _run_python()
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Thu, 22 Jul 2021 14:54:52 +0000 (07:54 -0700)]
Merge PR #42444 into master
* refs/pull/42444/head:
doc/cephfs/journaler: document options using confval directive
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Casey Bodley [Thu, 22 Jul 2021 14:19:17 +0000 (10:19 -0400)]
Merge pull request #42380 from adamemerson/wip-51712
rgw: radosgw-admin errors if marker not specified on data/mdlog trim
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Milind Changire [Thu, 22 Jul 2021 12:50:59 +0000 (18:20 +0530)]
Merge pull request #42329 from vshankar/wip-cephfs-mirror-dir-remove-registery
cephfs-mirror: record directory path cancel in DirRegistry
Reviewed-by: Milind Changire <mchangir@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 12:25:46 +0000 (20:25 +0800)]
Merge pull request #42450 from tchaikov/wip-debian-jaeger
debian/control: depend on libjaeger only if <pkg.ceph.jaeger>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Kevin Zhao [Thu, 22 Jul 2021 06:58:20 +0000 (07:58 +0100)]
qa/run-tox-mgr-dashboard: Do not write to /tmp/test_sanitize_password.txt file
To allow running multiple instances of the same tests.
Fixes: https://tracker.ceph.com/issues/51792
Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org>
Sebastian Wagner [Thu, 22 Jul 2021 10:04:54 +0000 (12:04 +0200)]
Merge pull request #42433 from sebastian-philipp/fix-gen-keepalive-config
mgr/cephadm: Fix haproxy not being recognized as a proper daemon
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Asbjørn Sannes <asbjorn.sannes@interhost.no>
Kefu Chai [Thu, 22 Jul 2021 09:56:52 +0000 (17:56 +0800)]
debian/control: depend on libjaeger only if <pkg.ceph.jaeger>
otherwise we'd have following failure when trying to install ceph
packages if they are not built with pkg.ceph.jaeger profile:
ceph-common : Depends: libjaeger (=
17.0.0-6321-g62349ba4 -1focal) but it is not installable
this change should address the regression introduced by
4b69d3a1844433845eb7000f56be72fb11f4e737
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sebastian Wagner [Wed, 21 Jul 2021 08:45:51 +0000 (10:45 +0200)]
mgr/cephadm: Fix haproxy not being recognized as a proper daemon
Turns out daemon types != service types:
cephadm [WRN] Found unknown service type haproxy on host smithi019
cephadm [WRN] Found unknown service type keepalived on host smithi019
leading to `self.mgr.cache.get_daemons_by_service(spec.service_name())`
not returning any daemons.
Fixes: https://tracker.ceph.com/issues/51311
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 02:46:51 +0000 (10:46 +0800)]
cmake: s/NPM/NPM_EXECUTABLE/
so the naming is more consistent with other executables found by
find_program().
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 02:44:21 +0000 (10:44 +0800)]
cmake: use ${NPM} instead of npm
so it is more explicit that ${NPM} is used when NODEENV is not
specified.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 02:05:53 +0000 (10:05 +0800)]
cmake: simplify the regex for matching npm command
npx command was added in
3fe39d4899f909d4db8bb3fbc1de5367b280620d ,
but we don't use npx anymore, so drop it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 12:44:39 +0000 (20:44 +0800)]
cmake: push dashboard build logic down
it's simpler to build dashboard in dashboard/CMakeLists.txt
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 12:38:45 +0000 (20:38 +0800)]
cmake: push frontend build logic down
it's simpler to build frontend in frontend/CMakeLists.txt
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 11 Jul 2021 00:30:06 +0000 (08:30 +0800)]
pybind/mgr/dashboard: build frontend/dist in build
to enable us to build out of source, we should build the frontend
artifacts out of src. in this change:
* cmake:
- install frontend/dist from build
- drop rules to exclude unused frontend artifacts.
- pass `--output-path` option to ng
- copy `frontend/package.json` to build so that the frontend
can find it
* pybind/mgr/dashboard/module.py: fall back to build directory
if frontend/dist is not found.
* pybind/mgr/dashboard/__init__.py: use frontend/dist when performing
unit test.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Pulkit Mittal [Thu, 22 Jul 2021 08:18:07 +0000 (13:48 +0530)]
doc: fix typo and grammar
Signed-off-by: Pulkit Mittal <2pulkit2@gmail.com>
Kefu Chai [Thu, 22 Jul 2021 07:33:13 +0000 (15:33 +0800)]
Merge pull request #38783 from ideepika/wip-osd-tracing
cmake/ninja: support ninja for jaegertracing
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 10 Jul 2021 13:26:57 +0000 (21:26 +0800)]
cmake: use PATTERN instead of REGEX to exclude installed files
for better readability
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 9 Jul 2021 03:04:04 +0000 (11:04 +0800)]
cmake: install mgr module separately
instead of installing the whole directory, install mgr modules
individually, so it's more clear that what EXCLUDE pattern is
used in which mgr module.
this improves the maintability and readability. in future, we
should only install the artifacts. with this change, we can
specify the include pattern only for dashboard mgr module so
that, for instance, only .js, .html and .css files are installed.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 16:11:37 +0000 (21:41 +0530)]
cmake: fix jaeger linking to ceph libraries
updates:
* custom target jaeger_base
* target jaeger-base which encapsulates all jaeger libs
* include external libraries path needed linking libraries and including
opentracing and jaegertracing headers files
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 16:06:33 +0000 (21:36 +0530)]
cmake: change debian DESTDIR for installing jaeger deps
debian uses debian/tmp as destination dir for installing build files,
but since we are using common path($build_dir/external) available both
for rpm and debian based dependency installation, it becomes far more
complicated to maintain include/link path for these external projects.
elaborating on it:
path we are configuring for both rpm and debian installing including,
and linking of external librarires:
/build/
ceph-17.0.0-5779-g928f9e55 /obj-x86_64-linux-gnu/external/
debian appends DESTDIR to this path, and hence our predefined target
artificats cannot find correct path for external libs, I tried adding
ENV${DESTDIR} so that it could include correct external lib install
path, but it still cannot find them:
failed to link in case of:
- install(DIRECTORY $ENV{DESTDIR}${CMAKE_BINARY_DIR}/external/include/jaegertracing
- $ENV{DESTDIR}${CMAKE_BINARY_DIR}/external/include/opentracing
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- include_directories(SYSTEM ${CMAKE_INSTALL_INCLUDEDIR}/jaegertracing)
- include_directories(SYSTEM ${CMAKE_INSTALL_INCLUDEDIR}/opentracing)
-- Installing: /build/
ceph-17.0.0-5790-g6bc03cbd /debian/tmp/build/
ceph-17.0.0-5790-g6bc03cbd /obj-x86_64-linux-gnu/external/include/jaegertracing/Tracer.h
cd /build/
ceph-17.0.0-5790-g6bc03cbd /obj-x86_64-linux-gnu/src && /usr/bin/c++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -D__CEPH__ -D__STDC_FORMAT_MACROS -D__linux__ -I/build/
ceph-17.0.0-5790-g6bc03cbd /obj-x86_64-linux-gnu/src/include -I/build/
ceph-17.0.0-5790-g6bc03cbd /src -isystem /build/
ceph-17.0.0-5790-g6bc03cbd /obj-x86_64-linux-gnu/boost/include -isystem /build/
ceph-17.0.0-5790-g6bc03cbd /obj-x86_64-linux-gnu/include -isystem /build/
ceph-17.0.0-5790-g6bc03cbd /src/xxHash -isystem /build/
ceph-17.0.0-5790-g6bc03cbd /src/rapidjson/include -isystem /build/
ceph-17.0.0-5790-g6bc03cbd /src/include/jaegertracing -isystem /build/
ceph-17.0.0-5790-g6bc03cbd /src/include/opentracing -g -O2 -fdebug-prefix-map=/build/
ceph-17.0.0-5790-g6bc03cbd =. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -U_FORTIFY_SOURCE -Wall -fno-strict-aliasing -fsigned-char -Wtype-limits -Wignored-qualifiers -Wpointer-arith -Werror=format-security -Winit-self -Wno-unknown-pragmas -Wnon-virtual-dtor -Wno-ignored-qualifiers -ftemplate-depth-1024 -Wpessimizing-move -Wredundant-move -Wstrict-null-sentinel -Woverloaded-virtual -fno-new-ttp-matching -fstack-protector-strong -fdiagnostics-color=auto -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -std=c++17 -o CMakeFiles/common-objs.dir/mds/mdstypes.cc.o -c /build/
ceph-17.0.0-5790-g6bc03cbd /src/mds/mdstypes.cc
In file included from /build/
ceph-17.0.0-5790-g6bc03cbd /src/osd/OpRequest.h:21,
from /build/
ceph-17.0.0-5790-g6bc03cbd /src/osd/OpRequest.cc:3:
/build/
ceph-17.0.0-5790-g6bc03cbd /src/common/tracer.h:10:10: fatal error: jaegertracing/Tracer.h: No such file or directory
Since the install path is in our build environment for these librarires,
skipping DESTDIR looks to me hacky fix, but does the job.
with empty destdir:
-- Installing: /build/
ceph-17.0.0-5791-gb97b9640 /obj-x86_64-linux-gnu/external/include/jaegertracing/Tracer.h
cd /build/
ceph-17.0.0-5791-gb97b9640 /obj-x86_64-linux-gnu/src/mon && /usr/bin/c++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -D__CEPH__ -D__STDC_FORMAT_MACROS -D__linux__ -I/build/
ceph-17.0.0-5791-gb97b9640 /obj-x86_64-linux-gnu/src/include -I/build/
ceph-17.0.0-5791-gb97b9640 /src -isystem /build/
ceph-17.0.0-5791-gb97b9640 /obj-x86_64-linux-gnu/boost/include -isystem /build/
ceph-17.0.0-5791-gb97b9640 /obj-x86_64-linux-gnu/include -isystem /build/
ceph-17.0.0-5791-gb97b9640 /src/xxHash -isystem /build/
ceph-17.0.0-5791-gb97b9640 /src/rapidjson/include -isystem /build/
ceph-17.0.0-5791-gb97b9640 /obj-x86_64-linux-gnu/external/include -isystem /build/
ceph-17.0.0-5791-gb97b9640 /src/rocksdb/include -g -O2 -fdebug-prefix-map=/build/
ceph-17.0.0-5791-gb97b9640 =. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -U_FORTIFY_SOURCE -Wall -fno-strict-aliasing -fsigned-char -Wtype-limits -Wignored-qualifiers -Wpointer-arith -Werror=format-security -Winit-self -Wno-unknown-pragmas -Wnon-virtual-dtor -Wno-ignored-qualifiers -ftemplate-depth-1024 -Wpessimizing-move -Wredundant-move -Wstrict-null-sentinel -Woverloaded-virtual -fno-new-ttp-matching -fstack-protector-strong -fdiagnostics-color=auto -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -std=c++17 -o CMakeFiles/mon.dir/MgrMonitor.cc.o -c /build/
ceph-17.0.0-5791-gb97b9640 /src/mon/MgrMonitor.cc
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 16:03:42 +0000 (21:33 +0530)]
cmake: adds BUILD_BYPRODUCT for external build jaegertracing libs
* adds BUILD_BYPRODUCT which tells ninja which library will be generated
after the build(needed for dependent build libs)
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 16:01:03 +0000 (21:31 +0530)]
cmake: minor reorder of boost path in jaeger build external projet
* Boost is a dependency for jaeger, to use the right version, we pass
ceph build boost path to cmake jaeger build step
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 15:57:37 +0000 (21:27 +0530)]
cmake: target name Jaeger >> jaegertracing
since jaegertracing is the original target that jaeger submodule uses in
it's cmake, cmake build complained if named otherwise
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 15:55:23 +0000 (21:25 +0530)]
cmake: move ExternalProjectHelper & IncludeJaeger to BuildJaeger
set_library_properties_for_external_project assists with setting right target
properties for all jaeger dependencies.
IncludeJaeger would take care of linking and creating these targets
having them spread out when they are highly coupled seems not optimal.
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 15:28:52 +0000 (20:58 +0530)]
debian, install-deps.sh: use Build-Profiles to optionally build with jaeger
we will now be using BuildProfileSpec based optional pkg building,
removing comment from .install file is no longer needed If
pkg.ceph.jaeger is enabled debian/control, it shall work to install
jaeger and it's dependencies.
https://wiki.debian.org/BuildProfileSpec.
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 15:24:30 +0000 (20:54 +0530)]
cmake: add find_package(thrift) support for thrift 0.13
adds Findthrift.cmake which is used to find thrift 0.13, as a dependency
for building jaegertracing
* bump up submodule version for jaeger-client-cpp for thrift compiler
removal
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 15:18:02 +0000 (20:48 +0530)]
ceph.spec, cmake, debian: use thrift 0.13+ from distro pkg
the change to build and ship libthift was added when we didn't have 0.13.0
version shipped via distro pkgs, now that centos 8 and F34 supports req.
version, we do not need to build and ship it with jaeger library.
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 05:28:33 +0000 (13:28 +0800)]
Merge pull request #42342 from dsavineau/cephadm_template_jinja2_lint
mgr/cephadm/templates: add jinja2 lint
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 15:07:35 +0000 (20:37 +0530)]
ceph.spec: enable WITH_JAEGER=ON if --with-jaeger passed
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 16:29:21 +0000 (21:59 +0530)]
cmake, ceph.spec, debian: use yaml-cpp >= 0.6
* since focal and centos both have yaml-cpp 0.6 available, which dropped
having boost as it's dependency, moving to 0.6 seems a good upgrade.
* cmake: delete Buildyaml, since distro suppilies v0.6 this is not needed
This fixes the build failure, as jaegertracing requires yaml-cpp v0.6+
```
Could NOT find yaml-cpp: Found unsuitable version "", but required is at
least "0.5.1" (found yaml-cpp_LIBRARY-NOTFOUND)
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Deepika Upadhyay [Wed, 21 Jul 2021 14:57:46 +0000 (20:27 +0530)]
vstart.sh: use quay to pull jaeger instead of docker
In servers like the ones available in sepia labs, users might hit rate
limiting for docker pull, it is better to use quay image to avoid this
issue.
https://blog.container-solutions.com/dealing-with-docker-hub-rate-limiting
Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 01:28:01 +0000 (09:28 +0800)]
doc/cephfs/journaler: document options using confval directive
better maintainablity this way. and drop unsupported options of
- journaler batch interval
- journaler batch max
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 02:08:47 +0000 (10:08 +0800)]
cmake: add "mypy" back to tox envlist of "qa""
This reverts commit
286e46578dcf35ab096dd242338f3751c248683c .
since
0017df2006bda64973799ab50735477674c3a5cd has been merged, let's
add mypy back.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 03:07:55 +0000 (11:07 +0800)]
qa/tasks/vstart_runner: add optional "sudo" param to _run_python()
to silence mypy warnings like:
tasks/vstart_runner.py:691: error: Definition of "_run_python" in base class "LocalCephFSMount" is incompatible with definition in base class "CephFSMount"
tasks/vstart_runner.py:705: error: Definition of "_run_python" in base class "LocalCephFSMount" is incompatible with definition in base class "CephFSMount"
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 01:01:46 +0000 (09:01 +0800)]
Merge pull request #42284 from orozery/remove-calc-target-vector-copies
osdc/Objecter: avoid vector copies in _calc_target
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 00:58:10 +0000 (08:58 +0800)]
Merge pull request #42401 from tchaikov/wip-cmake-version
cmake: drop set(VERSION ...)
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 00:56:43 +0000 (08:56 +0800)]
Merge pull request #42408 from tchaikov/wip-mgr-always-on
mon/MgrMonitor: drop nautilus modules from always_on_modules
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Kefu Chai [Thu, 22 Jul 2021 00:55:46 +0000 (08:55 +0800)]
Merge pull request #42415 from sebastian-philipp/haproxy-user-root
cephadm: haproxy 2.4 defaults to a different container user.
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Neha Ojha [Wed, 21 Jul 2021 23:53:38 +0000 (16:53 -0700)]
Merge pull request #41907 from kamoltat/wip-ksirivad-progress-time-interval
pybind/mgr/progress: introduce 5 second sleep interval
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Patrick Donnelly [Wed, 21 Jul 2021 20:13:43 +0000 (13:13 -0700)]
Merge PR #42295 into master
* refs/pull/42295/head:
doc/cephfs: recover file system after recovering
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Neha Ojha [Wed, 21 Jul 2021 17:40:46 +0000 (10:40 -0700)]
Merge pull request #42402 from ljflores/perf-counter-docs
doc/dev/perf_counters: update docs to include more context about perf counter usage
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 17:35:34 +0000 (01:35 +0800)]
Merge pull request #42333 from tchaikov/wip-doc-program
doc/man/8/ceph-volume: specify "program" for subcommands
Reviewed-by: Neha Ojha <nojha@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:14:35 +0000 (13:14 -0400)]
Merge pull request #42196 from cbodley/wip-qa-rgw-rm-cephadm
qa/rgw: remove rgw_cephadm.yaml from rgw/singleton suite
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Kefu Chai [Wed, 14 Jul 2021 12:54:50 +0000 (20:54 +0800)]
doc/man/8/ceph-volume: specify "program" for subcommands
as per
https://www.sphinx-doc.org/en/master/usage/restructuredtext/domains.html
> Like py:currentmodule, this directive produces no output. Instead, it
> serves to notify Sphinx that all following option directives document
> options for the program called name.
> ...
> The program name may contain spaces (in case you want to document
> subcommands like svn add and svn commit separately).
and to avoid the warnings like:
doc/man/8/ceph-volume.rst:424: WARNING: Duplicate explicit target name:
"cmdoption-ceph-volume-h".
we should specify different "program" for different set of options.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:13:54 +0000 (13:13 -0400)]
Merge pull request #42317 from cbodley/wip-39657
rgw multisite: metadata sync treats all errors as 'transient' for retry
Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:12:29 +0000 (13:12 -0400)]
Merge pull request #41800 from BryceCao/wip-modfiy-XML-when-deleterole-take-error
rgw : modfiy error XML for deleterole
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:11:44 +0000 (13:11 -0400)]
Merge pull request #41858 from BryceCao/wip-del-tenant-parse-in-createrole
rgw : add check for tenant provided in RGWCreateRole
Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:10:30 +0000 (13:10 -0400)]
Merge pull request #42361 from cbodley/wip-49747
qa/rgw: add failing tempest test to blocklist
Reviewed-by: Ali Maredia <amaredia@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:09:10 +0000 (13:09 -0400)]
Merge pull request #35153 from BryceCao/wip-swift-create-bucket-constraint
rgw : skip bucket name detection for system request
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:07:34 +0000 (13:07 -0400)]
Merge pull request #35061 from joke-lee/rgw-multisite-forward-policy-accessblock
rgw: forward request in multisite for RGWDeleteBucketPolicy and RGWDeleteBucketPublicAccessBlock
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Wed, 21 Jul 2021 17:06:47 +0000 (13:06 -0400)]
Merge pull request #42273 from dabukalam/object-lock-retain-date-iso8601
rgw: Dump Object Lock Retain Date as ISO 8601
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 16:13:09 +0000 (00:13 +0800)]
Merge pull request #42425 from cbodley/wip-42788
test/rgw: fix use of poll() with timers in unittest_rgw_dmclock_scheduler
Reviewed-by: Kefu Chai <kchai@redhat.com>
Neha Ojha [Wed, 21 Jul 2021 13:57:41 +0000 (06:57 -0700)]
Merge pull request #42410 from ronen-fr/wip-ronenf-standalone-repair
qa/standalone: fixing the timings when waiting for deep-scrub to start
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Radoslaw Zarzynski [Wed, 21 Jul 2021 10:46:43 +0000 (10:46 +0000)]
crimson/os: let AlienStore adapt MemStore.
This is useful in perf testing and benchmarking as it allows,
through comparison with `CyanStore`, to judge to pentalty of
`AlienStore`.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Radoslaw Zarzynski [Wed, 21 Jul 2021 09:42:06 +0000 (09:42 +0000)]
crimson/os: generalize AlienStore beyond BlueStore.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Radoslaw Zarzynski [Wed, 21 Jul 2021 09:27:34 +0000 (09:27 +0000)]
os: rework the factory of ObjectStore.
The goals here are:
1. make deprecation of `FileStore` easier as creational
dependencies are segmented into a variant of `create()`
that could be cut off altogether with `FileStore`.
2. Allow crimson adapt `create()` without burdening it with
`FileStore`'s dependencies.
3. Simplify the implementation as a bunch of preprocessor
directives accumulated there over the time.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Radoslaw Zarzynski [Wed, 21 Jul 2021 09:07:14 +0000 (09:07 +0000)]
os: make MemStore suitable for AlienStore.
This boils down into 2 things:
1. building `MemStore` for crimson,
2. implementing the crimson-specific variant of `get_omap_values()`.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Sebastian Wagner [Wed, 21 Jul 2021 06:58:18 +0000 (08:58 +0200)]
Merge pull request #42430 from tchaikov/wip-cmake-qa-drop-mypy
cmake: drop "mypy" from tox envlist of "qa"
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 06:49:02 +0000 (14:49 +0800)]
Merge pull request #42418 from tchaikov/wip-crimson-nbd
crimson/tools/store_nbd: pass app.alien() down to FSDriver
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 03:38:22 +0000 (11:38 +0800)]
Merge pull request #42367 from tchaikov/wip-cmake-Og
cmake: add "-Og" to CMAKE_C_FLAGS_DEBUG
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Kefu Chai [Wed, 21 Jul 2021 03:25:40 +0000 (11:25 +0800)]
Merge pull request #42427 from tchaikov/wip-seastore-metric-cleanup
crimson/os/seastore: trade a map with a plain array
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Kefu Chai [Wed, 21 Jul 2021 03:24:40 +0000 (11:24 +0800)]
Merge pull request #42429 from neha-ojha/wip-51638-cleanup
qa/*/test_envlibrados_for_rocksdb.sh: remove OS specific configuration
Reviewed-by: David Galloway <dgallowa@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 21 Jul 2021 02:56:21 +0000 (10:56 +0800)]
cmake: drop "mypy" from tox envlist of "qa"
this change partially reverts
81305b0da9a3e04633c022b12644e2975aa46a0d ,
otherwise we have following errors:
tasks/vstart_runner.py:691: error: Definition of "_run_python" in base class "LocalCephFSMount" is incompatible with definition in base class "CephFSMount"
tasks/vstart_runner.py:705: error: Definition of "_run_python" in base class "LocalCephFSMount" is incompatible with definition in base class "CephFSMount"
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 17:09:40 +0000 (01:09 +0800)]
crimson/os/seastore: trade a map with a plain array
simpler this way, as we don't need a std::map<> at all.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 17:06:51 +0000 (01:06 +0800)]
Merge pull request #42261 from cyx1231st/wip-seastore-metrics-2
crimson/os/seastore: implement metrics at cache level
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 17:05:34 +0000 (01:05 +0800)]
Merge pull request #42386 from liu-chunmei/seastore-metrics
crimson/seastore: add seastore operation latency metrics
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Casey Bodley [Tue, 20 Jul 2021 16:50:25 +0000 (12:50 -0400)]
test/rgw: use spawn library for test_rgw_dmclock_scheduler
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 16:36:59 +0000 (00:36 +0800)]
Merge pull request #41929 from sebastian-philipp/fix-qa-tox
qa: Various make check fixes
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 15:40:13 +0000 (23:40 +0800)]
Merge pull request #42419 from dsavineau/fix_typo_radosgw_admin_max_entries
doc/man/8/radosgw-admin: fix typo on max entries
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sebastian Wagner [Tue, 20 Jul 2021 15:35:09 +0000 (17:35 +0200)]
Merge pull request #42289 from mgfritch/cephadm-test-create-daemon-dirs-prom
cephadm: use pyfakefs during test_create_daemon_dirs_prometheus
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Sebastian Wagner [Tue, 20 Jul 2021 15:34:15 +0000 (17:34 +0200)]
Merge pull request #42028 from mgfritch/cephadm-infer-mismatch-fsid
cephadm: infer fsid from ceph.conf
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Sebastian Wagner [Tue, 20 Jul 2021 15:33:20 +0000 (17:33 +0200)]
Merge pull request #41280 from sebastian-philipp/test_cephadm-stdin
qa/workunits/test_cephadm: Also test stdin
Reviewed-by: Michael Fritch <mfritch@suse.com>
Dimitri Savineau [Tue, 20 Jul 2021 14:49:02 +0000 (10:49 -0400)]
doc/man/8/radosgw-admin: fix typo on max entries
This fixes a typo for the --max-entries option.
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 14:47:07 +0000 (22:47 +0800)]
crimson/tools/store_nbd: mark padding variable with [[maybe_unused]]
also silences -Wunused-variable warning from GCC
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 14:45:50 +0000 (22:45 +0800)]
crimson/tools/store_nbd: pass app.alien() down to FSDriver
this was an oversight in
8fad523d41008727c9a952afcda15b77be50ba3c
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sebastian Wagner [Tue, 20 Jul 2021 14:09:57 +0000 (16:09 +0200)]
cephadm: haproxy 2.4 defaults to a different container user.
Another alternative would be to investigage a different setup
leverageing `--sysctl net.ipv4.ip_unprivileged_port_start=0`,
but that would be a larger PR.
Fixes: https://tracker.ceph.com/issues/51355
Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
Dimitri Savineau [Wed, 14 Jul 2021 18:57:51 +0000 (14:57 -0400)]
mgr/cephadm/templates: add jinja2 lint
This adds a jinja2 lint environment in tox for testing the cephadm jinja2
templates.
This patch fixes some minor jinja2 syntax for ganesha and keepalived even if
the current templates work perfectly.
Tags should have one (and only one) space
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
Kefu Chai [Tue, 20 Jul 2021 08:16:07 +0000 (16:16 +0800)]
cmake: use string(APPEND ...) to concat strings
less repeating this way.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 16 Jul 2021 02:37:23 +0000 (10:37 +0800)]
cmake: add "-Og" to CMAKE_C_FLAGS_DEBUG
without specifying -Og, -O0 is used. as per
https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html
> -O0
> Reduce compilation time and make debugging produce the expected
> results. This is the default.
and
> -Og
> Optimize debugging experience. -Og should be the optimization level of
> choice for the standard edit-compile-debug cycle, offering a reasonable
> level of optimization while maintaining fast compilation and a good
> debugging experience. It is a better choice than -O0 for producing
> debuggable code because some compiler passes that collect debug
> information are disabled at -O0.
and Debug is the default built type if .git directory is found under
the root source directory, so by adding "-Og -g" to CMAKE_C_FLAGS_DEBUG,
developers can have better debugging experience when testing Ceph
built from a git repo. but the downside is that it might take longer
to build the tree.
this change should also enable us to link crimson on aarch64.
the same applies to Clang,
> -O0 Means “no optimization”: this level compiles the fastest and generates the most debuggable code.
> -O1 Somewhere between -O0 and -O2.
> -O2 Moderate level of optimization which enables most optimizations.
> -Og Like -O1. In future versions, this option might disable different optimizations in order to improve debuggability.
see
https://clang.llvm.org/docs/CommandGuide/clang.html#cmdoption-o0
see also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101448
Fixes: https://tracker.ceph.com/issues/51441
Signed-off-by: Kefu Chai <kchai@redhat.com>
Casey Bodley [Tue, 20 Jul 2021 12:04:59 +0000 (08:04 -0400)]
Merge pull request #42413 from galsalomon66/fix_s3tests_yaml
RGW:revert force-branch to be ceph-master (s3-tests)
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sebastian Wagner [Tue, 20 Jul 2021 10:09:33 +0000 (12:09 +0200)]
Merge pull request #42304 from sebastian-philipp/doc-dameon-add-note
doc/cephadm: add notes to `orch daemon add`
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
Sebastian Wagner [Tue, 20 Jul 2021 10:09:20 +0000 (12:09 +0200)]
Merge pull request #42372 from sebastian-philipp/doc-cephadm-rgw-ssl
doc/cephadm: Add RGW ssl
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
galsalomon66 [Tue, 20 Jul 2021 09:48:00 +0000 (12:48 +0300)]
revert force-branch to be ceph-master
Signed-off-by: galsalomon66 <gal.salomon@gmail.com>
Yingxin Cheng [Thu, 15 Jul 2021 08:24:39 +0000 (16:24 +0800)]
crimson/os/seastore/cache: report dirty extents usage
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Yingxin Cheng [Thu, 15 Jul 2021 08:09:51 +0000 (16:09 +0800)]
crimson/os/seastore/cache: report cached extents usage
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Yingxin Cheng [Thu, 15 Jul 2021 06:36:09 +0000 (14:36 +0800)]
crimson/os/seastore: measure read transaction efforts that are successful
In order to calculate the ratio of discarded vs successful effort from
read-only transactions.
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
Yingxin Cheng [Thu, 15 Jul 2021 02:26:02 +0000 (10:26 +0800)]
crimson/os/seastore: measure transactional efforts that are discarded or committed
The efforts of a transaction include the number and bytes of its read,
mutate, retire and fresh extents, and the bytes of delta generated.
This helps to understand the following aspects:
* The ratio of discarded efforts vs committed efforts;
* The average efforts of a transaction;
* The distribution of read/mutate/delta/retire/fresh efforts;
* The memory overhead and potential disk overhead of a transaction;
* How early a transaction invalidation happens;
* The average extent length;
It is possible to extend the effort metrics to be labeled by extent
types, in case we want to distinguish and profile the efforts at the
sub-component level.
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>