Commit Graph

122556 Commits

Author SHA1 Message Date
Sage Weil
e216c1ee11 Merge PR #41072 into master
* refs/pull/41072/head:
	doc/releases/nautilus: fix a braino in 14.2.20 release note

Reviewed-by: Sage Weil <sage@redhat.com>
2021-04-28 18:42:49 -04:00
Sage Weil
f8e872ce2f Merge PR #40924 into master
* refs/pull/40924/head:
	mgr/cephadm: check hostname resolution before adding host
	cephadm: provide a way to checkhost connection without /etc/hosts passed the shell
	doc/cephadm: remove /etc/hosts from list of hostname resoltion methods

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-04-28 14:27:07 -04:00
Josh Durgin
0e273e6760
Merge pull request #40593 from ideepika/wip-new-testing-params
qa/config/rados: add dispatch delay testing params

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sam Just <sjust@redhat.com>
2021-04-28 11:26:58 -07:00
Sage Weil
75480f52e4 Merge PR #40941 into master
* refs/pull/40941/head:
	qa/suites/rados/cephadm/smoke-roleless: test client-keyring
	qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
	cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
	doc/cephadm: document the default 'admin' label
	mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
	mgr/cephadm: reimplement ceph.conf pushing
	mgr/cephadm: use _write_remote_file for ceph.conf
	mgr/cephadm: _write_remote_file helper
	mgr/cephadm: add placementspec for which hosts get ceph.conf

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-04-28 14:26:35 -04:00
Sage Weil
428d3df588 Merge PR #40943 into master
* refs/pull/40943/head:
	mgr/cephadm: skip ok-to-stop for mons in upgrade if < 3 mons
	mgr/cephadm: don't allow upgrade start with less than 2 mgrs

