]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agomgr/dashboard: fix tests in order to match pg num conventions 34055/head
Tatjana Dehler [Fri, 8 Nov 2019 12:51:40 +0000 (13:51 +0100)]
mgr/dashboard: fix tests in order to match pg num conventions

Update the tests test_ganesha and test_rbd_mirroring in order
to match the PG num conventions. It prevents the health warning
'POOL_PG_NUM_NOT_POWER_OF_TWO' from being shown.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit ee46e58e5dc779418492ef6b8c5e687f36ecb3f6)

5 years agoqa: use small default pg count for CephFS pools
Patrick Donnelly [Wed, 9 Oct 2019 17:41:35 +0000 (10:41 -0700)]
qa: use small default pg count for CephFS pools

The pg count needs to be a power-of-two since
dff5697464edb9931d5dfa08cd4a30f85c1f237e.

Also, mon_pg_warn_min_per_osd is disabled by default now (or set to a
low value in vstart/testing) so there's no need to base the pg count on
this value.

Ideally someday we can remove this so that the default cluster value is
used but we need to keep this for deployments of older versions of Ceph.

Fixes: https://tracker.ceph.com/issues/42228
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit fc88e6c6c55402120a432ea47f05f321ba4c9bb1)

5 years ago*: remove config of "mon pg warn min per osd" in testing
Patrick Donnelly [Wed, 9 Oct 2019 18:06:40 +0000 (11:06 -0700)]
*: remove config of "mon pg warn min per osd" in testing

Follows: 609ab5aa850b147dd0ea799ff14ac594951cf748
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 518168f9963122077d647e9669e9a1c52a3df027)

5 years agoMerge pull request #33927 from rhcs-dashboard/wip-44574-nautilus
Lenz Grimmer [Thu, 19 Mar 2020 09:31:41 +0000 (10:31 +0100)]
Merge pull request #33927 from rhcs-dashboard/wip-44574-nautilus

nautilus:  mgr/dashboard: Dashboard does not allow you to set norebalance OSD flag

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #33751 from batrick/i44291
Gregory Farnum [Thu, 19 Mar 2020 03:15:17 +0000 (20:15 -0700)]
Merge pull request #33751 from batrick/i44291

nautilus: mds: SIGSEGV in Migrator::export_sessions_flushed

Reviewed-by: Zheng Yan <zyan@redhat.com>
5 years agoMerge pull request #33722 from jan--f/wip-44331-nautilus
Jan Fajerski [Wed, 18 Mar 2020 14:25:51 +0000 (15:25 +0100)]
Merge pull request #33722 from jan--f/wip-44331-nautilus

nautilus: ceph-volume: strip _dmcrypt suffix in simple scan json output

5 years agoceph-volume: strip _dmcrypt suffix in simple scan json output 33722/head
Jan Fajerski [Wed, 5 Feb 2020 05:01:16 +0000 (06:01 +0100)]
ceph-volume: strip _dmcrypt suffix in simple scan json output

LUKS encrypted OSDs name their block* files with a _dmcrypt suffix.
activate fails on json files like this. Stripping this suffix in scan
fixes this.

Fixes: https://tracker.ceph.com/issues/43966
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2ddf76d118d77659c590ea076d34ce9a8e351a86)

5 years agoMerge pull request #33391 from jan--f/c-v-nautilus-func-tests
Jan Fajerski [Wed, 18 Mar 2020 12:01:57 +0000 (13:01 +0100)]
Merge pull request #33391 from jan--f/c-v-nautilus-func-tests

nautilus: ceph-volume: fix nautilus functional tests

5 years agoMerge pull request #34008 from smithfarm/wip-44641-nautilus
Nathan Cutler [Wed, 18 Mar 2020 07:42:15 +0000 (08:42 +0100)]
Merge pull request #34008 from smithfarm/wip-44641-nautilus

nautilus: do_cmake.sh: fix application of -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
5 years agoMerge pull request #33877 from ajarr/wip-sync-attrs-nautilus
Gregory Farnum [Wed, 18 Mar 2020 07:24:44 +0000 (00:24 -0700)]
Merge pull request #33877 from ajarr/wip-sync-attrs-nautilus

nautilus: mgr/volumes: synchronize ownership (for symlinks) and inode timestamps for cloned subvolumes

Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #33820 from rzarzynski/wip-43808-nautilus
Yuri Weinstein [Tue, 17 Mar 2020 18:31:44 +0000 (11:31 -0700)]
Merge pull request #33820 from rzarzynski/wip-43808-nautilus

nautilus: msgr: backport the EventCenter-related fixes

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #33834 from tchaikov/nautilus-44524
Yuri Weinstein [Tue, 17 Mar 2020 18:21:59 +0000 (11:21 -0700)]
Merge pull request #33834 from tchaikov/nautilus-44524

nautilus: mgr: update "hostname" when we already have the daemon state from that entity

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #33716 from tchaikov/nautilus-43747
Yuri Weinstein [Tue, 17 Mar 2020 18:21:27 +0000 (11:21 -0700)]
Merge pull request #33716 from tchaikov/nautilus-43747

nautilus: cmake: Improve test for 16-byte atomic support on IBM Z

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #33234 from rhcs-dashboard/wip-44095-nautilus
Yuri Weinstein [Tue, 17 Mar 2020 18:20:48 +0000 (11:20 -0700)]
Merge pull request #33234 from rhcs-dashboard/wip-44095-nautilus

