1
0
mirror of https://github.com/ceph/ceph synced 2025-03-21 09:48:37 +00:00
Commit Graph

127484 Commits

Author SHA1 Message Date
Kefu Chai
c2c7297360
Merge pull request from rosinL/wip-fix-dpdk-link
cmake: link against DPDK shared libraries to avoid DPDK EAL double initialization

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2021-10-29 06:58:20 +08:00
Sebastian Wagner
e13aa78289
Merge pull request from batrick/i53074
pybind/mgr/cephadm: upgrade MDS if no MDS is "up"

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-10-29 00:25:59 +02:00
Sebastian Wagner
aae2ea3897
Merge pull request from pcuzner/granular-alerts
mgr/prometheus: expose ceph healthchecks as metrics

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-10-29 00:23:24 +02:00
Sage Weil
3298e496ca Merge PR into master
* refs/pull/43583/head:
	changes to logging code requested by Adam
	remove allocation file after rollback to real-fm
	bug-fix close db when umount failed to store allocation file
	Bug-Fix: When restoring allocation from file use a temp allocator and only copy the allocation to the shared-allocator after the file was verified and all extents were cleared

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
2021-10-28 16:13:32 -04:00
Sage Weil
c9e647ab86 Merge PR into master
* refs/pull/43645/head:
	os/bluestore: Disable compaction then no-column-b is storing allocations to bluefs file

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Gabriel Benhanokh <gbenhano@redhat.com>
2021-10-28 16:12:36 -04:00
Ernesto Puerta
78d6ac0d35
Merge pull request from rhcs-dashboard/wip-cephadm_box-master
cephadm: add cephadm sandbox (Docker in Docker)

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: sebastian-philipp <NOT@FOUND>
2021-10-28 16:59:47 +02:00
Sebastian Wagner
9a8de97f7a
Merge pull request from liewegas/misc-rook-1
mgr/orchestrator: log exception from wrapper

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-10-28 16:56:23 +02:00
Sebastian Wagner
558a2ec618
Merge pull request from sebastian-philipp/CEPHADM_STRAY_DAEMON
doc/cephadm/operations: extend CEPHADM_STRAY_DAEMON

Reviewed-by: Adam King <adking@redhat.com>
2021-10-28 15:05:58 +02:00
Sebastian Wagner
baea97f4fa
Merge pull request from sebastian-philipp/doc-cephadm-osd-similar-disk-layout
doc/cephadm: improve "Deploying OSDs on multiple similar hosts"

Reviewed-by: Joao Eduardo Luis <joao@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2021-10-28 12:14:57 +02:00
Sebastian Wagner
e7fdd7d065
Merge pull request from Daniel-Pivonka/cephadm-doc-osd-replace-host
doc/cephadm: note that replacment osd needs to be on same host as removed osd

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2021-10-28 12:13:23 +02:00
Samuel Just
856b793519
Merge pull request from cyx1231st/wip-seastore-fix-test-setup-teardown
crimson/os/seastore: initialize tests in seastar reactor

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
2021-10-28 03:11:05 -07:00
Pere Diaz Bou
59dd41027d cephadm/box: add no-tmpfs flag prepare osd bluestore
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-10-28 09:25:28 +02:00
Patrick Donnelly
d771725664
pybind/mgr/cephadm: upgrade MDS if no MDS is "up"
The upgrade process can get stuck if an MDS crashes. This should be rare
when straddling v16.2.5 where the compatset of the file system inherits
the FSMap "default". The MDS from pre-v16.2.5 do not yet share a
compatset with the mons so the mons will do no promotions, causing
upgrade task to get stuck.

Fixes: https://tracker.ceph.com/issues/53074
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2021-10-27 20:36:42 -04:00
Kefu Chai
f1b4231d48
Merge pull request from rzarzynski/wip-auth-drop-get_supported_con_modes
auth: drop unused get_supported_con_modes() from AuthServer.

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2021-10-28 08:25:06 +08:00
Sage Weil
9502953d4d mgr/orchestrator: log exception from wrapper
This lets us see a proper traceback when we are calling across
modules.

Signed-off-by: Sage Weil <sage@newdream.net>
2021-10-27 16:31:06 -05:00
Radoslaw Zarzynski
a578cedea3 auth: drop unused get_supported_con_modes() from AuthServer.
In 2d53093875 its last user has
been removed.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-10-27 16:08:08 +00:00
zdover23
6d0e87ccaf
Merge pull request from ybwang0211/doc-host
doc: The description of "Host" on the page is inconsistent

