]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoos/bluestore: fix a bug causing unexpected Onode's unpinned state. 39230/head
Igor Fedotov [Sat, 23 Jan 2021 17:33:13 +0000 (20:33 +0300)]
os/bluestore: fix a bug causing unexpected Onode's unpinned state.

There could be a race for Onodes put() and get() methods:

put()(pinned, nref=3)
  int n = --nref; (nref = 2)
  if (n == 2) {
    ..
    std::lock_guard l(ocs->lock);
    ...
    pinned = pinned && nref > 2; (= false)
    ...                                     get()
    if (r) {                                ++nref; (=3)
      n = --nref; (nref = 2)                return;
    }
    ...
    return

As a result nref = 2, pinned = false which is wrong

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit ea0fc57ef57eddc1fb9610850ae766c9fd582bae)

4 years agoos/bluestore: Prevented erasure of element from onode_map during iteration
Adam Kupczyk [Wed, 2 Dec 2020 22:47:30 +0000 (17:47 -0500)]
os/bluestore: Prevented erasure of element from onode_map during iteration

When onode.exists == false getting reference and then releasing it might delete it from container.
It must not happen during iteration.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit 6c8e8a757485d27bfa93d344f3e04aaf29c68cc4)

4 years agoos/bluestore: Purge onode when it does exist
Adam Kupczyk [Wed, 2 Dec 2020 22:44:25 +0000 (17:44 -0500)]
os/bluestore: Purge onode when it does exist

Added logic for erasing onode from onode_map it is last reference and exists==false.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit aaebfe0abe78bf46c52ef6c4481c517353edf9ac)

 Conflicts:
   (trivial) src/os/bluestore/BlueStore.h

4 years agoos/bluestore: Refactor pin() to get more control over its logic
Adam Kupczyk [Sun, 29 Nov 2020 12:46:12 +0000 (13:46 +0100)]
os/bluestore: Refactor pin() to get more control over its logic

Got rid of OnodeCacheShard pin() and unpin() functions.
Moved their validator logic right into Onode put and get functions.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit eaf1b2366aa7701b10eca4ed3e53d51909e8011b)

4 years agoos/bluestore: Only pass that decremented nref to 0 deletes object
Adam Kupczyk [Sun, 29 Nov 2020 09:05:01 +0000 (04:05 -0500)]
os/bluestore: Only pass that decremented nref to 0 deletes object

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
(cherry picked from commit b0e2964ac8a8f3a273046ab8e87a62c1bc4db55c)

4 years agoMerge pull request #38971 from smithfarm/wip-48743-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:57:47 +0000 (08:57 -0800)]
Merge pull request #38971 from smithfarm/wip-48743-octopus

octopus: rgw: distribute cache for exclusive put

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38970 from smithfarm/wip-48693-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:57:21 +0000 (08:57 -0800)]
Merge pull request #38970 from smithfarm/wip-48693-octopus

octopus: rgw: adding user related web token claims to ops log

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38826 from smithfarm/wip-48725-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:56:54 +0000 (08:56 -0800)]
Merge pull request #38826 from smithfarm/wip-48725-octopus

octopus: rgw: fix bucket limit check fill_status warnings

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38821 from smithfarm/wip-48804-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:56:29 +0000 (08:56 -0800)]
Merge pull request #38821 from smithfarm/wip-48804-octopus

octopus: rgw: cls/user: set from_index for reset stats calls

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39046 from smithfarm/wip-48968-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:47:39 +0000 (08:47 -0800)]
Merge pull request #39046 from smithfarm/wip-48968-octopus

octopus: ocf: add support for mapping images within an RBD namespace

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38981 from smithfarm/wip-48864-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:46:52 +0000 (08:46 -0800)]
Merge pull request #38981 from smithfarm/wip-48864-octopus

octopus: rgw/multisite: Verify if the synced object is identical to source

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38829 from smithfarm/wip-48544-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:46:00 +0000 (08:46 -0800)]
Merge pull request #38829 from smithfarm/wip-48544-octopus

octopus: rgw_file: return common_prefixes in lexical order

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agoMerge pull request #38824 from smithfarm/wip-48546-octopus
Yuri Weinstein [Mon, 1 Feb 2021 16:44:11 +0000 (08:44 -0800)]
Merge pull request #38824 from smithfarm/wip-48546-octopus

octopus: rgw: lc: correctly dimension lc shard index vector

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agoMerge pull request #39059 from votdev/issue_48068_tz_octopus
Sebastian Wagner [Mon, 1 Feb 2021 12:25:24 +0000 (13:25 +0100)]
Merge pull request #39059 from votdev/issue_48068_tz_octopus