nautilus: mgr/dashboard: Use booleanText pipe

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #33749 from cbodley/wip-44444
Yuri Weinstein [Tue, 17 Mar 2020 18:17:00 +0000 (11:17 -0700)]
Merge pull request #33749 from cbodley/wip-44444

nautilus: rgw: making implicit_tenants backwards compatible.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #33503 from sseshasa/wip-44259-nautilus
Yuri Weinstein [Tue, 17 Mar 2020 18:16:12 +0000 (11:16 -0700)]
Merge pull request #33503 from sseshasa/wip-44259-nautilus

nautilus: osd/OSD: Log slow ops/types to cluster logs

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
5 years agoMerge pull request #33295 from mchangir/wip-42441-nautilus
Gregory Farnum [Tue, 17 Mar 2020 14:49:15 +0000 (07:49 -0700)]
Merge pull request #33295 from mchangir/wip-42441-nautilus

nautilus: mds: add configurable snapshot limit

Reviewed-by: Raman Raja <rraja@redhat.com>
5 years agodo_cmake.sh: fix application of -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF 34008/head
Nathan Cutler [Tue, 17 Mar 2020 14:39:24 +0000 (15:39 +0100)]
do_cmake.sh: fix application of -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF

50ba25b2aa4db34319a7b95e789065540347f895 broke do_cmake.sh in nautilus
and the backport of 46b3d671b4408a766aaed379274242ad4b38afb3 (which
was included in the same PR) did not fix it enough.

This commit cannot be backported from master. It is needed to fix
a partially broken backport.

After this commit is applied, the relevant part of do_cmake.sh in
nautilus will look exactly like it does now in master.

Fixes: 50ba25b2aa4db34319a7b95e789065540347f895
Fixes: https://tracker.ceph.com/issues/44641
Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agodo_cmake.sh: set WITH_RADOSGW_AMQP_ENDPOINT using ARGS
Kefu Chai [Sat, 28 Sep 2019 14:15:15 +0000 (22:15 +0800)]
do_cmake.sh: set WITH_RADOSGW_AMQP_ENDPOINT using ARGS

so we can extend ARGS in a more unified way

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

Conflicts:
do_cmake.sh
- nautilus does not have 9a47b328b80e5e502bd67cb94f925efe0c53c755

5 years agomgr/volumes: type convert uid and gid to int 33877/head
Ramana Raja [Fri, 13 Mar 2020 14:00:05 +0000 (19:30 +0530)]
mgr/volumes: type convert uid and gid to int

This fix is only needed in nautilus. The issue
was observed during upstream teuthology testing in CentOS 7.5
machines.

  File "/usr/share/ceph/mgr/volumes/fs/async_cloner.py", line 153, in do_clone
    bulk_copy(fs_handle, src_path, dst_path, should_cancel)
  File "/usr/share/ceph/mgr/volumes/fs/async_cloner.py", line 144, in bulk_copy
    cptree(source_path, dst_path)
  File "/usr/share/ceph/mgr/volumes/fs/async_cloner.py", line 134, in cptree
    sync_attrs(fs_handle, d_full_dst, stx)
  File "/usr/share/ceph/mgr/volumes/fs/async_cloner.py", line 77, in sync_attrs
    fs_handle.lchown(target_path, source_statx["uid"], source_statx["gid"])

The issue wasn't observed in master/octopus teuthology
testing.

Signed-off-by: Ramana Raja <rraja@redhat.com>
5 years agoqa: allow keeping sudo in command arguments
Rishabh Dave [Wed, 20 Feb 2019 16:36:41 +0000 (22:06 +0530)]
qa: allow keeping sudo in command arguments

sudo cannot be omitted from the given command's arguments, when running
passwd, chown and, specially, when sudo is used for running the given
command as different user.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 3e0a1361f78452d79c283f70b5dc2b865d62cb61)

5 years agoqa: make execution abortion optional for command ran through run_shell()
Rishabh Dave [Wed, 20 Feb 2019 16:33:00 +0000 (22:03 +0530)]
qa: make execution abortion optional for command ran through run_shell()

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 5df2b82c4f9ce71cd82889531333be184c84707c)

5 years agotest: add test_statx for new statx()
huanwen ren [Thu, 26 Sep 2019 13:00:38 +0000 (21:00 +0800)]
test: add test_statx for new statx()

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
(cherry picked from commit ea8527b5e8a9695050275a6715ebce2798579de2)

5 years agoclient: add statx in cephfs.pyx
huanwen ren [Mon, 23 Sep 2019 21:53:59 +0000 (05:53 +0800)]
client: add statx in cephfs.pyx

add statx in cephfs.pyx, support single mask query operation

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
(cherry picked from commit b212124e546395b0ff36ae7f4d7fa55b1697e13b)

5 years agopybind/cephfs: define variable for hexcode used in stat()
Rishabh Dave [Wed, 7 Aug 2019 05:05:57 +0000 (10:35 +0530)]
pybind/cephfs: define variable for hexcode used in stat()

Instead of using the same hexcode at multiple locations, define it as a
variable and use the variable instead.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 1798832951f0cd3f356a01ead4b7907920e1278f)

5 years agotest_volumes: fix _verify_clone_attrs call
Ramana Raja [Fri, 6 Mar 2020 11:33:51 +0000 (17:03 +0530)]
test_volumes: fix _verify_clone_attrs call

... to verify the attributes of clone and source subvolume belonging
to different subvolume groups.

Introduced in e22d546beb0472bf7e9bb038aa5e781d90a52349