Signed-off-by: wangyingbin ybwang0211@163.com
Reviewed-by: Zac Dover <zac.dover@gmail.com>
2021-10-28 00:26:17 +10:00
J. Eric Ivancich
d3170c11ed
Merge pull request from cbodley/wip-52800
rgw: fix lock scope in ObjectCache::get()

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2021-10-27 09:33:08 -04:00
J. Eric Ivancich
71d68c7d31
Merge pull request from thotz/removeusercaps-in-modifyuser
rgw: remove dead code for user-caps from RGWOp_User_Modify

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2021-10-27 09:31:12 -04:00
J. Eric Ivancich
2692132690
Merge pull request from ivancich/wip-add-bucket-listing-log
rgw: add logging to bucket listing so calls are better understood

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2021-10-27 09:30:22 -04:00
J. Eric Ivancich
d72d74a7ed
Merge pull request from wzbxqt327/patch-1
rgw,doc: fix command problem

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2021-10-27 09:28:47 -04:00
Mykola Golub
137238307d
Merge pull request from pkalever/cookie
rbd-nbd: generate and send device cookie with netlink connect request

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
2021-10-27 15:44:16 +03:00
Ernesto Puerta
006b78e3b0
Merge pull request from rhcs-dashboard/add-multiple-hosts-at-once
mgr/dashboard: Cluster Creation Add multiple hosts at once

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>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-10-27 14:41:35 +02:00
Ernesto Puerta
cf09779a16
Merge pull request from rhcs-dashboard/bonding-metrics
monitoring: ethernet bonding filter in Network Load.

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-10-27 14:00:29 +02:00
Ernesto Puerta
6c58893a64
Merge pull request from rhcs-dashboard/fix-gather-facts-fetch-UI
mgr/dashboard: fetch host facts only if get_facts orch feature available

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-10-27 13:18:52 +02:00
Ernesto Puerta
b03183b021
Merge pull request from rhcs-dashboard/review-page-fix
mgr/dashboard: Cluster expansion review page minor bug fixes 

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-10-27 12:23:04 +02:00
Yingxin Cheng
f73bc6a375 crimson/os/seastore: initialize tests in seastar reactor
testing::Test from gtest is constructed and destructed outside seastar
application. It is unexpected for most seastore components, and causing
undefined behaviors.

For example, when registering metrics during construction, the logic
needs to be called inside seastar reactor thread because metrics are
maintained in reactor thread-local variables.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-10-27 15:46:45 +08:00
Yingxin Cheng
fa4d1316c9 crimson/os/seastore: cleanup transaction_manager_test_state
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-10-27 15:46:45 +08:00
Yingxin Cheng
f160986ebe crimson/os/seastore/randomblock-manager: cleanup unit test
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-10-27 15:46:45 +08:00
Yingxin Cheng
6bb3df896f crimson/os/seastore/cache: get block-size from reader
Cache cannot get the correct block size before SegmentManager is
mounted.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-10-27 15:46:45 +08:00
Yingxin Cheng
d5d2a34025 crimson/os/seastore/store-nbd: cleanup headers
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-10-27 15:45:06 +08:00
Yingxin Cheng
1f304ad6da crimson/os/seastore/journal: proper close journal when test finishes
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2021-10-27 15:44:56 +08:00
wangyingbin
0cd5f2b292 doc: The description of "Host" on the page is inconsistent
In the "https://docs.ceph.com/en/latest/radosgw/adminops/#radosgw-admin-ops" page, the description of "Host" is not uniform, so I changed it.

Signed-off-by: wangyingbin <ybwang0211@163.com>
2021-10-27 15:44:19 +08:00
Pere Diaz Bou
e1bc6f24ff monitoring: ethernet bonding filter in Network Load
Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
2021-10-27 09:08:20 +02:00
Kefu Chai
2bce57f9a9
Merge pull request from kkang-wr/master
cmake: add support for python 3.10

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2021-10-27 09:26:05 +08:00
Kefu Chai
fb59b874d6
Merge pull request from rzarzynski/wip-crimson-proper-addrs-for-hbmsgrs
crimson/osd: fix network address selection for hearbeat's messengers.

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
2021-10-27 09:09:01 +08:00
Kefu Chai
eca792ccc7
Merge pull request from javicacheiro/python_data_as_binary
doc/rbd: correct sample code to use byte string for data

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2021-10-27 09:04:18 +08:00
Kefu Chai
d34f4c333a
Merge pull request from rzarzynski/wip-crimson-net-honor_listen_type
crimson/net: FixedCPUServerSocket::accept() respects the listening addr's type.