octopus: cephadm: Various properties like 'last_refresh' do not contain timezone

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #38336 from votdev/wip-48398-octopus
Ernesto Puerta [Fri, 29 Jan 2021 18:34:16 +0000 (19:34 +0100)]
Merge pull request #38336 from votdev/wip-48398-octopus

octopus: mgr/dashboard: display placement column in service table

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agocephadm: Various properties like 'last_refresh' do not contain timezone 39059/head
Volker Theile [Mon, 25 Jan 2021 11:00:56 +0000 (12:00 +0100)]
cephadm: Various properties like 'last_refresh' do not contain timezone

Fixes: https://tracker.ceph.com/issues/48068
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 3fe715201c8c07cf4ea86b590f9682422eeccf33)

4 years agoMerge pull request #39018 from sebastian-philipp/octopus-backport-38766
Sebastian Wagner [Thu, 28 Jan 2021 22:54:07 +0000 (23:54 +0100)]
Merge pull request #39018 from sebastian-philipp/octopus-backport-38766

octopus: cephadm: make "ceph orch {restart|...}" asynchronous

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39019 from sebastian-philipp/octopus-backport-38815
Sebastian Wagner [Thu, 28 Jan 2021 22:53:54 +0000 (23:53 +0100)]
Merge pull request #39019 from sebastian-philipp/octopus-backport-38815

octopus: mgr/cephadm: lock multithreaded access to OSDRemovalQueue

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #39020 from sebastian-philipp/octopus-backport-38904
Sebastian Wagner [Thu, 28 Jan 2021 22:53:35 +0000 (23:53 +0100)]
Merge pull request #39020 from sebastian-philipp/octopus-backport-38904

octopus: cephadm: Don't make sysctl spam the log file

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agorgw: use static_ptr for etag verifiers 38981/head
Casey Bodley [Fri, 18 Sep 2020 14:10:50 +0000 (10:10 -0400)]
rgw: use static_ptr for etag verifiers

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 45a060612ec376110b84c2a2b7783c8a6aee191c)

4 years agorgw: add factory function create_etag_verifier()
Casey Bodley [Fri, 18 Sep 2020 00:58:36 +0000 (20:58 -0400)]
rgw: add factory function create_etag_verifier()

move all of the etag verifier initialization into a helper function.
none of the errors there should be fatal and fail the download, they
should just turn etag verification off

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 8fa8974bbd63fbc8be9cdf929a875910e2147d65)

4 years agorgw: move etag verifiers to namespace rgw::putobj
Casey Bodley [Fri, 18 Sep 2020 00:56:52 +0000 (20:56 -0400)]
rgw: move etag verifiers to namespace rgw::putobj

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 6ad2e3eef3f9bbf41de471ef5bad9502023e113c)

4 years agorgw: simplify out SourceObjType
Casey Bodley [Fri, 18 Sep 2020 00:15:11 +0000 (20:15 -0400)]
rgw: simplify out SourceObjType

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 21cc9034410bb6e675b1b04888e1b85e3eb5d71f)

4 years agorgw: rgw_sync_obj_etag_verify accounts for compressed multipart uploads
Casey Bodley [Thu, 17 Sep 2020 20:23:17 +0000 (16:23 -0400)]
rgw: rgw_sync_obj_etag_verify accounts for compressed multipart uploads

the etag verifier for multipart uploads uses the manifest to get the
logical offsets for each part. but when compression is enabled, those
are offsets into the compressed data. use the source object's compression
info to translate those compressed part offsets back to their original
offsets

Fixes: https://tracker.ceph.com/issues/45992
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 51f79fad8398d35e07f01fa45704124e16fadeec)

4 years agorgw: ETagVerifier_MPU takes existing offset vector
Casey Bodley [Thu, 17 Sep 2020 23:26:51 +0000 (19:26 -0400)]
rgw: ETagVerifier_MPU takes existing offset vector

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2c1934bd3746697249b95b3f79f4c05425d7b40e)

4 years agorgw: add helper to decode compression info from single attr
Casey Bodley [Thu, 17 Sep 2020 17:26:32 +0000 (13:26 -0400)]
rgw: add helper to decode compression info from single attr

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a5520be135156c867a6502845603e2afdbb0a44a)

4 years agoRGW:Multisite: Check rgw_sync_obj_etag_verify option only once
Prasad Krishnan [Tue, 24 Mar 2020 18:19:59 +0000 (18:19 +0000)]
RGW:Multisite: Check rgw_sync_obj_etag_verify option only once

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit f92cfaf74f1eb8809653867b8c67a3ace37619f2)