Fixes: https://tracker.ceph.com/issues/44438
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit d2e327c41c5490be32c120b1c845fe6f4977198c)

5 years agodoc: update clone section for mgr/volumes w/ attr synchronization changes
Venky Shankar [Fri, 7 Feb 2020 05:47:27 +0000 (00:47 -0500)]
doc: update clone section for mgr/volumes w/ attr synchronization changes

Fixes: http://tracker.ceph.com/issues/43965
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 33f6263e5f453778c6cb056b21b8fff21c2b5915)

5 years agodoc: add mgr/volumes clone commands
Venky Shankar [Fri, 24 Jan 2020 06:31:19 +0000 (12:01 +0530)]
doc: add mgr/volumes clone commands

Fixes: http://tracker.ceph.com/issues/24880
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 97f875bb3209f6e90a62b369d5257b3a5895eee2)

5 years agodoc: update '--force' flag to be precise
Jos Collin [Thu, 19 Dec 2019 06:29:44 +0000 (11:59 +0530)]
doc: update '--force' flag to be precise

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit f35d03a0377f31d72e17813030124a5d99d95437)

5 years agodoc: list FS subvolumes, subvolume groups and their snapshots
Jos Collin [Mon, 7 Oct 2019 09:58:23 +0000 (15:28 +0530)]
doc: list FS subvolumes, subvolume groups and their snapshots

Fixes: https://tracker.ceph.com/issues/41842
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit b5769367d53d0d1580a9007af1c5b5198f0ecba8)

5 years agotest: revert to default mount state in test_cephfs:test_mount_root()
Venky Shankar [Fri, 28 Feb 2020 07:36:36 +0000 (02:36 -0500)]
test: revert to default mount state in test_cephfs:test_mount_root()

without this tests written after test_mount_root() in the source
were failing with

     cephfs.LibCephFSStateError: You cannot perform that operation on a
     CephFS object in state initialized.

... since the test fiddles with the default mount which is root.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit db8b8a6791060eeb4aa10d00ffbb56e71a22142e)

5 years agotest: add test for verifying inode attrbiutes sync on clone
Venky Shankar [Fri, 7 Feb 2020 05:29:38 +0000 (00:29 -0500)]
test: add test for verifying inode attrbiutes sync on clone

Also, for existing tests, additionally verify inode attributes
for clones.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit e22d546beb0472bf7e9bb038aa5e781d90a52349)

5 years agomgr/volumes: synchronize inode attributes for cloned subvolumes
Venky Shankar [Fri, 7 Feb 2020 05:26:03 +0000 (00:26 -0500)]
mgr/volumes: synchronize inode attributes for cloned subvolumes

Synchronize ownership, permission and inode timestamp (access and
modification times) for all supported inode types. Note that inode
timestamps are synchronized upto seconds granularity.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit aac6b5f1cef7d055bdde797519aece779d06fb41)

 Conflicts:
src/pybind/mgr/volumes/fs/async_cloner.py
        - uid and gid arguments of chown() and copy_file() were
          type converted to `int` for nautilus.

5 years agomds: add configurable snapshot limit 33295/head
Milind Changire [Fri, 13 Mar 2020 07:44:35 +0000 (13:14 +0530)]
mds: add configurable snapshot limit

Added config option "mds_max_snaps_per_dir" defaulting to 100

Fixes: https://tracker.ceph.com/issues/41209
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit c15905cd9774a28d07d9a1151e18feb89d024d97)

Conflicts:
        src/common/options.cc (differences between octopus and nautilus)

5 years agomgr/dashboard: NoRebalance flag is added to the Dashboard 33927/head
Nizamudeen [Tue, 10 Mar 2020 16:32:41 +0000 (22:02 +0530)]
mgr/dashboard: NoRebalance flag is added to the Dashboard

This commit will add a norebalance flag into the Cluster-wide Flags in the OSDs which can be set/unset.
Fixes: https://tracker.ceph.com/issues/44543
Signed-off-by: Nizamudeen <nia@redhat.com>
(cherry picked from commit 7e30c261c0c57ccb26097e56ee442f3d6bf08e4a)

5 years agoMerge pull request #33863 from smithfarm/wip-nautilus-wipe-pendingreleasenotes
Abhishek L [Thu, 12 Mar 2020 09:49:07 +0000 (10:49 +0100)]
Merge pull request #33863 from smithfarm/wip-nautilus-wipe-pendingreleasenotes

nautilus: doc: reset PendingReleaseNotes following 14.2.8 release

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
5 years agopybind/cephfs: pybind calls for changing inode timestamps
Venky Shankar [Thu, 6 Feb 2020 10:34:24 +0000 (05:34 -0500)]
pybind/cephfs: pybind calls for changing inode timestamps

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit fc49ffd227b06495b30674eff9897a34f9fd60be)

5 years agopybind/cephfs: pybind call for changing ownership for symlinks
Venky Shankar [Wed, 5 Feb 2020 04:18:55 +0000 (23:18 -0500)]
pybind/cephfs: pybind call for changing ownership for symlinks

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit ea97410fb796afc4ac8d522003dae5a278c3f96f)

5 years agodoc: reset PendingReleaseNotes following 14.2.8 release 33863/head
Nathan Cutler [Tue, 10 Mar 2020 16:43:05 +0000 (17:43 +0100)]
doc: reset PendingReleaseNotes following 14.2.8 release

