]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Neha Ojha [Fri, 21 May 2021 21:38:24 +0000 (21:38 +0000)]
qa/suites/rados/thrash-old-clients: remove luminous and mimic
We support N-3 client versions.
Signed-off-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 21 May 2021 15:34:21 +0000 (08:34 -0700)]
Merge pull request #41464 from jdurgin/wip-bib
script/build-integration-branch: always generate merge commits
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Kefu Chai [Fri, 21 May 2021 14:26:10 +0000 (22:26 +0800)]
Merge pull request #41476 from tchaikov/wip-crimson-options
crimson/osd: disable allow_guessing when parsing command line options
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Ernesto Puerta [Fri, 21 May 2021 13:31:45 +0000 (15:31 +0200)]
Merge pull request #41474 from rhcs-dashboard/fix-50918-master
mgr/dashboard: remove non-null id in Grafana dashboard
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Kefu Chai [Fri, 21 May 2021 12:10:38 +0000 (20:10 +0800)]
crimson/osd: disable allow_guessing when parsing command line options
we pass "--id <n>" to ceph-osd for specifying the osd id, but seastar
app template also provides an option of "--idle-poll-time-us arg".
boost::program_option::command_line_parser() uses default_style when
parsing options. and default_style includes allow_guessing, which in
turn matches partial option as well, so "--id" matches with "--idle"
when we are trying to figure out which options are consumed by seastar
app template, and which are not. see
https://www.boost.org/doc/libs/1_76_0/doc/html/boost/program_options/command_line_style/style_t.html
so, in this change, stype is specified explicitly, and "allow_guessing"
is removed from the "default_style" before being passed to style(), so
that only the full option name are matched.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Ernesto Puerta [Fri, 21 May 2021 08:57:23 +0000 (10:57 +0200)]
mgr/dashboard: remove non-null id in Grafana dashb
Testing added to prevent this situation.
Fixes: https://tracker.ceph.com/issues/50918
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
zdover23 [Fri, 21 May 2021 06:21:49 +0000 (16:21 +1000)]
Merge pull request #41467 from anthonyeleven/anthonyeleven/rgw-doc-tweaks
Anthony D'Atri [Fri, 21 May 2021 00:14:16 +0000 (17:14 -0700)]
doc/radosgw: update and clarify layout and placement
Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>
Kefu Chai [Fri, 21 May 2021 01:12:55 +0000 (09:12 +0800)]
Merge pull request #41457 from rzarzynski/wip-crimson-test-ertr-return-int
test/crimson: verify the futurization in an errorated future.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Kefu Chai [Fri, 21 May 2021 01:11:02 +0000 (09:11 +0800)]
Merge pull request #41456 from athanatos/sjust/wip-seastore-logging
crimson/os/seastore: fix build failure
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Josh Durgin [Fri, 21 May 2021 00:08:22 +0000 (17:08 -0700)]
Merge pull request #41382 from tchaikov/wip-doc-msgr-fsm-diagram
doc/dev/msgr2: add state machine diagrams
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Fri, 21 May 2021 00:07:34 +0000 (17:07 -0700)]
Merge pull request #41408 from zdover23/wip-doc-security-2021-05-19-fourth-item
doc/security: updating fourth listitem
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Samuel Just [Thu, 20 May 2021 19:02:34 +0000 (12:02 -0700)]
crimson/os/seastore/logging.h: fix LOG/LOGT macros
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Thu, 20 May 2021 19:01:57 +0000 (12:01 -0700)]
Revert "crimson/os/seastore/logging: remove comma"
This wasn't the correct fix.
This reverts commit
0ce58c2066d69ce82d5c7728a085921bc5cec759 .
Signed-off-by: Samuel Just <sjust@redhat.com>
Josh Durgin [Thu, 20 May 2021 23:28:25 +0000 (19:28 -0400)]
script/build-integration-branch: always generate merge commits
This guarantees we'll always get a new sha1, so shaman will generate a
new build even if the same PRs are pushed to more than one branch.
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
zdover23 [Thu, 20 May 2021 21:18:09 +0000 (07:18 +1000)]
Merge pull request #41407 from zdover23/wip-doc-security-2021-05-19-second-item
Wip doc security 2021 05 19 second item
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Patrick Donnelly [Thu, 20 May 2021 19:43:53 +0000 (12:43 -0700)]
Merge PR #41358 into master
* refs/pull/41358/head:
mds: add heartbeat_reset() in start_files_to_reover() to avoid timedout issue
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Thu, 20 May 2021 19:43:25 +0000 (12:43 -0700)]
Merge PR #41338 into master
* refs/pull/41338/head:
mds: reset code after cpu_profiler
cpu_profiler: fix asok command crash
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Thu, 20 May 2021 19:42:19 +0000 (12:42 -0700)]
Merge PR #41084 into master
* refs/pull/41084/head:
test: test to verify dir path removal when no mirror daemons are running
pybind/mirroring: advance state machine from stalled state
pybind/mirroring: start from correct state during policy init
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Radoslaw Zarzynski [Thu, 20 May 2021 19:18:21 +0000 (19:18 +0000)]
test/crimson: verify the futurization in an errorated future.
`seastar::future` allows a lambda passed to e.g. `then()` to
return not only a future but also any non-future type like
a plain integer:
```cpp
seastar::now().then([] {
return 42;
}).then([] (int futurized_life) {
// ...
});
```
In such case, the plain type is being wrapped in a future.
This process is called _futurization_ and is performed by
`seastar::futurize` called from the internals of `future`.
In this commit we want to ensure analogous facility is offered
by errorated futures.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Zac Dover [Wed, 19 May 2021 14:29:40 +0000 (00:29 +1000)]
doc/security: updating fourth item
This PR makes minor changes (nitpicking, really)
to make the sentence a little easier to read.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Zac Dover [Wed, 19 May 2021 14:07:45 +0000 (00:07 +1000)]
doc/security: enriching second point
This PR breaks a long sentence into two shorter
sentences and improves the language.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
zdover23 [Thu, 20 May 2021 19:20:49 +0000 (05:20 +1000)]
Merge pull request #41411 from zdover23/wip-doc-security-2021-05-19-eighth-item
doc/security: enriching eighth listitem
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Samuel Just [Thu, 20 May 2021 18:52:58 +0000 (11:52 -0700)]
Merge pull request #41437 from tchaikov/wip-crimson-logging
crimson/os/seastore/logging: remove comma
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Ilya Dryomov [Thu, 20 May 2021 14:41:22 +0000 (16:41 +0200)]
Merge pull request #41070 from sunnyku/wip-rbd-50522
rbd: fix default pool handling for nbd map/unmap
Reviewed-by: Mykola Golub <mgolub@suse.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Ilya Dryomov [Thu, 20 May 2021 14:40:14 +0000 (16:40 +0200)]
Merge pull request #41340 from tchaikov/wip-ceph-allocator
librbd: do not use ceph::allocator<>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Zac Dover [Wed, 19 May 2021 14:49:23 +0000 (00:49 +1000)]
doc/security: enriching eighth listitem
This PR improves the language in the eighth
listitem in the Vulnerability Management Process.
(This one's pretty nitpicky.)
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Ernesto Puerta [Thu, 20 May 2021 09:33:39 +0000 (11:33 +0200)]
Merge pull request #40328 from rhcs-dashboard/fix-49262-master
mgr/dashboard: provide the service events when showing a service in the UI
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: sebastian-philipp <NOT@FOUND>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 20 May 2021 09:19:44 +0000 (17:19 +0800)]
crimson/os/seastore/logging: remove comma
to address the FTBFS of the release builds.
fix a regression introduced by
c39d64d7bbd7d7cf1d476a44f60c70edce55f3d1
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 20 May 2021 06:34:43 +0000 (14:34 +0800)]
Merge pull request #41396 from tchaikov/wip-crimson-metrics
crimson/os: replace perfcounter with seastar::metrics
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Kefu Chai [Thu, 20 May 2021 06:29:05 +0000 (14:29 +0800)]
Merge pull request #41258 from ronen-fr/wip-ronenf-repair-stat
osd/scrub: separate between PG state flags and internal scrubber operation
Reviewed-by: Neha Ojha <nojha@redhat.com>
Kefu Chai [Thu, 20 May 2021 06:25:18 +0000 (14:25 +0800)]
Merge pull request #41264 from mgfritch/cephadm-sysctl-osd
cephadm: apply sysctl settings
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 20 May 2021 06:24:07 +0000 (14:24 +0800)]
Merge pull request #41368 from idryomov/wip-monc-rotating-timeout
mon/MonClient: tolerate a rotating key that is slightly out of date
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 20 May 2021 06:20:21 +0000 (14:20 +0800)]
Merge pull request #41277 from david-caro/consider_dev_root_mounted
ceph-volume: Consider /dev/root as mounted
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 20 May 2021 06:19:15 +0000 (14:19 +0800)]
Merge pull request #41287 from adk3798/daemon-for-service-warn
mgr/cephadm: warn users if they try to pass a daemon to 'orch rm'
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Kefu Chai [Thu, 20 May 2021 06:18:43 +0000 (14:18 +0800)]
Merge pull request #41356 from tchaikov/wip-options-mgr-mon
common/options: extract mgr and mon options out
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Kefu Chai [Thu, 20 May 2021 06:16:59 +0000 (14:16 +0800)]
Merge pull request #41373 from myoungwon/wip-fix-50806
osd: fix wrong input when calling recover_object()
Reviewed-by: Samuel Just <sjust@redhat.com>
Kefu Chai [Wed, 19 May 2021 10:21:05 +0000 (18:21 +0800)]
test/crimson: remove unnecessary local variable
to return the return value of "make_unique<>()" is more readable, and more
consistent with other part of this source file.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 10:02:59 +0000 (18:02 +0800)]
test/crimson/seastore: teardown in reactor
otherwise, we rely on the destructor of TMTestState to teardown the
fixuture created in TMTestState::_init(), but TMTestState::_init() is
called in reactor. the objects like seastar::metric_groups are
supposed to be destroyed on the same thread where they are created.
because they use thread local storage of storing persisting their status.
if we destroy objects like seastar::metric_groups on different reactor
or thread where they are created, we would have memory leak and
unexpected behavior.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 04:00:19 +0000 (12:00 +0800)]
crimson/os: drop seastore_perf_counters.h
it is not used anymore after the seastar::metrics migration
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 04:40:10 +0000 (12:40 +0800)]
crimson/tools/store_nbd: remove PerfService
since PerfCounter is not used in seastore, there is no need to keep an
instance of PerfService.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 04:32:39 +0000 (12:32 +0800)]
crimson/os: do not create PerfService for SeaStore
because we are replacing PerfCounter with seastart::metrics in crimson,
and the former has already a sharded service builtin in seastar, there
is no need to create PerfService or its counterpart for SeaStore
anymore.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 04:26:15 +0000 (12:26 +0800)]
crimson/os: move ctor of SeaStore into .cc
so the ctor and dtor are colocated in the same file. for better
readability.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 04:01:56 +0000 (12:01 +0800)]
crimson/os: replace perfcounter with metrics in SegmentCleaner
for better support of m:n mapping, and better maintainability.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 04:03:27 +0000 (12:03 +0800)]
crimson/os: register metrics() in TransactionManager's ctor
this change should have been a part of
2356da856784e78750ba7f3b381b31b1c8ad5672
also do not include the unused header file
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 03:56:34 +0000 (11:56 +0800)]
crimson/os: move ctor of SegmentCleaner into .cc
will add more stuff into it. and presumably, smaller header file, faster
compilation.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Samuel Just [Thu, 20 May 2021 04:15:40 +0000 (21:15 -0700)]
Merge pull request #41423 from athanatos/sjust/wip-lba-merge-fix
crimson/.../lba_btree_node_impl: handle relative addr in merge
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Kefu Chai [Thu, 20 May 2021 01:04:33 +0000 (09:04 +0800)]
Merge pull request #41392 from tchaikov/wip-librados
include/rados/librados.h: use UINT64_C to define constants
Reviewed-by: Neha Ojha <nojha@redhat.com>
Josh Durgin [Thu, 20 May 2021 00:42:21 +0000 (17:42 -0700)]
Merge pull request #41409 from zdover23/wip-doc-security-2021-05-19-fifth-item
doc/security: updating fifth listitem
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Thu, 20 May 2021 00:41:38 +0000 (17:41 -0700)]
Merge pull request #41410 from zdover23/wip-doc-security-2021-05-19-seventh-item
doc/security: enrich seventh listitem
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Samuel Just [Thu, 20 May 2021 00:11:02 +0000 (17:11 -0700)]
Merge pull request #41424 from athanatos/sjust/wip-interruptor-unittest-name
test/crimson/CMakeLists.txt: fix name of unittest-interruptible-future
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Xuehan Xu <xuxuehan@360.cn>
Kefu Chai [Thu, 20 May 2021 00:10:11 +0000 (08:10 +0800)]
Merge pull request #41425 from athanatos/sjust/wip-seastore-build
crimson: fix misc build issues
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Samuel Just [Wed, 19 May 2021 21:41:06 +0000 (14:41 -0700)]
crimson/tools/store_nbd/tm_driver: remove perfcounter argument
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Wed, 19 May 2021 21:40:42 +0000 (14:40 -0700)]
crimson/os/seastore/logging: fix log() argument
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Wed, 19 May 2021 21:07:46 +0000 (14:07 -0700)]
test/crimson/CMakeLists.txt: fix name of unittest-interruptible-future
unittest-interruptible-future matches the other unit tests here.
Signed-off-by: Samuel Just <sjust@redhat.com>
Samuel Just [Sat, 8 May 2021 02:42:47 +0000 (02:42 +0000)]
crimson/.../lba_btree_node_impl: handle relative addr in merge
Signed-off-by: Samuel Just <sjust@redhat.com>
Josh Durgin [Wed, 19 May 2021 20:15:37 +0000 (13:15 -0700)]
Merge pull request #40836 from kamoltat/wip-autoscaler-new-alg-turn-on-off
pybind/mgr/pg_autoscaler: Added autoscale-profile feature
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kamoltat [Tue, 13 Apr 2021 21:12:40 +0000 (21:12 +0000)]
pybind/mgr/pg_autoscaler: Added autoscale-profile feature
The autoscaler by default will start out each pool with minimal
pgs and `scale-up` the pgs when there is more usage in each pool.
Users can now use the commands:
`osd pool set autoscale-profile scale-down` to make the pools
start out with a full complement of pgs and only `scale-down`
when usage ratio across the pools are not even.
`osd pool set autoscale-profile scale-up` (by default) to make the pools
start out with minimal pgs and `scale-up` the pgs when there
is more usage in each pool.
Edited KVMonitor.cc file to make the `autoscale_profile` variable
persistent.
Edited tests/test_cal_final_pg_target.py so that it takes into account
the new `profile` argument when calling cal_final_pg_target(). Also,
added some new test cases for when profile is `scale-up`
Renamed tests/test_autoscaler.py to a more appropriate name:
tests/test_cal_ratio.py
Signed-off-by: Kamoltat <ksirivad@redhat.com>
Zac Dover [Wed, 19 May 2021 14:44:00 +0000 (00:44 +1000)]
doc/security: enrich seventh listitem
This PR improves the language of the seventh listitem
in the Vulnerability Management Process in the security
documentation.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Josh Durgin [Wed, 19 May 2021 14:40:59 +0000 (07:40 -0700)]
Merge pull request #41406 from zdover23/wip-doc-security-2021-05-19-first-item
doc/security: removing pleonasm
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Zac Dover [Wed, 19 May 2021 14:37:52 +0000 (00:37 +1000)]
doc/security: updating fifth listitem
This PR enriches the text in the fifth listitem
of the Vulnerability Management Process.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Kefu Chai [Wed, 19 May 2021 14:13:15 +0000 (22:13 +0800)]
Merge pull request #41391 from tchaikov/wip-libcephfs
libcephfs: include <sys/time.h>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Kefu Chai [Wed, 19 May 2021 14:12:24 +0000 (22:12 +0800)]
Merge pull request #41359 from tchaikov/wip-cmake-cleanup
cmake: cleanups related to file(GLOB_RECURSE..) call
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Zac Dover [Wed, 19 May 2021 14:07:45 +0000 (00:07 +1000)]
doc/security: removing pleonasm
s/three business days or less/three business days/
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Kefu Chai [Wed, 19 May 2021 13:19:11 +0000 (21:19 +0800)]
Merge pull request #41355 from tchaikov/wip-doc-rgw-conf
doc/radosgw: use confval directive to define options
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Wed, 19 May 2021 12:38:07 +0000 (20:38 +0800)]
Merge pull request #41399 from idryomov/wip-mrun-if-posix
mrun: avoid == in [ command
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 12:37:44 +0000 (20:37 +0800)]
Merge pull request #41393 from rosinL/fix-50835
common/crc32c_aarch64: fix crc32c unittest failed on aarch64
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 16 May 2021 03:54:19 +0000 (11:54 +0800)]
doc/radosgw: use confval directive to define options
less repeating this way
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Wed, 19 May 2021 11:57:20 +0000 (07:57 -0400)]
Merge PR #41388 into master
* refs/pull/41388/head:
cephadm: write config files as utf-8
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Sage Weil [Wed, 19 May 2021 11:55:30 +0000 (07:55 -0400)]
Merge PR #41286 into master
* refs/pull/41286/head:
qa/suites/orch/rook: disable centos for now
qa/suites/orch/rook/smoke: initial smoke suite
qa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centos
qa/tasks/rook: simplify shutdown
qa/tasks/rook: archive logs
qa/tasks/rook: more orderly cluster teardown
qa/tasks/rook: deploy ceph via rook on top of kubernetes
qa/tasks/kubeadm: install kubernetes with kubeadm
qa/suites: move rados/cephadm -> orch/cephadm; symlink
qa/tasks/cephadm: add whitespace between functions
qa/tasks/cephadm: clean up ctx.manager setup
Reviewed-by: Sébastien Han <seb@redhat.com>
Sage Weil [Wed, 19 May 2021 11:52:17 +0000 (07:52 -0400)]
Merge PR #41370 into master
* refs/pull/41370/head:
mgr/cephadm: pin haproxy image to 2.3.z
Reviewed-by: Daniel Pivonka <dpivonka@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Ernesto Puerta [Wed, 19 May 2021 11:43:42 +0000 (13:43 +0200)]
Merge pull request #41345 from rhcs-dashboard/fix-CVE-2021-3509-master
mgr/dashboard: fix cookie injection issue (CVE-2021-3509)
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ilya Dryomov [Wed, 19 May 2021 11:00:16 +0000 (13:00 +0200)]
mrun: avoid == in [ command
== operator is not supported in POSIX sh (e.g. dash):
./mrun: 24: [: unexpected operator
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Ernesto Puerta [Wed, 19 May 2021 10:41:33 +0000 (12:41 +0200)]
Merge pull request #41104 from rhcs-dashboard/fix-ESOCKETTIMEDOUT-e2e-failure
mgr/dashboard: fix ESOCKETTIMEDOUT E2E failure
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Ernesto Puerta [Wed, 19 May 2021 10:40:02 +0000 (12:40 +0200)]
Merge pull request #41273 from rhcs-dashboard/update-frontend-deps
mgr/dashboard: update frontend deps due to security vulnerabilities
Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
luo rixin [Wed, 19 May 2021 02:27:18 +0000 (10:27 +0800)]
common/crc32c_aarch64: fix crc32c unittest failed on aarch64
On centos 8.2 for aarch64 with gcc 8.3, the complier will use
register v0 conflicting with the register v0 be usded in inline
asm code. Adding the related registers into clobber list to inform
complier avoiding the confict.
Fixes: https://tracker.ceph.com/issues/50835
Signed-off-by: luo rixin <luorixin@huawei.com>
Sage Weil [Tue, 18 May 2021 12:23:36 +0000 (08:23 -0400)]
cephadm: write config files as utf-8
If we don't specify the encoding, python may use something like 'latin-1',
which cannot handle unicode characters.
Signed-off-by: Sage Weil <sage@newdream.net>
Kefu Chai [Wed, 19 May 2021 01:30:08 +0000 (09:30 +0800)]
include/rados/librados.h: use UINT64_C to define constants
UINT64_C add the appropriate suffix to literals, this is more readable
than casting the literal to the expected type.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 01:18:33 +0000 (09:18 +0800)]
libcephfs: include <sys/time.h>
header files should be self-contained. we are using `timeval` in the header,
but failed to include the header defining it.
this change addresses the build failures on Darwin like:
int ceph_lutimes(struct ceph_mount_info *cmount, const char *path, struct timeval times[2]);
^
src/include/cephfs/libcephfs.h:1080:78: error: array has incomplete element type 'struct timeval'
int ceph_futimes(struct ceph_mount_info *cmount, int fd, struct timeval times[2]);
^
src/include/cephfs/libcephfs.h:1080:65: note: forward declaration of 'struct timeval'
int ceph_futimes(struct ceph_mount_info *cmount, int fd, struct timeval times[2]);
^
3 errors generated.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 19 May 2021 00:47:34 +0000 (08:47 +0800)]
Merge pull request #41390 from batrick/i50865
doc: use sphinx .dot include
Reviewed-by: Kefu Chai <kchai@redhat.com>
Patrick Donnelly [Tue, 18 May 2021 20:43:28 +0000 (13:43 -0700)]
Merge PR #41357 into master
* refs/pull/41357/head:
mds: do not assert when receiving a unknow metric type
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Patrick Donnelly [Tue, 18 May 2021 20:42:47 +0000 (13:42 -0700)]
Merge PR #41347 into master
* refs/pull/41347/head:
mon,doc: deprecate CephFS min_compat_client
doc: add alternate_name cephfs feature to table
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Patrick Donnelly [Tue, 18 May 2021 20:42:09 +0000 (13:42 -0700)]
Merge PR #41332 into master
* refs/pull/41332/head:
mds: place the journaler pointer under the mds_lock
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 18 May 2021 20:41:28 +0000 (13:41 -0700)]
Merge PR #41171 into master
* refs/pull/41171/head:
test: disable mirroring module for certain tests
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 18 May 2021 20:40:45 +0000 (13:40 -0700)]
Merge PR #41097 into master
* refs/pull/41097/head:
cephfs-mirror: allow connecting to local cluster using mon address
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
Patrick Donnelly [Tue, 18 May 2021 20:36:05 +0000 (13:36 -0700)]
Merge PR #40885 into master
* refs/pull/40885/head:
doc: document cephfs-mirror configuration options
cephfs-mirror: use sensible mount timeout when mounting local/remote fs
test: add tests for settting mount timeout
pybind/cephfs: add interface to set mount timeout
libcephfs: add interface to set mount timeout
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Tue, 18 May 2021 20:20:20 +0000 (13:20 -0700)]
Merge PR #41371 into master
* refs/pull/41371/head:
mds/Mutation: initialize MutationImpl object's initiated_at
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Tue, 18 May 2021 18:37:32 +0000 (13:37 -0500)]
qa/suites/orch/rook: disable centos for now
We are hitting an selinux denial:
type=AVC msg=audit(
1621353663 .595:6016): avc: denied { write } for pid=28812 comm="cephcsi" name="pids.max" dev="cgroup" ino=2933 scontext=system_u:system_r:container_t:s0:c43,c177 tcontext=system_u:object_r:cgroup_t:s0 tclass=file permissive=1
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 14 May 2021 15:45:00 +0000 (10:45 -0500)]
qa/suites/orch/rook/smoke: initial smoke suite
- os: 18.04, 20.04, centos, centos+kubic
- nodes: 1 or 3
- rook: 1.6.2 or master
- k8s: 1.21 always (for now)
- net: calico always (flannel + centos is wonky)
- workload: none, rados bench
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 18 May 2021 14:54:42 +0000 (09:54 -0500)]
qa/tasks/rook: ROOK_HOSTPATH_REQUIRES_PRIVILEGED=true on centos
This fixes OSD creation on centos.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 18 May 2021 14:54:15 +0000 (09:54 -0500)]
qa/tasks/rook: simplify shutdown
For some reason deleting common.yaml sometimes fails. Not really
sure why, but since we will tear down kubernetes anyway this
cleanup isn't really needed.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 18 May 2021 14:53:39 +0000 (09:53 -0500)]
qa/tasks/rook: archive logs
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 18 May 2021 13:57:12 +0000 (08:57 -0500)]
qa/tasks/rook: more orderly cluster teardown
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 13 May 2021 14:26:35 +0000 (09:26 -0500)]
qa/tasks/rook: deploy ceph via rook on top of kubernetes
This assumes that k8s is installed and kubectl works.
The ceph container to use is selected the same way the cephadm
task does it.
All scratch devices are consumed as OSDs.
A ceph.conf and client.admin keyring are deployed on all test
nodes, so normal tasks should work (if/when packages are installed).
Fixes: https://tracker.ceph.com/issues/47507
Signed-off-by: Sage Weil <sage@newdream.net>
Patrick Donnelly [Tue, 18 May 2021 18:13:00 +0000 (11:13 -0700)]
doc: use sphinx .dot include
To compile svg automatically into docs.
Fixed: https://tracker.ceph.com/issues/50865
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Josh Durgin [Tue, 18 May 2021 17:56:05 +0000 (10:56 -0700)]
Merge pull request #40921 from kamoltat/wip-pool-start-out-with-1-pg
mon/OSDMonitor: prepare_new_pool() starts out with 1 pg
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Tue, 18 May 2021 16:23:48 +0000 (12:23 -0400)]
Merge PR #41383 into master
* refs/pull/41383/head:
doc/security: Add single GPG key in lieu of existing three GPG keys
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 7 May 2021 18:24:31 +0000 (13:24 -0500)]
qa/tasks/kubeadm: install kubernetes with kubeadm
- install k8s with kubeadm
- initial support for flannel only
- remove taint from bootstrap/master node
- create PVs for all scratch_devs + a 'scratch' SC
- kubeadm.kubectl task
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 14 May 2021 15:40:02 +0000 (10:40 -0500)]
qa/suites: move rados/cephadm -> orch/cephadm; symlink
Move cephadm under orch/ top-level suite. Symlink so that we
still include it in a rados run.
Signed-off-by: Sage Weil <sage@newdream.net>
Kefu Chai [Tue, 18 May 2021 15:37:22 +0000 (23:37 +0800)]
Merge pull request #41352 from tchaikov/wip-crimson-metrics
crimson/os/seastore: use seastar::metrics for metrics reporting
Reviewed-by: Amnon Hanuhov <ahanukov@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>