4 years agoRGW:Multisite: Convert is_mpu_obj into an enum SourceObjType
Prasad Krishnan [Fri, 20 Mar 2020 20:01:35 +0000 (20:01 +0000)]
RGW:Multisite: Convert is_mpu_obj into an enum SourceObjType

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit fa5422597837032d97f9afceff8b5a22fad0cda7)

4 years agoRGW:Multisite: Rename rgw_sync_obj_integrity to rgw_sync_obj_etag_verify
Prasad Krishnan [Thu, 19 Mar 2020 01:25:13 +0000 (01:25 +0000)]
RGW:Multisite: Rename rgw_sync_obj_integrity to rgw_sync_obj_etag_verify

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 6c4262bfa7d54563ea8bf616154a6b3491d59347)

4 years agoRGW:Multisite: Rename rgw_copy_verify_object to rgw_sync_obj_integrity
Prasad Krishnan [Wed, 18 Mar 2020 18:03:15 +0000 (18:03 +0000)]
RGW:Multisite: Rename rgw_copy_verify_object to rgw_sync_obj_integrity

This patch renames the option rgw_copy_verify_object to
rgw_sync_obj_integrity and incorporates more changes suggested through
code-review comments.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 31e944fced60e47139973361cbb753aeaeb3c863)

4 years agoRGW:Multisite: Create a new filter for ETag Verifier
Prasad Krishnan [Mon, 16 Mar 2020 18:45:36 +0000 (18:45 +0000)]
RGW:Multisite: Create a new filter for ETag Verifier

This patch re-writes the ETag verifier into a filter that peeks into the
incoming stream of data and calculates MD5 checksum.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 2677c4b88806d4af6d525157e7006c1b0ca1b964)

4 years ago[RGW][Multisite] Add multisite verifier support for MPU objects
Prasad Krishnan [Fri, 6 Mar 2020 05:08:05 +0000 (05:08 +0000)]
[RGW][Multisite] Add multisite verifier support for MPU objects

The Etag for MPU objects is calculated using a method different from how
it is done for atomic objects. This patch makes use of the RGWObjManifest
to determine the parts in the source cluster and re-computes the ETag in
a similar fashion at the destination cluster during multisite sync for
verification.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 6f085bb9cb6cffddcf2eed18a7295a3dd59f755f)

4 years agoRGW:Multisite: Verify if the synced object is identical to source
Prasad Krishnan [Sun, 23 Feb 2020 06:09:49 +0000 (11:39 +0530)]
RGW:Multisite: Verify if the synced object is identical to source

Introduce an option 'rgw_copy_verify_object' which allows the object
copied from remote cluster through multisite sync is identical to the
source object. This is done by generating the MD5 checksum of the data
being copied and compared to the ETAG stored as part of the object's
attribute.

Signed-off-by: Prasad Krishnan <prasad.krishnan@flipkart.com>
(cherry picked from commit 23fb5d7b786f1034a02c991c6a648e455b5b9c30)

4 years agoMerge pull request #39071 from smithfarm/wip-49003-octopus
Kefu Chai [Thu, 28 Jan 2021 11:58:42 +0000 (19:58 +0800)]
Merge pull request #39071 from smithfarm/wip-49003-octopus

octopus: test/run-cli-tests: use cram from github

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocephadm: Don't make sysctl spam the log file 39020/head
Sebastian Wagner [Thu, 14 Jan 2021 11:04:03 +0000 (12:04 +0100)]
cephadm: Don't make sysctl spam the log file

`sysctl -a` really spams the log file in Teuthology

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 70722a2efb5207f7d6fc7e8ecf4aab71e2a1a39d)

Conflicts:
  src/cephadm/cephadm

4 years agotest/downloads: drop cram-0.5 tar ball 39071/head
Kefu Chai [Sat, 23 Jan 2021 18:13:31 +0000 (02:13 +0800)]
test/downloads: drop cram-0.5 tar ball

since we install cram from github, drop the tarball from repo

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit d8cbe4eec11ef7f9fbbb61666b9ec7a262c1a85c)

4 years agotest/run-cli-tests: use cram from github
Kefu Chai [Sat, 23 Jan 2021 18:12:31 +0000 (02:12 +0800)]
test/run-cli-tests: use cram from github

to address the failure of

  WARNING: Built wheel for cram is invalid: Metadata 1.2 mandates PEP 440 version, but '0.5.0ceph.2011-01-14' is not
Failed to build cram

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c74e614813d69ef38139e5e745873dc2a31b1c59)

4 years agomgr/dashboard: display placement column in service table 38336/head
Volker Theile [Tue, 5 Jan 2021 10:57:15 +0000 (11:57 +0100)]
mgr/dashboard: display placement column in service table

Fixes: https://tracker.ceph.com/issues/44404
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 1c722aa89ec1efbf5cc76ea968a1f9a725a86e57)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/placement.pipe.ts
Both files need to be adapted to replaced $localize with i18n.