This commit cannot be cherry-picked from master because
PendingReleaseNotes is maintained separately for each stable release.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agorgw: making implicit_tenants backwards compatible. 33749/head
Marcus Watts [Wed, 30 May 2018 20:37:31 +0000 (16:37 -0400)]
rgw: making implicit_tenants backwards compatible.

In jewel, "rgw keystone implicit tenants" only applied to swift. As of
luminous), this option applies to s3 also.
Sites that used this feature with jewel now have outstanding data that
depends on the old behavior.

The fix here is to expand "rgw keystone implicit tenants" so that it
can be set to any of "none", "all", "s3" or "swift" (also 0=false=none,
1=true=all).  When set to "s3" or "swift", the actual id lookup
is also partitioned.

Formerly "rgw keystone implicit tenants" was a legacy opt.
This change converts it to the new style of option,
including support for dynamically changing it.

Fixes: http://tracker.ceph.com/issues/24348
Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit 3ba7be8d1ac7ee43e69eebb58263cd080cca1d38)

Conflicts:
src/rgw/rgw_main.cc (amqp, kafka)
src/rgw/rgw_auth_registry.h (sts_strategy)

5 years agoMerge pull request #33668 from epuertat/wip-44378-nautilus
Lenz Grimmer [Wed, 11 Mar 2020 13:02:29 +0000 (14:02 +0100)]
Merge pull request #33668 from epuertat/wip-44378-nautilus

nautilus: mgr/dashboard: Use default language when running "npm run build"

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #33860 from rhcs-dashboard/wip-44549-nautilus
Lenz Grimmer [Wed, 11 Mar 2020 10:29:00 +0000 (11:29 +0100)]
Merge pull request #33860 from rhcs-dashboard/wip-44549-nautilus

nautilus: monitoring: fix RGW grafana chart 'Average GET/PUT Latencies'

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agoMerge pull request #33714 from smithfarm/wip-44146-nautilus
Yuri Weinstein [Tue, 10 Mar 2020 20:07:58 +0000 (13:07 -0700)]
Merge pull request #33714 from smithfarm/wip-44146-nautilus

nautilus: rgw: Add support bucket policy for subuser

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #32924 from yuvalif/nautilus-backport-41122
Yuri Weinstein [Tue, 10 Mar 2020 20:06:27 +0000 (13:06 -0700)]
Merge pull request #32924 from yuvalif/nautilus-backport-41122

nautilus: rgw: GET/HEAD and PUT operations on buckets w/lifecycle expiration configured do not return x-amz-expiration header

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
5 years agoMerge pull request #32960 from yuvalif/nautilus-backport-kafka
Yuri Weinstein [Tue, 10 Mar 2020 20:05:33 +0000 (13:05 -0700)]
Merge pull request #32960 from yuvalif/nautilus-backport-kafka

nautilus: rgw/kafka: add kafka endpoint support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agomonitoring: fix RGW grafana chart 'Average GET/PUT Latencies' 33860/head
Alfonso Martínez [Tue, 10 Mar 2020 11:05:26 +0000 (12:05 +0100)]
monitoring: fix RGW grafana chart 'Average GET/PUT Latencies'

Fixes: https://tracker.ceph.com/issues/44538
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 1f0cddfafc05c82864b1d7e47becb1057794c762)

5 years agomgr: update metadata if an osd just joins 33834/head
Kefu Chai [Thu, 5 Mar 2020 15:42:13 +0000 (23:42 +0800)]
mgr: update metadata if an osd just joins

instead of using "front_address" for checking if we have a new OSD
reusing existing a known identify shows up in the osdmap, it'd be
simpler to compare the up_from epoch with the osdmap's epoch. as
objecter will subscribe **every** osdmap after mgr boots. so mgr
should be able to see the osdmap when the osd joins the cluster
where the up_from epoch is identical to osdmap's epoch.

this way is simpler than existing approach. but it will involve
more overhead if osd reboots frequently without changing their
metadata.

before this change, the metadata is requested/updated only if
the public (front) address is changed.

after this change, the metadata is requested/updated whenever
an osd reboots.

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

Conflicts:
src/mgr/Mgr.cc: trivial resolution

5 years agomgr: update "hostname" when we already have the daemon state from the same entity
Kefu Chai [Thu, 5 Mar 2020 15:35:46 +0000 (23:35 +0800)]
mgr: update "hostname" when we already have the daemon state from the same entity

there is chance that we reuse the identity of a daemon and deploy the
daemon on a different host. in that case, the existing daemon state
should be updated with the new hostname.

Fixes: https://tracker.ceph.com/issues/44446
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e3d3d0501e5095ce557e2e4ccaefc294a7d5c08c)

Conflicts:
src/mgr/Mgr.cc: trivial resolution

5 years agoqa/suites/rados/singleton/all/thrash-eio: whitelist 'slow request' 33503/head
Sage Weil [Sun, 23 Feb 2020 21:00:41 +0000 (15:00 -0600)]
qa/suites/rados/singleton/all/thrash-eio: whitelist 'slow request'

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a4a3a3c0a060e3aa82aea1313ad0159fb75bc6b6)

5 years agoMerge pull request #33726 from yaarith/backport-nautilus-all
Yuri Weinstein [Mon, 9 Mar 2020 23:51:09 +0000 (16:51 -0700)]
Merge pull request #33726 from yaarith/backport-nautilus-all

nautilus: common/blkdev: compilation of telemetry and device backports

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33765 from dvanders/nautilus_44453
Yuri Weinstein [Mon, 9 Mar 2020 20:35:39 +0000 (13:35 -0700)]
Merge pull request #33765 from dvanders/nautilus_44453

