]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Casey Bodley [Tue, 19 Mar 2019 16:57:55 +0000 (12:57 -0400)]
doc/rgw: update civetweb rgw_frontends config example
all of these civetweb options have to be on the same line as rgw_frontends
Fixes: https://tracker.ceph.com/issues/37770
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
2f16fcb2fdb8dbd917e804dec97d1be056dc1749 )
Nathan Cutler [Wed, 1 May 2019 09:58:03 +0000 (11:58 +0200)]
Merge pull request #27899 from Vicente-Cheng/wip-39051-nautilus
nautilus: doc: add LAZYIO
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Wed, 1 May 2019 09:39:40 +0000 (11:39 +0200)]
Merge pull request #27900 from Vicente-Cheng/wip-39176-nautilus
nautilus: doc: add documentation for "fs set min_compat_client"
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Patrick Donnelly [Fri, 5 Apr 2019 21:11:11 +0000 (14:11 -0700)]
doc: add doc for blacklisting older CephFS clients
Fixes: http://tracker.ceph.com/issues/39130
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
19372b8492a75ea8423cb9826f4ddaec0a947554 )
Yan, Zheng [Fri, 15 Mar 2019 10:11:57 +0000 (18:11 +0800)]
doc: add doc for cephfs lazyio
Fixes: http://tracker.ceph.com/issues/38729
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
8ebd0fb74a0ed06259fc84b13b249756e7f432d3 )
Sage Weil [Tue, 30 Apr 2019 22:31:29 +0000 (17:31 -0500)]
Merge PR #27623 into nautilus
* refs/pull/27623/head:
qa: add crush-node-flags test
mon/OSDMonitor: remove crush node flags too on "crush rm"
mon/OSDMonitor: make per-OSD no{out,down,in,out} flags prior to CRUSH nodes
mon/OSDMonitor: osd add-no{up,down,in,out} - remove state checker
mon/OSDMonitor: respect crush node flags for can_mark_*()
osd/OSDMap: add get_crush_node_flags(int osd)
mon/OSDMonitor: make 'osd {add,rm}-{noin,noout,...}' support crush nodes
osd/OSDMap: raise OSD_FLAGS health alert for crush node flags, too
osd/OSDMap: add flags for crush nodes
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Jenkins Build Slave User [Thu, 25 Apr 2019 18:15:48 +0000 (18:15 +0000)]
14.2.1
Sage Weil [Thu, 25 Apr 2019 13:28:11 +0000 (08:28 -0500)]
Merge PR #27778 into nautilus
* refs/pull/27778/head:
tools: pin the version of breathe that works with Python2
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Alfredo Deza [Tue, 23 Apr 2019 13:09:09 +0000 (09:09 -0400)]
tools: pin the version of breathe that works with Python2
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
7ab6a390053d7034b8dcf5a3d94c23a83d29f8ab )
Sage Weil [Wed, 24 Apr 2019 14:13:22 +0000 (09:13 -0500)]
Merge PR #27709 into nautilus
* refs/pull/27709/head:
mgr/telemetry: default to reports every 24h; lower minimum
mgr/telemetry: exclude hostname field in crash reports
mgr/telemetry: change crash dict to a list
Reviewed-by: Dan Mick <dmick@redhat.com>
xie xingguo [Tue, 23 Apr 2019 06:20:17 +0000 (14:20 +0800)]
qa: add crush-node-flags test
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
bae2231cc501d24cfc9fb0ad673d0d1ed691c440 )
xie xingguo [Tue, 23 Apr 2019 03:24:07 +0000 (11:24 +0800)]
mon/OSDMonitor: remove crush node flags too on "crush rm"
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
ee4d718d0fd049120aa5d1c2380efba5aa312b71 )
xie xingguo [Tue, 23 Apr 2019 03:03:04 +0000 (11:03 +0800)]
mon/OSDMonitor: make per-OSD no{out,down,in,out} flags prior to CRUSH nodes
This way we 'll be more compatible with older versions, and can effectively
reduce the map size for large clusters.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
01916b99c3a8cb58686963e6167bd46c0d24f218 )
xie xingguo [Tue, 16 Apr 2019 09:30:13 +0000 (17:30 +0800)]
mon/OSDMonitor: osd add-no{up,down,in,out} - remove state checker
The existing sanity checkers are total unnecessary, e.g, noup indicates
we should not allow the corresponding osd to boot (marked as up)
later on, which has nothing to do with the current existing osd states.
By removing these checkers, we can:
$ ceph osd add-noup osd.nnn
$ ceph osd down osd.nnn
this way we can manually mark a specific osd as down and then ensure it
will not be automatically marked as up until the specific restrictions
has been resolved.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
100bd226900ed57d5826f3f1ea1b076fe2804d71 )
Sage Weil [Fri, 19 Apr 2019 17:24:48 +0000 (12:24 -0500)]
mgr/telemetry: default to reports every 24h; lower minimum
Allow more frequent telemetry reports.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
712987d53337e39ad871ee7abb38c2e2755fc75d )
Sage Weil [Fri, 19 Apr 2019 17:09:36 +0000 (12:09 -0500)]
mgr/telemetry: exclude hostname field in crash reports
On some systems the hostname is a fully-qualified domain name and
(even when not a fqdn) may inadvertantly allow the cluster to be
identified.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
4510f336562ede84a1e6e135bb3a152ab9b34543 )
Dan Mick [Wed, 17 Apr 2019 04:02:11 +0000 (21:02 -0700)]
mgr/telemetry: change crash dict to a list
For ease of indexing. There's no value in timestamp keys.
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit
1efb98df792d6cbfaea12fc293a5718bfed18c94 )
Sage Weil [Mon, 22 Apr 2019 22:08:23 +0000 (17:08 -0500)]
Merge PR #27701 into nautilus
* refs/pull/27701/head:
mgr/telemetry: add report_timestamp to sent reports
Dan Mick [Sat, 13 Apr 2019 00:04:34 +0000 (17:04 -0700)]
mgr/telemetry: add report_timestamp to sent reports
Received time may differ from report time, and correlating
to local cluster state events might be useful.
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit
a42c8e327c9f7d53b8c13cf51837c294bc4c643d )
Yuri Weinstein [Wed, 17 Apr 2019 20:06:03 +0000 (13:06 -0700)]
Merge pull request #27586 from pdvian/wip-38980-nautilus
nautilus: rgw: fix RGWDeleteMultiObj::verify_permission()
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 17 Apr 2019 20:05:18 +0000 (13:05 -0700)]
Merge pull request #27589 from pdvian/wip-38981-nautilus
nautilus: mgr/dashboard: Added breadcrumb tests to NFS menu
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Yuri Weinstein [Wed, 17 Apr 2019 20:04:51 +0000 (13:04 -0700)]
Merge pull request #27601 from pdvian/wip-38993-nautilus
nautilus: cmake/FindRocksDB: fix IMPORTED_LOCATION for ROCKSDB_LIBRARIES
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Wed, 17 Apr 2019 20:04:21 +0000 (13:04 -0700)]
Merge pull request #27611 from Devp00l/wip-39240-nautilus
nautilus: mgr/dashboard: readonly user can't see any pages
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Yuri Weinstein [Wed, 17 Apr 2019 20:03:34 +0000 (13:03 -0700)]
Merge pull request #27602 from pdvian/wip-39015-nautilus
nautilus: rgw admin: disable stale instance deletion in multisite
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Wed, 17 Apr 2019 20:02:49 +0000 (13:02 -0700)]
Merge pull request #27582 from liewegas/wip-mon-subtree-runtime-nautilus
nautilus: mon: make mon_osd_down_out_subtree_limit update at runtime
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yuri Weinstein [Wed, 17 Apr 2019 20:02:09 +0000 (13:02 -0700)]
Merge pull request #27610 from smithfarm/wip-39325-nautilus
nautilus: ceph-objectstore-tool: rename dump-import to dump-export
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Wed, 17 Apr 2019 20:01:28 +0000 (13:01 -0700)]
Merge pull request #27620 from neha-ojha/wip-39310-nautilus
nautilus: crush/CrushCompiler: Fix __replacement_assert
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Sage Weil [Wed, 17 Apr 2019 19:06:59 +0000 (14:06 -0500)]
Merge PR #27502 into nautilus
* refs/pull/27502/head:
doc/releases/nautilus: fix config update step
Yuri Weinstein [Tue, 16 Apr 2019 23:53:17 +0000 (16:53 -0700)]
Merge pull request #27497 from smithfarm/wip-39187-nautilus
nautilus: fs: we lack a feature bit for nautilus
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Fri, 12 Apr 2019 16:50:22 +0000 (11:50 -0500)]
mon/OSDMonitor: respect crush node flags for can_mark_*()
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
79f0043208f9ba2d4cf02877e6f349b8d0ce55dc )
Sage Weil [Fri, 12 Apr 2019 16:49:13 +0000 (11:49 -0500)]
osd/OSDMap: add get_crush_node_flags(int osd)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
6578ce0539f8b4a70f04e9de9f3993f56b085d9c )
Sage Weil [Fri, 12 Apr 2019 16:12:00 +0000 (11:12 -0500)]
mon/OSDMonitor: make 'osd {add,rm}-{noin,noout,...}' support crush nodes
Set noin, noout, etc. flags on crush nodes.
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
a510b738ca777ba9aa3d700463cdcbe5b66a4835 )
Sage Weil [Fri, 12 Apr 2019 16:10:35 +0000 (11:10 -0500)]
osd/OSDMap: raise OSD_FLAGS health alert for crush node flags, too
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
9aa9893b8f67614f40c3de3ed8dacd1105eec5f4 )
Sage Weil [Tue, 16 Apr 2019 22:22:38 +0000 (17:22 -0500)]
osd/OSDMap: add flags for crush nodes
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
2be95af8211225c43d72e439b6000a25743bdab7 )
# Conflicts:
# src/osd/OSDMap.h
- due to std:: prefix on string cluster_snapshot
Yuri Weinstein [Tue, 16 Apr 2019 20:54:47 +0000 (13:54 -0700)]
Merge pull request #27540 from s0nea/wip-38870-nautilus
nautilus: mgr/dashboard: Manager modules and Alerts menu E2E breadcrumb tests
Reviewed-by: Nathan Weinberg <nathan2@stwmd.net>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Yuri Weinstein [Tue, 16 Apr 2019 20:51:52 +0000 (13:51 -0700)]
Merge pull request #27543 from s0nea/wip-38885-nautilus
nautilus: mgr/dashboard: 1 osds exist in the crush map but not in the osdmap breaks OSD page
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Yuri Weinstein [Tue, 16 Apr 2019 20:50:36 +0000 (13:50 -0700)]
Merge pull request #27597 from smithfarm/wip-39239-nautilus
nautilus: cmake: revert librados_tp.so version from 3 to 2
Reviewed-by: Kefu Chai <kchai@redhat.com>
Brad Hubbard [Thu, 11 Apr 2019 07:29:30 +0000 (17:29 +1000)]
src/tests/crushtool: Add test for an empty default
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
5b6b5c5cd3db364eefbfa163c29691a6af8efc18 )
Brad Hubbard [Thu, 11 Apr 2019 05:00:25 +0000 (15:00 +1000)]
crush/CrushCompiler: Fix __replacement_assert
When compiled with _GLIBCXX_ASSERTIONS we see an assert due to UB of
passing the address of an empty vector. Use vector's data member
function instead of address of array syntax.
Fixes: http://tracker.ceph.com/issues/39174
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
a950ac230ec900c53fa74f46c18f86a459c80831 )
Stephan Müller [Wed, 3 Apr 2019 14:13:54 +0000 (16:13 +0200)]
mgr/dashboard: Enable read only users to read again
The dashboards Prometheus receiver API needed to receive a POST from the
frontend, but POSTs aren't allowed by default by any read only
users. As a result the receiver API call had thrown a 403 error which
redirected the user to the 403 error page. Now you can get the last
notifications via GET. This prevents the redirection for read only
users, as a result they can get the last notifications and also
see all other allowed pages again.
Fixes: https://tracker.ceph.com/issues/39086
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit
35a75d088963043c77830865bc943e7d8c30f7e7 )
David Zafman [Fri, 12 Apr 2019 20:09:43 +0000 (13:09 -0700)]
ceph-objectstore-tool: Rename dump-import to dump-export
If user specifies dump-import it will still work, but isn't
in the usage that way.
Fixes: http://tracker.ceph.com/issues/39284
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
96861a8116242bdef487087348c24c97723dfafc )
Abhishek Lekshmanan [Mon, 11 Mar 2019 10:20:37 +0000 (11:20 +0100)]
rgw_admin: add a note warning stale instances for multisite
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
55fdcfa0432e2779b45246349d46e17d8b157153 )
Abhishek Lekshmanan [Fri, 8 Mar 2019 14:50:12 +0000 (15:50 +0100)]
rgw admin: disable stale instance delete in a multiste env
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
b8509433c52f7481e1d5948203f6c5b173d675aa )
dudengke [Thu, 7 Mar 2019 09:04:11 +0000 (17:04 +0800)]
cmake/FindRocksDB: fix IMPORTED_LOCATION for ROCKSDB_LIBRARIES
Signed-off-by: dudengke <pinganddu90@gmail.com>
(cherry picked from commit
7b6e05a03055d85e4616b7611906c40bbf03bb86 )
Yuri Weinstein [Mon, 15 Apr 2019 20:05:14 +0000 (13:05 -0700)]
Merge pull request #27500 from smithfarm/wip-39225-nautilus
nautilus: mds|kclient: MDS_CLIENT_LATE_RELEASE warning caused by inline bug on RHEL 7.5
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 20:04:43 +0000 (13:04 -0700)]
Merge pull request #27501 from smithfarm/wip-39135-nautilus
nautilus: rgw: Make rgw admin ops api get user info consistent with the command line
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 20:04:10 +0000 (13:04 -0700)]
Merge pull request #27523 from smithfarm/wip-39253-nautilus
nautilus: ceph-bluestore-tool: bluefs-bdev-expand cmd might assert if no WAL is configured
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yuri Weinstein [Mon, 15 Apr 2019 20:03:16 +0000 (13:03 -0700)]
Merge pull request #27531 from smithfarm/wip-39260-nautilus
nautilus: ls -S command produces AttributeError: 'str' object has no attribute 'decode'
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 20:02:40 +0000 (13:02 -0700)]
Merge pull request #27539 from pdvian/wip-38977-nautilus
nautilus: rbd: krbd: return -ETIMEDOUT in polling
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 20:02:05 +0000 (13:02 -0700)]
Merge pull request #27541 from ricardoasmarques/wip-39122-nautilus
nautilus: mgr/dashboard: Adapt iSCSI overview page to make use of ceph-iscsi
Reviewed-by: Tiago Melo <tmelo@suse.com>
Yuri Weinstein [Mon, 15 Apr 2019 20:01:04 +0000 (13:01 -0700)]
Merge pull request #27547 from smithfarm/wip-39271-nautilus
nautilus: mgr: autoscale down can lead to max_pg_per_osd limit
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 20:00:05 +0000 (13:00 -0700)]
Merge pull request #27548 from smithfarm/wip-38777-nautilus
nautilus: rgw: support delimiter longer then one symbol
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:59:24 +0000 (12:59 -0700)]
Merge pull request #27550 from smithfarm/wip-39275-nautilus
nautilus: tests: osd-markdown.sh can fail with CLI_DUP_COMMAND=1
Reviewed-by: Sage Weil <sage@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:57:00 +0000 (12:57 -0700)]
Merge pull request #27498 from smithfarm/wip-39075-nautilus
nautilus: multisite: data sync loops back to the start of the datalog after reaching the end
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:53:47 +0000 (12:53 -0700)]
Merge pull request #27496 from sebastian-philipp/wip-39172-nautilus
nautilus: rook-ceph-system namespace hardcoded in the rook orchestrator
Reviewed-by: Travis Nielsen <tnielsen@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:52:29 +0000 (12:52 -0700)]
Merge pull request #27555 from liewegas/wip-fix-object-stat-sum-nautilus
nautilus: osd/osd_types: fix object_stat_sum_t fast-path decode
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:51:31 +0000 (12:51 -0700)]
Merge pull request #27559 from theanalyst/wip-nautilus-38883
nautilus: rgw: LC: handle resharded buckets
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:50:44 +0000 (12:50 -0700)]
Merge pull request #27560 from theanalyst/wip-nautilus-39181
nautilus: orphans find perf improvements
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:49:24 +0000 (12:49 -0700)]
Merge pull request #27561 from cbodley/wip-39280
nautilus: rgw: don't recalculate etags for slo/dlo
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 15 Apr 2019 19:47:50 +0000 (12:47 -0700)]
Merge pull request #27562 from yuriw/wip-yuriw-38952-nautilus
nautilus - qa/tests: removed some config settings
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Nathan Cutler [Mon, 15 Apr 2019 08:48:37 +0000 (10:48 +0200)]
cmake: revert librados_tp.so version from 3 to 2
Post-mortem analysis:
librados.so and librados_tp.so are packaged together in the librados2
RPM.
c680fb10f598267f15a37fdb7bc44529c37c9318 bumped
the librados.so and librados_tp.so versions from 2 to 3.
Later,
7bf6b5ee1208a359826c74ab033e6bbbfc65969f reverted the librados.so
version from 3 to 2, but left the librados_tp.so version at 3.
Fixes: http://tracker.ceph.com/issues/39291
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
b555ba6e2b99400937264edbd3031fcf24fd9005 )
Nathan [Fri, 8 Mar 2019 14:35:08 +0000 (09:35 -0500)]
mgr/dashboard: Added breadcrumb tests to NFS menu
Fixes: https://tracker.ceph.com/issues/38641
Signed-off-by: Nathan Weinberg <nweinber@redhat.com>
(cherry picked from commit
c5634ce6e5810add08bfeb19904014b19e1699be )
IrekFasikhov [Thu, 14 Mar 2019 07:33:22 +0000 (10:33 +0300)]
rgw: fix RGWDeleteMultiObj::verify_permission()
for master
Fixes: https://tracker.ceph.com/issues/38722
Signed-off-by: Irek Fasikhov <malmyzh@gmail.com>
(cherry picked from commit
717a39e23ea20cb24f20af3b8163855ead7e6830 )
David Zafman [Fri, 12 Apr 2019 16:44:14 +0000 (09:44 -0700)]
osd: Fix fast path to use version bumped value
Fix the code so that the version is in one place
for both the slow and fast path.
Caused by:
d2ca3d2feb442f97ca89023c7d01178d96f517a6
Fixes: http://tracker.ceph.com/issues/39281
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
a35f1a9ce1d8c3ed1889da5a8d20b1974b1e9684 )
Sage Weil [Thu, 11 Apr 2019 13:41:03 +0000 (08:41 -0500)]
mon: make mon_osd_down_out_subtree_limit update at runtime
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
93b8f0404a2bdc53da75dab334db2826850d90ae )
Yuri Weinstein [Fri, 12 Apr 2019 16:30:06 +0000 (09:30 -0700)]
nautilus - qa/tests: removed some config settings
Fixes: http://tracker.ceph.com/issues/38952
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Fri, 12 Apr 2019 20:12:18 +0000 (13:12 -0700)]
Merge pull request #27475 from pdvian/wip-38968-nautilus
nautilus: librbd: trash move return EBUSY instead of EINVAL for migrating image
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Fri, 12 Apr 2019 20:11:39 +0000 (13:11 -0700)]
Merge pull request #27478 from pdvian/wip-38973-nautilus
nautilus: osd: process_copy_chunk remove obc ref before pg unlock
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Casey Bodley [Tue, 9 Apr 2019 19:26:08 +0000 (15:26 -0400)]
rgw: don't recalculate etags for slo/dlo
for slo, we've already calculated this as 'lo_etag' in get_params()
for dlo, the local 'etag' already contains the hash of an empty string
the calls to complete_etag() were calling hash.Final() a second time on
the same hash without a hash.Restart() in between. this apparently
worked fine with NSS, but with OpenSSL the second call to Final()
returns a different value
Fixes: https://tracker.ceph.com/issues/39160
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
4b849a49bd6c6b66f8185739ae21f0e6aa526a1a )
Abhishek Lekshmanan [Mon, 18 Mar 2019 13:23:52 +0000 (14:23 +0100)]
rgw_orphan: fix detailed mode flag
to fix possible member var. hiding
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
c43b7dadfc56868bcaab4bc32cf78612fd5ae0e7 )
Abhishek Lekshmanan [Thu, 14 Feb 2019 16:40:44 +0000 (17:40 +0100)]
rgw-admin: add a detailed mode
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
143ff0d835c99b06e57a373bed2c61e84293ccc7 )
Abhishek Lekshmanan [Wed, 13 Feb 2019 14:32:17 +0000 (15:32 +0100)]
rgw: orphans find: don't process stale bucket instances
As a large bucket might have resharded multiple times, check the cur bucket info
and ensure that no reshard is in progress before we attempt to log bucket index
entries. On a large sized bucket, since a bucket would have undergone reshard
multiple times, this avoids wasteful processing of stale bucket instance entries
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
5436ff7fa99061a489f089677c03f63c76bb954b )
Abhishek Lekshmanan [Wed, 13 Feb 2019 12:45:47 +0000 (13:45 +0100)]
rgw: orphan: introduce a detailed mode (off by default)
We currently stat objects that fit in a head as well and also log them, since we
skip head objects anyway in the rados list output this commit avoids logging
these objects if the object size itself is less than the manifest head size.
Additionally we avoid the stat call itself from the list object output when the
object fits within the chunk size. This behaviour can be unset by setting the
detailed mode which can help in older clusters where the head used to have a
different size.
The old behaviour in both the cases can be turned on by setting the detailed
flag which can be passed on from rgw-admin. Avoiding stat calls and not logging
the head objects significantly reduces the IO activity on clusters which have a
huge percentage of objects that fit in a head.
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
ca12ecbfed0f65f206e8ad05125fac93c5a5ed0f )
Abhishek Lekshmanan [Wed, 13 Feb 2019 12:32:43 +0000 (13:32 +0100)]
rgw: orphan: flush bucket index entries only after map is full
We otherwise may flush more regularly while we don't have enough entries in the
map
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
e9a406c9b036e4c3190077d57fc51d6ea3762475 )
Abhishek Lekshmanan [Wed, 13 Feb 2019 12:15:02 +0000 (13:15 +0100)]
rgw: orphans tool: align with rgw list bucket min readahead
At rgw::rados layer we read upto `min readahead` entries anyway and then pass on
only the requested amount to the caller. Since this translates down to a cls
call requesting a 1000 omap keys by default, it makes sense not to waste the
entries, and process them
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
4c033bf0fd0429378ac350eecd78530cc1c11b84 )
Abhishek Lekshmanan [Thu, 14 Mar 2019 21:26:32 +0000 (22:26 +0100)]
cls_rgw: fix issue with gc code using the wrong name
Also use the correct ptr notation
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
35baf931327c4306a72562d41e2b8f7feca0dd24 )
Abhishek Lekshmanan [Fri, 8 Mar 2019 15:57:28 +0000 (16:57 +0100)]
doc: add troubleshooting notes on reshard admin clis
Adding a note on LC fixes and reshard stale instance fixes
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
dee9ac22f19360ba6436e674c93baea9d97ca5da )
Abhishek Lekshmanan [Fri, 8 Mar 2019 11:10:30 +0000 (12:10 +0100)]
rgw: lc fix: protect list_keys and formatter with a scope_guard
raii for fun and profit!
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
a7c42a81dcb3ca92d65afd027d4dfb0fa3c50d4e )
Abhishek Lekshmanan [Thu, 7 Mar 2019 13:44:27 +0000 (14:44 +0100)]
rgw admin: use the new AdminOp to fix lc shards
Since it can iterate over a list of buckets, also rename the command to lc
reshard fix
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
582c1e7afb5f091d1cde0f1c33ee9aa31f3539e9 )
Abhishek Lekshmanan [Thu, 7 Mar 2019 13:12:49 +0000 (14:12 +0100)]
rgw: add a fix_lc_shards AdminOp that can fix lc shards for all the buckets
The output would be a list of bucket names and their fix status, currently
buckets which do not need a fix will also be logged with a status of 0.
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
767a16815b85e351eafb17fa369f580761e2f22a )
Abhishek Lekshmanan [Mon, 4 Mar 2019 18:10:45 +0000 (19:10 +0100)]
rgw admin: implement a lc fix option
An radosgw-admin lc fix --bucket <> option is added which checks if the bucket
entry exists in the corresponding lc shard and creates it if not. In case of
resharded buckets not running a fixed rgw that writes/compares the marker this
would write a new entry with the marker as the old entry would've already been
deleted by a LC process. We currently don't cleanup the stale entry as it is
assumed this would be picked up by the LC processor already or would be picked
up in the next cycle.
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
4528db4b642c37f67b3338ce04979b1ba7772e3e )
Abhishek Lekshmanan [Tue, 5 Mar 2019 12:37:00 +0000 (13:37 +0100)]
cls rgw: implement a method to get a single LC entry
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
64c5d6f880cf6d4d7a93cf4961f14f067d275736 )
Abhishek Lekshmanan [Tue, 5 Mar 2019 12:35:50 +0000 (13:35 +0100)]
cls_rgw: alias the LC entries as rgw_lc_entry_t
instead of a naked std::pair<std::string, int> everywhere
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
9e1d2a28807fc709b5c9f86132609841e453ae45 )
Abhishek Lekshmanan [Tue, 5 Mar 2019 12:34:05 +0000 (13:34 +0100)]
cls_rgw: implement a read_omap_entry method
Also refactor other methods that just read a single omap entry to use this
method instead
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
197bc9b124e917c985863f45848c19beae2bd744 )
Abhishek Lekshmanan [Tue, 5 Mar 2019 09:46:23 +0000 (10:46 +0100)]
rgw lc: use marker for the shard id
Since buckets can undergo resharding which changes the bucket id, using the
bucket marker in the shard id can help prevent the need to rewrite the entry as
the buckets get resharded. This also helps detect the exit criteria when the
bucket gets deleted.
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
bf64aa843febf2f09aab54f9e0a24aa44f5938ea )
Abhishek Lekshmanan [Tue, 5 Mar 2019 08:30:57 +0000 (09:30 +0100)]
rgw: drop entries only if the markers do not match.
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
3a5647f748185e3a3fc2602a132874c0dfb24368 )
Nathan Cutler [Fri, 12 Apr 2019 15:09:36 +0000 (17:09 +0200)]
Merge pull request #27549 from smithfarm/wip-38867-nautilus
nautilus: doc: rgw: Added library/package for Golang
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Kefu Chai [Fri, 12 Apr 2019 12:35:18 +0000 (20:35 +0800)]
Merge pull request #27544 from tchaikov/nautilus-39164
nautilus: install-deps.sh: install '*rpm-macros'
Reviewed-by: Boris Ranto <branto@redhat.com>
Sage Weil [Wed, 10 Apr 2019 21:44:38 +0000 (16:44 -0500)]
qa/standalone/osd/osd-markdown: fix dup command disabling
The ceph cli tool checks for the presence of the variable, not its value.
Fixes: http://tracker.ceph.com/issues/38359
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
f7216d0b2c3a08d0f6e6106e838f84a7af29d396 )
IrekFasikhov [Fri, 15 Mar 2019 05:42:57 +0000 (08:42 +0300)]
doc: add package for Golang
Fixes: http://tracker.ceph.com/issues/38730
Signed-off-by: Irek Fasikhov <malmyzh@gmail.com>
(cherry picked from commit
76e94f88483864ab345818b9fc31fae908ce70fd )
Matt Benjamin [Fri, 8 Mar 2019 20:41:05 +0000 (15:41 -0500)]
rgw: prefix-delimiter listing: support >1 character delimiter
Fix prefix and CommonPrefix extraction logic in
RGWRados::Bucket::List::list_objects_ordered so as to permit
arbitrary-length string delimiters.
Fixes: https://tracker.ceph.com/issues/24821
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
e3c1ea244234aace7368d5a5ee95af2f6a529b00 )
Sage Weil [Tue, 9 Apr 2019 22:12:37 +0000 (17:12 -0500)]
mgr/DaemonServer: prevent pgp_num reductions from outpacing pg_num merges
If we are merging lots of pgs down to a much smaller number of pgs, and
the pgs are able to move quickly (faster than the merges happen), we can
end up with too many pgs on a small number of osds, triggering the max
pgs per osd limits.
Avoid this by preventing the pgp_num reductions from getting too far
out in front of the merges themselves. Basically, cap the delta between
pgp_num and pg_num to the max_misplaced ratio. We are already limiting
the movement caused by pgp_num by max_misplaced; this effectively just
makes sure that the actual merging (and pg_num reductions) are keeping
up.
Fixes: http://tracker.ceph.com/issues/38786
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
76503a1438fa1f166d2c230c73ca8d7b67e6468d )
Sebastian Wagner [Thu, 11 Apr 2019 13:32:13 +0000 (15:32 +0200)]
mgr/rook: Fix Python 2 regression
Fixes: http://tracker.ceph.com/issues/39250
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f9ba374d79cfc984d7209122a0dc88e4a3d2b96b )
Kefu Chai [Thu, 11 Apr 2019 16:11:42 +0000 (00:11 +0800)]
install-deps.sh: install '*rpm-macros'
so `yum-builddep` can have access to the latest macros for preparing the
build dependencies
Fixes: http://tracker.ceph.com/issues/39164
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
087ea813a061a1d6858aeae57950e90965f4ae15 )
Patrick Nawracay [Fri, 8 Mar 2019 11:44:13 +0000 (11:44 +0000)]
mgr/dashboard: "1 osds exist in the crush map but not in the osdmap" breaks OSD page
Fixes: http://tracker.ceph.com/issues/36086
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
(cherry picked from commit
29d53f8d29e486a3abe83dbf472aa8dac5b493f3 )
Patrick Nawracay [Fri, 8 Mar 2019 11:30:42 +0000 (11:30 +0000)]
mgr/dashboard: Clean up of Osd::list()
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
(cherry picked from commit
f7cd7b025fab5cc4cd22d01918d0cf82e1fb9bf4 )
Ricardo Marques [Wed, 3 Apr 2019 08:38:15 +0000 (09:38 +0100)]
mgr/dashboard: Log `gateway_name` on `iscsi_client`
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
ab0ac43982cbc3fab09c036a3e4cc19ca6521911 )
Ricardo Marques [Wed, 3 Apr 2019 07:56:27 +0000 (08:56 +0100)]
mgr/dashboard: Display number of sessions on iSCSI overview page
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
c988a44f068b2697df08bf8911fa1311fca104e7 )
Ricardo Marques [Tue, 2 Apr 2019 15:59:51 +0000 (16:59 +0100)]
mgr/dashboard: Adds 'tcmu-runner' to the 'user:rbd' backstore descr
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
b7870c8051c33e44b2190d295c1957f2a7a17d89 )
Ricardo Marques [Tue, 2 Apr 2019 14:38:04 +0000 (15:38 +0100)]
mgr/dashboard: Disable backstore dropdown
iSCSI backstore is always visible but is disabled
if only one option is available.
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
094d7935c39868440b7688cdf98e3e56215f1f9f )