4 years agoocf: add support for mapping images within an RBD namespace 39046/head
Jason Dillaman [Fri, 22 Jan 2021 15:29:29 +0000 (10:29 -0500)]
ocf: add support for mapping images within an RBD namespace

Support for RBD namespaces was not added to the OCF resource agent.
This commit fixes this oversight and also fixes a bug in handling
of the "rbd device list" output.

Fixes: https://tracker.ceph.com/issues/48964
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2a23a92aaf122627151874c56848667169fac064)

4 years agoMerge pull request #38761 from p-se/wip-48607-octopus
Nathan Cutler [Fri, 22 Jan 2021 17:52:16 +0000 (18:52 +0100)]
Merge pull request #38761 from p-se/wip-48607-octopus

octopus: mgr/dashboard: enable different URL for users of browser to Grafana

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38337 from k0ste/wip-48399-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:17:41 +0000 (09:17 -0800)]
Merge pull request #38337 from k0ste/wip-48399-octopus

octopus: mgr/balancer: fix available pgs sent to calc_pg_upmaps

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #38943 from smithfarm/wip-48889-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:17:02 +0000 (09:17 -0800)]
Merge pull request #38943 from smithfarm/wip-48889-octopus

octopus: do_cmake.sh: use python-3.9 with fedora version 33

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38888 from votdev/wip-46963-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:16:28 +0000 (09:16 -0800)]
Merge pull request #38888 from votdev/wip-46963-octopus

octopus: mgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #38847 from smithfarm/wip-48828-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:14:47 +0000 (09:14 -0800)]
Merge pull request #38847 from smithfarm/wip-48828-octopus

octopus: cmake: add empty RPATH to ceph-diff-sorted

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #38810 from rhcs-dashboard/wip-48794-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:13:46 +0000 (09:13 -0800)]
Merge pull request #38810 from rhcs-dashboard/wip-48794-octopus

octopus: mgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
4 years agoMerge pull request #38801 from callithea/wip-48714-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:10:21 +0000 (09:10 -0800)]
Merge pull request #38801 from callithea/wip-48714-octopus

octopus: mgr/ActivePyModules.cc: always release GIL before attempting to acquire a lock

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38755 from smithfarm/wip-48737-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:07:14 +0000 (09:07 -0800)]
Merge pull request #38755 from smithfarm/wip-48737-octopus

octopus: rpm: require smartmontools on SUSE

Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38595 from callithea/wip-48557-octopus
Yuri Weinstein [Fri, 22 Jan 2021 17:06:19 +0000 (09:06 -0800)]
Merge pull request #38595 from callithea/wip-48557-octopus

octopus: mgr/restful: fix TypeError occurring in _gather_osds()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/cephadm: lock multithreaded access to OSDRemovalQueue 39019/head
Sebastian Wagner [Fri, 8 Jan 2021 12:54:46 +0000 (13:54 +0100)]
mgr/cephadm: lock multithreaded access to OSDRemovalQueue

Since the set can be changed also from the CLI thread

Fixes: https://tracker.ceph.com/issues/47700
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit db7c6a56125a3a36fa50904557280d69829c69d6)

4 years agomgr/cephadm: OSDRemovalQueue: remove some trivial wrappers
Sebastian Wagner [Fri, 8 Jan 2021 11:47:27 +0000 (12:47 +0100)]
mgr/cephadm: OSDRemovalQueue: remove some trivial wrappers

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1f39532e0398c85ccd0c238feb8e3a947758b54c)

4 years agomgr/cephadm: move RemoveUtil into OSDRemovalQueue
Sebastian Wagner [Fri, 8 Jan 2021 11:41:05 +0000 (12:41 +0100)]
mgr/cephadm: move RemoveUtil into OSDRemovalQueue

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit df16b86c7b6e1c11d35de4290a9e164962b4d057)

4 years agomgr/cephadm: move process_removal_queue into OSDRemovalQueue
Sebastian Wagner [Fri, 8 Jan 2021 11:34:40 +0000 (12:34 +0100)]
mgr/cephadm: move process_removal_queue into OSDRemovalQueue

`process_removal_queue` belongs to OSDRemovalQueue
instead of RemoveUtil

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit af52ba47a16703aa1aadbd59d84e8876bdad2f17)

4 years agomgr/cephadm: make OSDRemovalQueue not inherent from set
Sebastian Wagner [Fri, 8 Jan 2021 11:06:10 +0000 (12:06 +0100)]
mgr/cephadm: make OSDRemovalQueue not inherent from set

Instead, let's make it a member.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 086afa9a69cb99258abfab270420b4968d7c3717)