nautilus: mon: fix/improve mon sync over small keys

Reviewed-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #33388 from s0nea/wip-43998-nautilus
Yuri Weinstein [Mon, 9 Mar 2020 20:34:15 +0000 (13:34 -0700)]
Merge pull request #33388 from s0nea/wip-43998-nautilus

nautilus: mgr/dashboard: show checkboxes for booleans

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agorgw: Fix bug on subuser policy identity checker 33714/head
Seena Fallah [Tue, 18 Feb 2020 20:47:26 +0000 (00:17 +0330)]
rgw: Fix bug on subuser policy identity checker

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit d9210dfc15bc3f3ca1056485cad3a26cf6241fd5)

5 years agomsg/async: perform recv reset immediately if called inside EC. 33820/head
Radoslaw Zarzynski [Thu, 5 Mar 2020 00:12:40 +0000 (01:12 +0100)]
msg/async: perform recv reset immediately if called inside EC.

Fixes: https://tracker.ceph.com/issues/43808
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit c4e97bacf7f8606bcab67496d83ac92ba1237eca)

Conflicts:
        src/msg/async/ProtocolV1.cc (removing the dependency
          on c58c5754dfd26eef359cad8b29e825120af59c64).

5 years agomsg/async: reset the V1's session_security in proper EventCenter.
Radoslaw Zarzynski [Wed, 18 Dec 2019 14:30:31 +0000 (15:30 +0100)]
msg/async: reset the V1's session_security in proper EventCenter.

Fixes: https://tracker.ceph.com/issues/43070
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 6548dbcf30d5f880ad789560235688eef0cf2b56)

Conflicts:
        src/msg/async/ProtocolV1.cc (removing the dependency
          on c58c5754dfd26eef359cad8b29e825120af59c64).

5 years agomgr/dashboard: show correct RGW user 'system' info 33234/head
Alfonso Martínez [Tue, 11 Feb 2020 14:26:34 +0000 (15:26 +0100)]
mgr/dashboard: show correct RGW user 'system' info

Fixes: https://tracker.ceph.com/issues/44075
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 3d84dd948d771e761b42e8476eaf7d9df57c2eb3)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.html

- Conflicts manually solved.

5 years agomon: fix mon_sync_max_payload_size type 33765/head
Sage Weil [Wed, 4 Dec 2019 14:52:28 +0000 (08:52 -0600)]
mon: fix mon_sync_max_payload_size type

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0de99152cc9d25e4c473dc7ea03445ce7db3bb5a)

5 years agomon: cap keys in mon_sync messages
Sage Weil [Mon, 2 Dec 2019 13:43:54 +0000 (07:43 -0600)]
mon: cap keys in mon_sync messages

The previous cap was set at 1 MB.  However, a user was experiencing mon
timeouts while syncing the purged_snap_epoch * keys, which are ~20 bytes
each.  Reducing the max payload to 64K resolved the problem, which maps
to (very!) roughly 1500 keys per message.  Set our limit a bit higher than
that since we just made this quite a bit more efficient.  Most of the time
the keys are larger than 20 bytes and we wouldn't hit the key limit, but
having one ensures that we won't burn too much CPU in one go when we do
have lots of these little keys.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4d6c7e349b6749a45ef3ad239113e191b2c1d96a)

5 years agomon/MonitorDBStore: improve get_chunk_tx limits
Sage Weil [Tue, 12 Nov 2019 20:51:41 +0000 (14:51 -0600)]
mon/MonitorDBStore: improve get_chunk_tx limits

The old version was horribly inefficient in that it would reencode the
transaction on every iteration.

Instead, estimate the size if we add an item and stop it if looks like it
will go over.  This isn't super precise, but it's close enough, since the
limits are approximate.

Drop the single-use helper since it only makes the code harder to
follow.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 83b2ada9e935ae764be5649acee6ee02e4cb935f)

5 years agomon/MonitorDBStore: better size estimation for Transaction
Sage Weil [Tue, 12 Nov 2019 20:46:13 +0000 (14:46 -0600)]
mon/MonitorDBStore: better size estimation for Transaction

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5103b2563db771eb2f3d4a37f51c8eb40b4e188f)

5 years agomon/MonitorDBStore: use const string& for args throughout
Sage Weil [Tue, 24 Sep 2019 13:30:17 +0000 (08:30 -0500)]
mon/MonitorDBStore: use const string& for args throughout

const bufferlist& too

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d4fdd5a1e667338d6bde0ca8d66e8432ddfddfdd)

5 years agomon/MonitorDBStore: add erase_range() op to transaction
Sage Weil [Mon, 23 Sep 2019 15:53:27 +0000 (10:53 -0500)]
mon/MonitorDBStore: add erase_range() op to transaction

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6900420d4e510e6b9e798384f70a2cb9631964db)

5 years agomds: fix use-after-free in Migrater 33751/head
Yan, Zheng [Fri, 14 Feb 2020 02:45:47 +0000 (10:45 +0800)]
mds: fix use-after-free in Migrater

use PIN_PTRWAITER to pin CDir in MigratorContext. Also pin CDir to
MDRequest because export may get cancelled while acquiring locks.

Fixes: https://tracker.ceph.com/issues/43909
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 6203c27b1e48438450524b7c40bb036e5897f207)

5 years agomgr/dashboard: Use booleanText pipe
Alfonso Martínez [Wed, 12 Feb 2020 09:35:43 +0000 (10:35 +0100)]
mgr/dashboard: Use booleanText pipe