Reviewed-by: Michael Fritch <mfritch@suse.com>
2021-04-28 14:26:07 -04:00
Sage Weil
1b70eed088 Merge PR #41049 into master
* refs/pull/41049/head:
	cephadm: re-assimilate user provided conf after mgr created

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2021-04-28 14:25:30 -04:00
Sage Weil
22f785e186 Merge PR #41055 into master
* refs/pull/41055/head:
	cephadm: allow several public networks be matched

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2021-04-28 14:24:10 -04:00
Kefu Chai
e027864990
Merge pull request #41059 from tchaikov/wip-crimson-clang-cleanup
crimson: clean up issues spotted by the clang compiler

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-29 00:18:26 +08:00
Ilya Dryomov
9ff450340b doc/releases/nautilus: fix a braino in 14.2.20 release note
Setting auth_expose_insecure_global_id_reclaim to false disables the
"disconnect right after authentication" behavior, not the warning.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2021-04-28 18:02:53 +02:00
Kefu Chai
bdd322a2d3
Merge pull request #41063 from tchaikov/wip-rgw-move
rgw/rgw_rest_sts: return local variable w/o std::move()

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
2021-04-28 23:35:06 +08:00
zdover23
477ce08323
Merge pull request #41067 from zdover23/wip-doc-crismon-misspelling-fix-2021-Apr-28
doc/crimson: s/Crismon/Crimson/

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-29 00:11:55 +10:00
zdover23
4e67878cb9
Merge pull request #41048 from zdover23/wip-doc-rados-config-cluster-names-2021-Apr-27
doc/rados: rename "Running Multiple Clusters"

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-28 23:28:15 +10:00
Zac Dover
f904078344 doc/crimson: s/Crismon/Crimson/
This misspelling occurred twice in this
document.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-28 23:26:09 +10:00
Kefu Chai
d4eb4c067f crimson/os/seastore: do not capture unused variable
Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-28 20:54:22 +08:00
Kefu Chai
a56f89ddc1 crimson/common: do not capture unused variable
this change silences the warning from clang, like:

 ../src/crimson/common/interruptible_future.h:276:8: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
       [this, func=std::move(func),
        ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-28 20:54:22 +08:00
Kefu Chai
7288dd20d1 crimson/os/seastore: mark final class "final"
this change silences warning like:

 ../src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h:80:18: warning: class with destructor marked 'final' cannot be inherited from [-Wfinal-dtor-non-final-class]
   ~FLTreeOnode() final {}
                  ^
 ../src/crimson/os/seastore/onode_manager/staged-fltree/fltree_onode_manager.h:13:8: note: mark 'crimson::os::seastore::onode::FLTreeOnode' as 'final' to silence this warning
 struct FLTreeOnode : Onode, Value {
        ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-28 20:54:22 +08:00
Kefu Chai
8e85261b80 test/crimson/seastore: do not put braces around scalar initializer
this change silences the warning from clang like:

src/test/crimson/seastore/onode_tree/test_value.h:152:12: warning: braces around scalar initializer [-Wbraced-scalar-init]
     return {static_cast<value_size_t>(size - sizeof(value_header_t))};
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-28 20:54:22 +08:00
Kefu Chai
bdc5b14743 crimson/os/seastore: do not reference non-template with template
this change addresses the build failure with clang:

src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_accessor.h:352:29: error: 'encode_split' following the 'template' keyword does not refer to a template
    test_recorder->template encode_split(split_at, read().p_start());
                   ~~~~~~~~ ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-28 20:54:22 +08:00
Kefu Chai
e69e3dae03 crimson/os/seastore: do not capture label using &
structured binding does not define variables. unlike GCC, Clang does
not allow this. this change address following build failures with clang:

../src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc:210:24:
note: 'result' declared here
      auto &[complete, result] = ret;
                       ^
../src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc:214:6:
error: reference to local binding 'complete' declared in enclosing
lambda expression
            complete = biter == eiter;
            ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-28 20:54:22 +08:00
Zac Dover
87a1ae7a44 doc/rados: rename "Running Multiple Clusters"
This PR corrects a title so that the title
more accurately describes the content in the
section it names.

Fixes: https://tracker.ceph.com/issues/50517 (partially)
Signed-off-by: Zac Dover <zac.dover@gmail.com>
2021-04-28 22:45:30 +10:00
Kefu Chai
60daa38935 rgw/rgw_rest_sts: return local variable w/o std::move()
in C++17, the C++ standard ensures that the return value in this case
can be optimized with copy elision, adding std::move() is not necessary,
and prevents copy elision from happening.

this change also silences the warning of:

../src/rgw/rgw_rest_sts.cc: In member function 'std::unique_ptr<rgw::sal::RGWOIDCProvider> rgw::auth::sts::WebTokenEngine::get_provider(const DoutPrefixProvider*, const string&, const string&) const':
../src/rgw/rgw_rest_sts.cc:92:19: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
   92 |   return std::move(provider);
      |          ~~~~~~~~~^~~~~~~~~~
../src/rgw/rgw_rest_sts.cc:92:19: note: remove 'std::move' call

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-28 20:16:01 +08:00
Stanislav Datskevych
cdd7d20b35 cephadm: allow several public networks be matched
Fixes: https://tracker.ceph.com/issues/50548
Signed-off-by: Stanislav Datskevych <me@nek0.net>
2021-04-28 12:39:21 +02:00
Sébastien Han
502409c966
Merge pull request #41032 from leseb/raw-list-json
ceph-volume: fix "device" output
2021-04-28 09:00:34 +02:00
Kefu Chai
d30875269e
Merge pull request #41002 from strenuous-life/wip-cephadm-daemon-restart-mgr-loop
mgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may ca…

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
2021-04-28 14:23:28 +08:00
Kefu Chai
49499f3cf5
Merge pull request #41009 from tchaikov/wip-mon-cleanup
mon/OSDMonitor: let OSDMonitor::_get_pending_crush() return

Reviewed-by: Sage Weil <sage@redhat.com>
2021-04-28 12:47:45 +08:00
Sage Weil
e41931d042 qa/suites/rados/cephadm/smoke-roleless: test client-keyring
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 18:29:50 -04:00
Sage Weil
b0dcaf2cfa qa/tasks/cephadm.py: adjust client.admin key mode; place on all hosts
Except during upgrades, since it is not supported there.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 18:29:50 -04:00
Sage Weil
08d21ccc94 cephadm: distribute client.admin keyring+conf to label:_admin on bootstrap
If we are placing ceph.conf in /etc/ceph (the default), tell the cluster
to continue doing this going forward to hosts with the '_admin' label.

This doesn't induce the user to add the admin label to other hosts too,
unfortunately--e probably want them to add the admin label to other mons,
for instance--but it is a start.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 18:29:49 -04:00
Adam King
adc8a9c0a8 cephadm: re-assimilate user provided conf after mgr created
Fixes: https://tracker.ceph.com/issues/50544

Signed-off-by: Adam King <adking@redhat.com>
2021-04-27 14:54:04 -04:00
Kefu Chai
f7294bca9d
Merge pull request #41046 from rzarzynski/wip-crimson-monc-auth_reply
crimson/monc: fix use-after-free around Connection::do_auth_single().

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-28 02:02:32 +08:00
Ernesto Puerta
df945af52d
Merge pull request #40936 from rhcs-dashboard/support-ingress-service-creation-UI
mgr/dashboard: fix HAProxy (now called ingress)

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2021-04-27 19:05:04 +02:00
Ernesto Puerta
95c52c978c
Merge pull request #40426 from rhcs-dashboard/host-maintenance-followups
mgr/dashboard: Host Maintenance Follow ups

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>
2021-04-27 19:03:09 +02:00
Radoslaw Zarzynski
1a3b54ac5e crimson/monc: fix use-after-free around Connection::do_auth_single().
This bug caused following failure in teuthology testing [1]:

```
WARN  2021-04-23 07:08:29,449 [shard 0] osd - ms_handle_reset
WARN  2021-04-23 07:08:29,449 [shard 0] monc - active conn reset v2:172.21.15.100:3300/0
INFO  2021-04-23 07:08:29,449 [shard 0] monc - reopen_session to mon.-1
INFO  2021-04-23 07:08:29,449 [shard 0] monc - close
INFO  2021-04-23 07:08:29,449 [shard 0] monc - connecting to mon.0
...
ERROR 2021-04-23 07:08:29,450 [shard 0] none - /home/jenkins-build/build/workspace/ceph-dev-new-build/ARCH/x86_64/AVAILABLE_ARCH/x86_64/AVAILABLE_DIST/centos8/DIST/centos8/MACHINE_SIZE/gigantic/release/17.0.0-3454-gddedc2e1/rpm/el8/BUILD/ceph-17.0.0-3454-gddedc2e1/src/crimson/mon/MonClient.cc:228 : In function 'crimson::mon::Connection::do_auth_single(crimson::mon::Connection::request_t)::<lambda(Ref<MAuthReply>)>', ceph_assert(%s)
closed
```

[1]: http://pulpito.front.sepia.ceph.com/rzarzynski-2021-04-22_00:20:19-rados-master-distro-basic-smithi/6063316/

The root cause is in freeing the `active_con` in `Client::reopen_session()`
while there still could be the second, ongoing part of `do_auth_single()`.
This fix rectifies the issue by switching `std::unique_ptr` to `seastar::shared_ptr`
and extending the life-time with the help of `seastar::enable_shared_from_this<T>`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-27 14:40:50 +00:00
Patrick Donnelly
eb0fdad52c
Merge PR #40810 into master
* refs/pull/40810/head:
	test: tests for *at() libcephfs APIs
	test: cleanup files/dirs before finishing test
	client: non-at APIs call at-APIs with CEPHFS_AT_FDCWD as file descriptor
	libcephfs: introduce basic *at() calls
	client: remove redundant caps_issued_mask() call in Client::fstatx()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-04-27 07:40:15 -07:00
Sage Weil
b6b85edfe5 doc/cephadm: document the default 'admin' label
Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 09:45:54 -04:00
Sage Weil
b7e4f60178 mgr/cephadm: 'ceph orch client-keyring ...' commands to manage keyring files
Teach cephadm to manage keyring files on cluster hosts.  These keys must
already exist in the mon auth database--cephadm does not create them if
they don't exist (and will issue warnings to the log if they do not).

A ceph.conf is pushed implicitly along with the keyring file.

Each keyring added will be pushed to the hosts described by the placement
spec with the appropriate ownership and mode.  If the ownership, mode, or
path are modified, the files are rewritten or removed as need.

If the client-keyring entry is removed, the keyring files are removed.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 09:45:54 -04:00
Sage Weil
77411e7df3 mgr/cephadm: reimplement ceph.conf pushing
Use a more generic inventory map of paths to digests to track what we've
pushed.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-04-27 09:45:45 -04:00
Radoslaw Zarzynski
180ab53eeb crimson/monc: assert Connection::handle_auth_reply() is truly provided with a msg.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-27 13:26:04 +00:00
Radoslaw Zarzynski
a34dda1213 crimson/monc: rename Connection::reply to auth_reply.
Easier to distinguish from local variables with the same name
we have a few in `MonClient.cc`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-04-27 13:26:04 +00:00
Venky Shankar
9dcf6f7c8c
Merge pull request #40157 from leseb/do-not-fail-when-nosnap
mgr/pybind/snap_schedule: do not fail when no fs snapshots are available

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2021-04-27 18:51:57 +05:30
Nizamudeen A
23bdf201c4 mgr/dashboard: Host Maintenance Follow ups
Added the ability to create a host in maintenance mode

Fixes: https://tracker.ceph.com/issues/49998
Signed-off-by: Nizamudeen A <nia@redhat.com>
2021-04-27 16:11:20 +05:30
Ilya Dryomov
74202456e1
Merge pull request #41035 from ktdreyer/rbd-cache-err-spelling
librbd: fix spelling in immutable-object-cache conn error

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2021-04-27 11:37:33 +02:00
Ernesto Puerta
efda297428
Merge pull request #41037 from tchaikov/wip-npm-audit
mgr/dashboard: upgrade package-lock.json

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
2021-04-27 11:00:30 +02:00
Venky Shankar
8343471a0f
Merge pull request #40933 from vshankar/wip-50266
cephfs-mirror: sanitize `daemons status` JSON

Reviewed-by: Venky Shankar <vshankar@redhat.com>
2021-04-27 12:22:37 +05:30
Kefu Chai
f0e1a16898
Merge pull request #41013 from tchaikov/wip-doc-mds-confval
doc/cephfs/mds-config-ref: render options using confval directive 

Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2021-04-27 13:20:44 +08:00
Kefu Chai
5b7128bdf2
Merge pull request #41022 from tchaikov/wip-cmake-findpmem
cmake/modules/Findpmem: always set pmem_VERSION_STRING

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-04-27 13:19:32 +08:00
Kefu Chai
98afc9e0a2 mgr/dashboard: upgrade package-lock.json
diminish "npm run fix:audit" divergences

Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-04-27 05:04:07 +00:00
jianglong01
cc5b77ee87 mgr/cephadm: The command of 'ceph orch daemon restart mgr.xxx' may case mgr daemon loop to restart
Scene:
The mgr daemon is active. After execing restart command, it may be save "scheduled_daemon_actions": {"mgr.xxx": "restart"}}" to config-key.
So the mgr daemon will restart before call rm_scheduled_daemon_action which case mgr daemon will load restart forever.

Fix mgr infinite restart issue refering to the same solution as 'ceph orch daemon redeploy'.

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
2021-04-27 11:09:09 +08:00
Kefu Chai
7b5ab38ea4
Merge pull request #41010 from rzarzynski/wip-crimson-backtrace-fix-assert
crimson/common: fix broken assertion on FatalSignal setup.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2021-04-27 08:44:04 +08:00
Ken Dreyer
3041937fb5 librbd: fix spelling in immutable-object-cache conn error
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2021-04-26 15:01:41 -06:00