4 years agomgr/cephadm: rename OSDQueue -> OSDRemovalQueue
Sebastian Wagner [Fri, 8 Jan 2021 10:49:00 +0000 (11:49 +0100)]
mgr/cephadm: rename OSDQueue -> OSDRemovalQueue

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit e0f9983b50444d53d6750f9bf1f04556510419eb)

4 years agomgr/cephadm: make `ceph orch {restart|...}` asynchronous 39018/head
Sebastian Wagner [Mon, 14 Sep 2020 12:28:16 +0000 (14:28 +0200)]
mgr/cephadm: make `ceph orch {restart|...}` asynchronous

Othwerwiese we'd block the CLI handler thread.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit c6e4b9ab9ca317c840613167df9ec17fe6173592)

4 years agoMerge pull request #38808 from badone/wip-48528-octopus
Ernesto Puerta [Fri, 22 Jan 2021 10:12:36 +0000 (11:12 +0100)]
Merge pull request #38808 from badone/wip-48528-octopus

octopus: install-deps.sh: Make powertools repo case insensitive

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38973 from rhcs-dashboard/wip-48928-octopus
Ernesto Puerta [Thu, 21 Jan 2021 17:14:21 +0000 (18:14 +0100)]
Merge pull request #38973 from rhcs-dashboard/wip-48928-octopus

octopus: mgr/dashboard: add `--ssl` to `ng serve`

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38867 from callithea/wip-48809-octopus
Ernesto Puerta [Thu, 21 Jan 2021 17:10:33 +0000 (18:10 +0100)]
Merge pull request #38867 from callithea/wip-48809-octopus

octopus: mgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38593 from callithea/wip-48578-octopus
Ernesto Puerta [Thu, 21 Jan 2021 16:54:52 +0000 (17:54 +0100)]
Merge pull request #38593 from callithea/wip-48578-octopus

octopus: mgr/prometheus: Fix 'pool filling up' with >50% usage

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: p-se <pseidensal@suse.com>
4 years agoMerge pull request #38496 from bk201/wip-48460-octopus
Ernesto Puerta [Thu, 21 Jan 2021 16:52:52 +0000 (17:52 +0100)]
Merge pull request #38496 from bk201/wip-48460-octopus

octopus: mgr/dashboard: allow selecting all daemons for Orchestrator NFS clusters

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #38347 from smithfarm/wip-48378-octopus
Yuri Weinstein [Thu, 21 Jan 2021 16:52:31 +0000 (08:52 -0800)]
Merge pull request #38347 from smithfarm/wip-48378-octopus

octopus: mon: validate crush-failure-domain

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #37930 from rhcs-dashboard/wip-48079-octopus
Ernesto Puerta [Thu, 21 Jan 2021 16:51:19 +0000 (17:51 +0100)]
Merge pull request #37930 from rhcs-dashboard/wip-48079-octopus

octopus: mgr/dashboard: Prevent table items from getting selected while expanding

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #38951 from smithfarm/wip-48888-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:24:27 +0000 (08:24 -0800)]
Merge pull request #38951 from smithfarm/wip-48888-octopus

octopus: cmake: detect and use sigdescr_np() if available

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #38421 from smithfarm/wip-48429-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:23:25 +0000 (08:23 -0800)]
Merge pull request #38421 from smithfarm/wip-48429-octopus

octopus: rgw: avoid expiration early triggering caused by overflow

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
4 years agoMerge pull request #38420 from smithfarm/wip-48427-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:22:25 +0000 (08:22 -0800)]
Merge pull request #38420 from smithfarm/wip-48427-octopus

octopus: rgw: S3 Put Bucket Policy should return 204 on success

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38339 from smithfarm/wip-48345-octopus
Yuri Weinstein [Wed, 20 Jan 2021 16:21:39 +0000 (08:21 -0800)]
Merge pull request #38339 from smithfarm/wip-48345-octopus

octopus: rgw: fix invalid payload issue when serving s3website error page

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agomgr/dashboard: add `--ssl` to `ng serve` 38973/head
Tatjana Dehler [Tue, 12 Jan 2021 09:28:35 +0000 (10:28 +0100)]
mgr/dashboard: add `--ssl` to `ng serve`

Add the `--ssl` option to the `ng serve` command in order to
reflect the changes to the cookies (https://tracker.ceph.com/issues/44591)
and be able to log into the dashboard by using the development server.

Fixes: https://tracker.ceph.com/issues/48847
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 3971cdb0a64c077c9d136135b745778d875e0dae)

 Conflicts:
src/pybind/mgr/dashboard/frontend/package.json
     - Adopted master branch changes.