Signed-off-by: Volker Theile <vtheile@suse.com>
    (cherry picked from commit 46c7bdfaab9c082a46e03061f355196fc42fbf3c)

    Conflicts:
      src/pybind/mgr/dashboard/frontend/src/locale/messages.en-US.xlf

    - Excluded messages.en-US.xlf from backport.

5 years agoMerge pull request #33697 from rhcs-dashboard/wip-44372-nautilus
Lenz Grimmer [Thu, 5 Mar 2020 12:03:33 +0000 (13:03 +0100)]
Merge pull request #33697 from rhcs-dashboard/wip-44372-nautilus

nautilus: mgr/dashboard: Fixes rbd image 'purge trash' button & modal text

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #33688 from badone/wip-nautilus-fix-run-tox-pythonpath-failure
Nathan Cutler [Thu, 5 Mar 2020 08:53:43 +0000 (09:53 +0100)]
Merge pull request #33688 from badone/wip-nautilus-fix-run-tox-pythonpath-failure

nautilus: mgr/run-tox-tests: Fix issue with PYTHONPATH

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/run-tox-tests: Fix issue with PYTHONPATH 33688/head
Brad Hubbard [Tue, 3 Mar 2020 05:58:35 +0000 (15:58 +1000)]
mgr/run-tox-tests: Fix issue with PYTHONPATH

Something changed recently on Bionic which caused tox to fail when
PYTHONPATH is a relative path.  For some reason the path is mangled by
the time it gets to pytest so we need to ensure we are using an absolute
path. This seems to be nautilus specific, at least ATM.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
5 years agoMerge pull request #33533 from trociny/wip-44263-nautilus
Yuri Weinstein [Wed, 4 Mar 2020 23:27:40 +0000 (15:27 -0800)]
Merge pull request #33533 from trociny/wip-44263-nautilus

nautilus: rbd-mirror: improve detection of blacklisted state

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoceph-volume: fix nautilus functional tests 33391/head
Jan Fajerski [Thu, 13 Feb 2020 16:04:38 +0000 (17:04 +0100)]
ceph-volume: fix nautilus functional tests

This is commited straight to nautilus, as post nautilus functional tests
are run on CentOS8.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
5 years agoMerge pull request #33428 from leseb/bkp-33371
Sébastien Han [Wed, 4 Mar 2020 13:25:23 +0000 (14:25 +0100)]
Merge pull request #33428 from leseb/bkp-33371

nautilus: ceph-volume: silence 'ceph-bluestore-tool' failures

5 years agocmake: Improve test for 16-byte atomic support on IBM Z 33716/head
Ulrich Weigand [Thu, 23 Jan 2020 12:07:08 +0000 (13:07 +0100)]
cmake: Improve test for 16-byte atomic support on IBM Z

Commit d1b9d14324586d02dc6c8dd0a9bdf4b98ae16416 added a check for
16-byte atomics without library support on IBM Z.  Unfortunately
it turns out this test only works correctly when the test case
is built without optimization.  (This is normally true, but it
may not be the case when passing explicit CXXFLAGS to cmake.)

The underlying reason is that GCC may choose to use either an
inline implementation of the 16-byte atomics or library calls,
depending on whether or not it is able to prove the atomic
variable is properly aligned.  At -O0 it is never able to prove
that, but at higher optimization levels it depends on the complexity
of the expression (in particular, whether GCC can track down the
definition of the underlying object).

As the test case uses a very simple expression, it may happen that
this test can be built without requiring library support, but some
of the "real" uses of atomics in Ceph code cannot.   This defeats
the whole purpose of the test at configure time.

Fixed by making the access pattern in the test more complex, so
that the test fails even at high optimization levels.

Fixes: https://tracker.ceph.com/issues/43747
Signed-off-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>
(cherry picked from commit c58fc258a280bce62ed454bd0345076aca29a822)

5 years agorgw: Add test for bucket policy subuser
Seena Fallah [Tue, 11 Feb 2020 20:39:37 +0000 (00:09 +0330)]
rgw: Add test for bucket policy subuser

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit e34bc060d437c58889575755c3c7b73795b566fa)

5 years agorgw: Add support bucket policy for subuser
Seena Fallah [Sun, 9 Feb 2020 15:31:04 +0000 (19:01 +0330)]
rgw: Add support bucket policy for subuser

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 84b96f8d4f49fe1a82f3a8803a91b26f2a50ffd7)

5 years agocommon/blkdev: include by-path path for each device in metadata 33726/head
Sage Weil [Sat, 14 Dec 2019 16:06:40 +0000 (10:06 -0600)]
common/blkdev: include by-path path for each device in metadata

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 74e49d5ce956033e4294de3001fedf8b0af6c8f7)

5 years agocommon/blkdev: factor get_device_metadata out of mon, osd
Sage Weil [Sat, 14 Dec 2019 15:11:20 +0000 (09:11 -0600)]
common/blkdev: factor get_device_metadata out of mon, osd

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0e2d465526dd2a8368656099ff1bfb76a9140fb1)

5 years agocommon: Fix multiple logical errors in get_device_id.
Alex Zhang [Sun, 29 Sep 2019 09:33:58 +0000 (02:33 -0700)]
common: Fix multiple logical errors in get_device_id.