Reviewed-by: Kefu Chai <tchaikov@gmail.com>
2021-10-27 09:01:44 +08:00
Paul Cuzner
37b82b8793 mgr/prometheus: remove cmake tests
Temporary removal of the cmake test integration

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
2021-10-27 09:58:17 +13:00
Radoslaw Zarzynski
ed8107e8d4 crimson/net: FixedCPUServerSocket::accept() respects the listening addr's type.
For the sake of compliance with the classical OSD where the type
of the listening address is being reflected in the address type
of an accepted connection:

```
int PosixServerSocketImpl::accept(ConnectedSocket *sock, const SocketOptions &opt, entity_addr_t *out, Worker *w) {
  // ...
  sockaddr_storage ss;
  // ...
  int sd = accept_cloexec(_fd, (sockaddr*)&ss, &slen);
  if (sd < 0) {
    return -ceph_sock_errno();
  }

  // ...

  out->set_type(addr_type);
  out->set_sockaddr((sockaddr*)&ss);
  handler.set_priority(sd, opt.priority, out->get_family());
}
```

In Rook crimson binds explicitly to v2 address:

```
INFO  2021-10-26 17:55:08,116 [shard 0] osd - picked address v2:0.0.0.0:0/0
ERROR 2021-10-26 17:55:08,116 [shard 0] none - Falling back to public interface
INFO  2021-10-26 17:55:08,116 [shard 0] osd - picked address v2:0.0.0.0:0/0
```

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2021-10-26 19:44:12 +00:00
Sage Weil
bdad93759b Merge PR into master
* refs/pull/43627/head:
	Revert "Merge pull request  from aclamk/wip-bluefs-fine-grain-locking-2"

Reviewed-by: Neha Ojha <nojha@redhat.com>
2021-10-26 13:18:41 -04:00
Javier Cacheiro
8d99512e14 doc: data must be a byte string
Data must be a byte string in python 3.

Signed-off-by: Javier Cacheiro <javier.cacheiro.lopez@cesga.es>
2021-10-26 17:14:15 +02:00
Sebastian Wagner
a9dd13a0f3
Merge pull request from rhcs-dashboard/kube-v1_events-update
mgr/k8sevents: pin the kubernetes version to 11.0.0 

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
2021-10-26 16:29:42 +02:00
Prasanna Kumar Kalever
2adfe55bcc qa/workunits/rbd: test map/attach with --show-cookie/--cookie options
Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
2021-10-26 19:24:13 +05:30
Prasanna Kumar Kalever
16404dede8 rbd-nbd: allow user to specify cookie at map
Allow user to specify cookie of choice at the time of map

$ rbd device attach rbd-pool/image --device /dev/nbd0 \
	--cookie 6f85d970-10b2-456b-8baf-676aa4d782e4 --options try-netlink

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
2021-10-26 19:24:13 +05:30
Prasanna Kumar Kalever
6df06c7a62 rbd: add --show-cookie/--cookie option for map/attach commands
Example:
$ rbd device map rbd-pool/image --show-cookie --try-netlink --device-type nbd

$ rbd device attach rbd-pool/image --device /dev/nbd0 \
      --cookie 6f85d970-10b2-456b-8baf-676aa4d782e4 --device-type nbd

older Kernel versions can use --force to skip the cookie validation

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
2021-10-26 19:24:13 +05:30
Prasanna Kumar Kalever
833e71282a rbd-nbd: allow attach without --cookie for old kernel versions
For backward compatibility allow attach without --cookie option:

[root@linux-vm1]# rbd-nbd attach rbd-pool/image0 --device /dev/nbd0
/dev/nbd0

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
2021-10-26 19:24:13 +05:30
Prasanna Kumar Kalever
efeb255d10 rbd-nbd: show per device cookie with list command
[root@linux-vm1]# rbd-nbd list-mapped
id    pool      namespace  image   snap  device     cookie
8133  rbd-pool             image0  -     /dev/nbd0  c704cb91-c6cf-466e-a335-0e935c0d5e47

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
2021-10-26 19:24:13 +05:30
Prasanna Kumar Kalever
6ca70ee4f0 rbd-nbd: mandate device cookie for attach command
[root@linux-vm1]# rbd-nbd attach rbd-pool/image0 --device /dev/nbd0 \
                          --cookie c704cb91-c6cf-466e-a335-0e935c0d5e47
/dev/nbd0

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
2021-10-26 19:24:13 +05:30
Prasanna Kumar Kalever
59c08eabf1 rbd-nbd: provide a flag to show device cookie with map command
[root@linux-vm1]# rbd-nbd map rbd-pool/image0 --try-netlink --show-cookie
/dev/nbd0 c704cb91-c6cf-466e-a335-0e935c0d5e47

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
2021-10-26 19:24:13 +05:30