4 years agorgw: distribute cache for exclusive put 38971/head
Or Friedmann [Wed, 16 Dec 2020 16:09:24 +0000 (18:09 +0200)]
rgw: distribute cache for exclusive put

Distribute cache for exclusive put

Fixes: https://tracker.ceph.com/issues/48632
Thanks to Casey Bodley for finding the solution

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 4fb51bc125b4ec23c2f47e7326d67f885f7d268c)

4 years agorgw: adding user related web token claims to ops log 38970/head
Pritha Srivastava [Mon, 11 May 2020 17:52:02 +0000 (23:22 +0530)]
rgw: adding user related web token claims to ops log
for auditing purposes.

Fixes: https://tracker.ceph.com/issues/45989
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit bb6a68ec14f07c17fdf68243aaec35c17d5e01bf)

4 years agocmake: detect and use sigdescr_np() if available 38951/head
David Disseldorp [Tue, 1 Sep 2020 11:49:21 +0000 (13:49 +0200)]
cmake: detect and use sigdescr_np() if available

sys_siglist is deprecated with glibc 2.32. A new thread-safe and
async-signal safe sigdescr_np() function is provided, so use it if
available.

Fixes: https://tracker.ceph.com/issues/47187
Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit b9b6faf66ae67648626470cb4fc3f0850ac4d842)

4 years agodo_cmake.sh: use python-3.9 with fedora version 33 38943/head
Sunny Kumar [Fri, 23 Oct 2020 14:38:39 +0000 (15:38 +0100)]
do_cmake.sh: use python-3.9 with fedora version 33

Fedora-33 (rawhide) now has python-3.9.
Build breaks on Fedoa-33 with Traceback:
CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:165 (message):
  Could NOT find Python3: Found unsuitable version "3.9.0", but required is
  exact version "3.8" (found /usr/bin/python3, found components: Interpreter
  Development)

Fixes: https://tracker.ceph.com/issues/47971
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
(cherry picked from commit 2cc747cf4a55fb38a524ec12f6b6e5888fadf07a)

4 years agoMerge pull request #38626 from batrick/i48635
Yuri Weinstein [Fri, 15 Jan 2021 18:54:42 +0000 (10:54 -0800)]
Merge pull request #38626 from batrick/i48635

octopus: qa: tox failures

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36803 from ShyamsundarR/wip-46820-octopus
Yuri Weinstein [Fri, 15 Jan 2021 18:53:59 +0000 (10:53 -0800)]
Merge pull request #36803 from ShyamsundarR/wip-46820-octopus

octopus: mgr/volumes: Implement subvolume version v2

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #38688 from batrick/4ca8aaafa32bb7397eec80a8eb366d2dd781a72f-octopus
Yuri Weinstein [Fri, 15 Jan 2021 18:53:32 +0000 (10:53 -0800)]
Merge pull request #38688 from batrick/4ca8aaafa32bb7397eec80a8eb366d2dd781a72f-octopus

octopus: qa: unmount volumes before removal

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec 38888/head
Volker Theile [Mon, 20 Jul 2020 12:45:36 +0000 (14:45 +0200)]
mgr/dashboard: Create Ceph services via Orchestrator by using ServiceSpec

Fixes: https://tracker.ceph.com/issues/44831
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit dc5e5a5980456cffa468f88bc0d51cbb3c32dd06)

Conflicts:
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.ts
  * Use i18n instead of $localize
  * Remove CdForm class
  * Adapt code to ngx-bootstrap. Typeahead works a little bit different than in Pacific/ng-bootstrap.
  * Adapt to older TypeScript version
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.spec.ts
  * Adapt code to ngx-bootstrap.
- src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/services.component.ts
  * Use i18n instead of $localize
  * Replace ModalService by BsModalService
- src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-message.service.ts
  * Use i18n instead of $localize
- src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
  * Relocate changes to src/pybind/mgr/dashboard/frontend/src/styles.scss

4 years agoMerge pull request #38594 from callithea/wip-48587-octopus
Ernesto Puerta [Wed, 13 Jan 2021 18:39:26 +0000 (19:39 +0100)]
Merge pull request #38594 from callithea/wip-48587-octopus

octopus: mgr/dashboard: RGW User Form is validating disabled fields

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agomgr/dashboard: enable different URL for users of browser to Grafana 38761/head
Patrick Seidensal [Tue, 3 Nov 2020 12:47:23 +0000 (13:47 +0100)]
mgr/dashboard: enable different URL for users of browser to Grafana

Fixes: https://tracker.ceph.com/issues/47386
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 676f82923d875cfe9528a401963c09f29a6de7f4)

Conflicts:
        doc/mgr/dashboard.rst
        src/pybind/mgr/dashboard/controllers/grafana.py