0. If blkdev.serial exists, the serial should be used. The original impl seems wrong (if serial does not exist, then use the value from the uninitialized buffer, or even worse, use the value from the last call (model))
1. When using fallback methods, device id should only be returned when both model and serial are present. The original impl looks like a logical error.

Signed-off-by: Difan Zhang <difan@google.com>
(cherry picked from commit 3e09dfd8254abf3c4ff85d6c1b1fafc4b38eae7d)

5 years agoosd: add common smartctl output to JSON output
Patrick Seidensal [Mon, 16 Sep 2019 13:44:53 +0000 (15:44 +0200)]
osd: add common smartctl output to JSON output

Enables consumers like the dashboard to provide the regular smartctl
output to users.

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 44068fc941f50c37f235725e77630f4de77cb3fa)

5 years agocommon/blkdev.c: check retval of snprintf()
Kefu Chai [Wed, 29 May 2019 09:45:35 +0000 (17:45 +0800)]
common/blkdev.c: check retval of snprintf()

as snprintf()'ed string could be truncated, to properly use this
function, we need to check its return value.

to silence warning like

../src/common/blkdev.cc: In member function ‘int64_t
BlkDev::get_string_property(blkdev_prop_t, char*, size_t) const’:
../src/common/blkdev.cc:165:15: warning: ‘%s’ directive output may be
truncated writing up to 4095 bytes into a region of size between 4085
and 4089 [-Wformat-truncation=]
  165 |     "%s/block/%s/%s", sysfsdir(), dev, propstr);
      |               ^~
In file included from /usr/include/stdio.h:873,
                 from /usr/include/c++/9/cstdio:42,
                 from /usr/include/c++/9/ext/string_conversions.h:43,
                 from /usr/include/c++/9/bits/basic_string.h:6493,
                 from /usr/include/c++/9/string:55,
                 from /usr/include/c++/9/bits/locale_classes.h:40,
                 from /usr/include/c++/9/bits/ios_base.h:41,
                 from /usr/include/c++/9/ios:42,
                 from /usr/include/c++/9/ostream:38,
                 from /usr/include/c++/9/iterator:64,
                 from
/opt/ceph/include/boost/iterator/iterator_traits.hpp:10,
                 from
/opt/ceph/include/boost/range/iterator_range_core.hpp:26,
                 from
/opt/ceph/include/boost/algorithm/string/replace.hpp:16,
                 from ../src/common/blkdev.cc:31:
/usr/include/x86_64-linux-gnu/bits/stdio2.h:67:35: note:
‘__builtin___snprintf_chk’ output 9 or more bytes (assuming 4108) into a
destination of size 4096
   67 |   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL
- 1,
      |
~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   68 |        __bos (__s), __fmt, __va_arg_pack ());
      |        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

5 years agoMerge pull request #33340 from tpsilva/wip-44129-nautilus
Yuri Weinstein [Tue, 3 Mar 2020 19:12:45 +0000 (11:12 -0800)]
Merge pull request #33340 from tpsilva/wip-44129-nautilus

nautilus: rgw: make max_connections configurable in beast

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #33274 from smithfarm/wip-43852-nautilus
Yuri Weinstein [Tue, 3 Mar 2020 19:11:42 +0000 (11:11 -0800)]
Merge pull request #33274 from smithfarm/wip-43852-nautilus

nautilus: test: Fix race with osd restart and doing a scrub

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #33271 from smithfarm/wip-43999-nautilus
Yuri Weinstein [Tue, 3 Mar 2020 19:09:23 +0000 (11:09 -0800)]
Merge pull request #33271 from smithfarm/wip-43999-nautilus

nautilus: rgw: MultipartObjectProcessor supports stripe size > chunk size

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #33267 from smithfarm/wip-43855-nautilus
Yuri Weinstein [Tue, 3 Mar 2020 19:08:49 +0000 (11:08 -0800)]
Merge pull request #33267 from smithfarm/wip-43855-nautilus

nautilus: rgw: fix SignatureDoesNotMatch when use ipv6 address in s3 client

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #33266 from smithfarm/wip-43851-nautilus
Yuri Weinstein [Tue, 3 Mar 2020 19:08:20 +0000 (11:08 -0800)]
Merge pull request #33266 from smithfarm/wip-43851-nautilus

nautilus: rgw: Fix dynamic resharding not working for empty zonegroup in period

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #33265 from smithfarm/wip-43848-nautilus
Yuri Weinstein [Tue, 3 Mar 2020 19:07:38 +0000 (11:07 -0800)]
Merge pull request #33265 from smithfarm/wip-43848-nautilus

nautilus: rgw: Fix upload part copy range able to get almost any string

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #33270 from smithfarm/wip-43923-nautilus
Yuri Weinstein [Tue, 3 Mar 2020 19:05:33 +0000 (11:05 -0800)]
Merge pull request #33270 from smithfarm/wip-43923-nautilus

nautilus: rgw multisite: enforce spawn window for incremental data sync

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
5 years agomgr/dashboard: Fixes rbd image 'purge trash' button & modal text 33697/head
anurag [Thu, 6 Feb 2020 08:27:46 +0000 (13:57 +0530)]
mgr/dashboard: Fixes rbd image 'purge trash' button & modal text

Fixes: https://tracker.ceph.com/issues/43801
Signed-off-by: anurag <abandhu@redhat.com>
(cherry picked from commit 803a0e2599f76a0a5894ba857bdeb57b6641a5ad)

Conflicts:
        src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-trash-list/rbd-trash-list.component.html
- nautilus uses button class="btn btn-sm btn-default btn-label" instead of class="btn btn-light"