Resolved some trivial conflicts and replaced the heading of the newly
added section in the documentation to another level, as the
documentation between master and octopus differs quite much.

4 years agomgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart 38867/head
Kiefer Chang [Sun, 27 Dec 2020 01:04:06 +0000 (09:04 +0800)]
mgr/dashboard: fix Reads/Writes ratio of Clients IOPS donut chart

Use the percentage of READ ops instead of its value.

Fixes: https://tracker.ceph.com/issues/48717
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 9ef1a729b5100b0ee32c0df367ef4b33ba762d4a)

4 years agomgr/dashboard: Updating the docs regarding the user lockout 38810/head
Nizamudeen A [Thu, 10 Dec 2020 08:05:38 +0000 (13:35 +0530)]
mgr/dashboard: Updating the docs regarding the user lockout

Fixes: https://tracker.ceph.com/issues/40914
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 3f50b05e2530dfcdc44e5f13abac9fbdf20400c1)

4 years agomgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts
Nizamudeen A [Thu, 26 Nov 2020 10:25:00 +0000 (15:55 +0530)]
mgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts

Implemented a user lockout mechanism if the user enters 10 invalid attempts. The attempt count gets resetted to 0 once the user succesfully logins before getting disabled. Once the user gets disabled administrator has to manually enable the user which will also resets the number of attempts.

Fixes: https://tracker.ceph.com/issues/40914
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 41941f0d28f51cb391ff7bacae84a5d511bafb36)

4 years agoMerge pull request #38759 from tchaikov/octopus-38263
Yuri Weinstein [Mon, 11 Jan 2021 20:05:39 +0000 (12:05 -0800)]
Merge pull request #38759 from tchaikov/octopus-38263

octopus: cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #38770 from votdev/wip-48629-octopus
Yuri Weinstein [Mon, 11 Jan 2021 20:00:24 +0000 (12:00 -0800)]
Merge pull request #38770 from votdev/wip-48629-octopus

octopus: mgr/dashboard: The /rgw/status endpoint does not check for running service

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #38592 from callithea/wip-48574-octopus
Yuri Weinstein [Mon, 11 Jan 2021 19:57:27 +0000 (11:57 -0800)]
Merge pull request #38592 from callithea/wip-48574-octopus

octopus: mgr/crash: Serialize command handling

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
4 years agoMerge pull request #38555 from kamoltat/wip-ksriivad-octopus-backport
Yuri Weinstein [Mon, 11 Jan 2021 19:56:35 +0000 (11:56 -0800)]
Merge pull request #38555 from kamoltat/wip-ksriivad-octopus-backport

octopus: qa/tasks/mgr/test_progress: update test suite to check for specific progress events

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #38455 from trociny/wip-48470-octopus
Yuri Weinstein [Mon, 11 Jan 2021 19:56:03 +0000 (11:56 -0800)]
Merge pull request #38455 from trociny/wip-48470-octopus

octopus: librbd: fix regression in object map diff request

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38429 from smithfarm/wip-48194-octopus
Yuri Weinstein [Mon, 11 Jan 2021 19:55:22 +0000 (11:55 -0800)]
Merge pull request #38429 from smithfarm/wip-48194-octopus

octopus: bluestore: Make mempool assignment same after bufferlist rebuild

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #38428 from smithfarm/wip-48094-octopus
Yuri Weinstein [Mon, 11 Jan 2021 19:54:39 +0000 (11:54 -0800)]
Merge pull request #38428 from smithfarm/wip-48094-octopus

octopus: os/bluestore: fix segfault on out-of-bound offset provided to  claim_free_to_right() call

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agocmake: add empty RPATH to ceph-diff-sorted 38847/head
Nathan Cutler [Wed, 15 Jul 2020 16:21:37 +0000 (18:21 +0200)]
cmake: add empty RPATH to ceph-diff-sorted

This fixes a transient FTBFS on openSUSE:

[ 5365s] -- Installing: /home/abuild/rpmbuild/BUILDROOT/ceph-15.2.4.337+g55cec95eaf-1.1.x86_64/usr/bin/ceph-diff-sorted
[ 5365s] CMake Error at src/tools/cmake_install.cmake:230 (file):
[ 5365s]   file RPATH_CHANGE could not write new RPATH:
[ 5365s]
[ 5365s]     /usr/lib64/ceph
[ 5365s]
[ 5365s]   to the file:
[ 5365s]
[ 5365s]     /home/abuild/rpmbuild/BUILDROOT/ceph-15.2.4.337+g55cec95eaf-1.1.x86_64/usr/bin/ceph-diff-sorted
[ 5365s]
[ 5365s]   No valid ELF RPATH or RUNPATH entry exists in the file;