5 years agoRGWLC: fix expiration header tag match 32924/head
Matt Benjamin [Fri, 19 Jul 2019 20:32:20 +0000 (16:32 -0400)]
RGWLC: fix expiration header tag match

Need to match key->value

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit af327f21aa377a7abd0290814bfa7333db5443c3)
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agorgw: fix header timestamp
Matt Benjamin [Fri, 3 May 2019 17:48:31 +0000 (13:48 -0400)]
rgw: fix header timestamp

The AWS example of this header intends to be RFC822-compliant.
Found by Tyler Brekke <tbrekke@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 6da5be5aba0820dc91aa44d4b63cd490b39371db)
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agorgw: complete expiration header (object tags)
Matt Benjamin [Tue, 19 Feb 2019 16:17:45 +0000 (11:17 -0500)]
rgw: complete expiration header (object tags)

The expiration header tag processing is complete, but the
passed RGWObjTags argument was never initialized.  Now it is
initialized in RGWGetObj and RGWPutObj, as required.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 8981c5e9f688b13a00345e069c2ce1e62fb0a588)
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agoRGWLC: debug tags in rgwlc_s3_expiration_header
Matt Benjamin [Tue, 19 Feb 2019 14:30:18 +0000 (09:30 -0500)]
RGWLC: debug tags in rgwlc_s3_expiration_header

Dump object tags to log at debug level 16.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 45f463fec55aebe53fa91aebf891dd9cb6cc1e19)
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
5 years agorgw: project and return lc expiration from GET/HEAD and PUT ops
Matt Benjamin [Sat, 26 Jan 2019 22:43:51 +0000 (17:43 -0500)]
rgw: project and return lc expiration from GET/HEAD and PUT ops

https://tracker.ceph.com/issues/38055

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit c89a889adc022f3e0298f6efd67a73a6a10a8bc7)
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
Conflicts:
src/CMakeLists.txt
src/rgw/rgw_tag.h

5 years agoMerge pull request #33268 from smithfarm/wip-43878-nautilus
Yuri Weinstein [Mon, 2 Mar 2020 23:30:01 +0000 (15:30 -0800)]
Merge pull request #33268 from smithfarm/wip-43878-nautilus

nautilus: rgw:  when you abort a multipart upload request, the quota may be not updated

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
5 years agoMerge pull request #33273 from smithfarm/wip-44038-nautilus
Yuri Weinstein [Mon, 2 Mar 2020 23:28:35 +0000 (15:28 -0800)]
Merge pull request #33273 from smithfarm/wip-44038-nautilus

nautilus: rgw: fix rgw crash when duration is invalid in sts request

Reviewed-by: Pritha Srivastava <prsrivas@redhat.com>
5 years ago14.2.8 40148/head v14.2.8
Jenkins Build Slave User [Mon, 2 Mar 2020 17:49:20 +0000 (17:49 +0000)]
14.2.8

5 years agomgr/dashboard: Use default language when running "npm run build" 33668/head
Tiago Melo [Tue, 12 Nov 2019 11:08:40 +0000 (10:08 -0100)]
mgr/dashboard: Use default language when running "npm run build"

This allow us to simply run "npm run build" and it will compile the frontend
with "en-US" as the default language and in the correct "dist/en-US" folder.

Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 360b616c1224e0eef4b3d163ebae74d8d45b8d9a)

5 years agoMerge PR #33569 into nautilus
Patrick Donnelly [Thu, 27 Feb 2020 20:18:40 +0000 (12:18 -0800)]
Merge PR #33569 into nautilus

* refs/pull/33569/head:
mgr/volumes: unregister job upon async threads exception

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agomgr/volumes: unregister job upon async threads exception 33569/head
Venky Shankar [Wed, 26 Feb 2020 04:52:37 +0000 (23:52 -0500)]
mgr/volumes: unregister job upon async threads exception

If the async threads hit a temporary exception the job is
never unregistered and therefore gets skipped by the async
threads on subsequent scans.

Patrick hit this in nautilus when one of the purge threads
hit an exception when trying to log a message. The trash
entry was never picked up again by the purge threads.

Fixes: http://tracker.ceph.com/issues/44315
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 46476ef2e290bd15af2fec2410cb4f3f86b27cd2)

5 years agoqa: Whitelist 'slow request' within a bunch of tests
Sridhar Seshasayee [Mon, 24 Feb 2020 14:29:56 +0000 (19:59 +0530)]
qa: Whitelist 'slow request' within a bunch of tests

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit e527067666df07d39a3088b57683a2dce2b87c62)

 Conflicts:
qa/suites/rados/singleton-nomsgr/all/osd_stale_reads.yaml
            This file doesn't exist in nautilus.

5 years agoqa/suites/rados/singleton/all/lost-unfound*: whitelist SLOW_OPS
Sage Weil [Wed, 29 Jan 2020 13:11:15 +0000 (07:11 -0600)]
qa/suites/rados/singleton/all/lost-unfound*: whitelist SLOW_OPS

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit f4156aea1048f1652c8b07ef9cbb3e1493a286af)

5 years agoqa/suites/rados/multimon: whitelist SLOW_OPS while thrashing mons
Sage Weil [Thu, 18 Jul 2019 21:44:23 +0000 (16:44 -0500)]
qa/suites/rados/multimon: whitelist SLOW_OPS while thrashing mons

The mons may have slow ops.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 07badf051d260382f1df8c8cafbabdf5bb6a98ec)