Fixes: https://tracker.ceph.com/issues/46553
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit cb20ce39315dc218e1b6338aae6a676a18453124)

4 years agoMerge pull request #38086 from orztt/wip-rgw-versioning-octopus
Yuri Weinstein [Mon, 11 Jan 2021 17:40:20 +0000 (09:40 -0800)]
Merge pull request #38086 from orztt/wip-rgw-versioning-octopus

octopus: rgw: cls/rgw/cls_rgw.cc: fix multiple lastest version problem

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38782 from sebastian-philipp/octopus-backport-37607-38169-37696...
Sebastian Wagner [Mon, 11 Jan 2021 17:39:32 +0000 (18:39 +0100)]
Merge pull request #38782 from sebastian-philipp/octopus-backport-37607-38169-37696-37576-38211-38278-38304-38285-38317-38130-38064-3803

octopus: cephadm: batch backport January (1)

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #38798 from votdev/wip-48652-octopus
Ernesto Puerta [Fri, 8 Jan 2021 21:05:20 +0000 (22:05 +0100)]
Merge pull request #38798 from votdev/wip-48652-octopus

octopus: mgr/dashboard: Display a warning message in Dashboard when debug mode is enabled

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #38797 from rhcs-dashboard/wip-48626-octopus
Ernesto Puerta [Fri, 8 Jan 2021 20:52:06 +0000 (21:52 +0100)]
Merge pull request #38797 from rhcs-dashboard/wip-48626-octopus

octopus: mgr/dashboard: Fixing dashboard logs e2e test

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #38607 from rhcs-dashboard/wip-48605-octopus
Ernesto Puerta [Fri, 8 Jan 2021 20:47:00 +0000 (21:47 +0100)]
Merge pull request #38607 from rhcs-dashboard/wip-48605-octopus

octopus: mgr/dashboard: Fix CRUSH map viewer VirtualScroll

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38583 from votdev/wip-48592-octopus
Ernesto Puerta [Fri, 8 Jan 2021 20:46:03 +0000 (21:46 +0100)]
Merge pull request #38583 from votdev/wip-48592-octopus

octopus: mgr/dashboard: Drop invalid RGW client instances, improve logging

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #38598 from callithea/wip-48494-octopus
Ernesto Puerta [Fri, 8 Jan 2021 20:44:21 +0000 (21:44 +0100)]
Merge pull request #38598 from callithea/wip-48494-octopus

octopus: mgr/dashboard: Fix for misleading "Orchestrator is not available" error

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38597 from callithea/wip-48539-octopus
Ernesto Puerta [Fri, 8 Jan 2021 20:42:17 +0000 (21:42 +0100)]
Merge pull request #38597 from callithea/wip-48539-octopus

octopus: mgr/dashboard: adjust refresh intervals of Services and Daemons

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38503 from callithea/wip-48511-octopus
Ernesto Puerta [Fri, 8 Jan 2021 20:41:23 +0000 (21:41 +0100)]
Merge pull request #38503 from callithea/wip-48511-octopus

octopus: mgr/dashboard: remove pyOpenSSL version pinning

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37969 from bk201/wip-48132-octopus
Ernesto Puerta [Fri, 8 Jan 2021 20:39:53 +0000 (21:39 +0100)]
Merge pull request #37969 from bk201/wip-48132-octopus

octopus: mgr/dashboard: disable cluster selection in NFS export editing form

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agorgw_file: return common_prefixes in lexical order 38829/head
Matt Benjamin [Fri, 8 Jan 2021 18:23:56 +0000 (13:23 -0500)]
rgw_file: return common_prefixes in lexical order

Since inception RGWReaddirRequest has sent all leaf objects first
(in lexical order), then common_prefixes (in lexical order). In
hindsight, an overall listing could trivially be returned out of
lexical order, which can cause continued listing of large, mixed
directories to fail.

RCA by Dan Gryniewicz.

Fixes: https://tracker.ceph.com/issues/48410
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit e561e98e5cca2678854e01c990f95e474022b7ed)

Conflicts:
        src/rgw/rgw_file.h

4 years agorgw: fix bucket limit check fill_status warnings 38826/head
Paul Emmerich [Tue, 11 Jun 2019 12:10:55 +0000 (14:10 +0200)]
rgw: fix bucket limit check fill_status warnings

all variables in the calculation where ints, so the warning would
only ever trigger if objects_per_shard == limit_objects and the
percentage for > 100% used a granularity of 100%

Fixes: http://tracker.ceph.com/issues/40255
Signed-off-by: Paul Emmerich <paul.emmerich@croit.io>
(cherry picked from commit 694076419e6f20d1ed6c95b4b1ff94f134a10d4d)