]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Adam C. Emerson [Wed, 9 May 2018 02:34:44 +0000 (22:34 -0400)]
build: Remove -Wno-invalid-offsetof
Since C++17 relaxed the rules for using offsetof, this is no longer needed.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
f9c5e28225cd145f28484ba15f7582716de5a98c )
Adam C. Emerson [Wed, 9 May 2018 01:54:21 +0000 (21:54 -0400)]
tools: Do not memset uuid_d
It is perfectly able to default initialize itself.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
c876618931afe8206fe98bedee59a27ed0c40ef0 )
Adam C. Emerson [Wed, 9 May 2018 01:25:28 +0000 (21:25 -0400)]
test/rbd/fsx: Disable overflow-format warning
No return type or other way to react to it.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
ff189df08fc7250dfcc334502598cfbc4d2d4cb7 )
Adam C. Emerson [Wed, 9 May 2018 01:03:29 +0000 (21:03 -0400)]
test/libcephfs: Expand buffer slightly
So the snprintf output isn't truncated.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
5bfcd2335b6b807301d75cb545dd661beca18a72 )
Adam C. Emerson [Tue, 8 May 2018 23:54:50 +0000 (19:54 -0400)]
rgw: There is no point in const return values
Pointer-to-const or reference-to-const yes. Const value, no.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
389538f356d14413bdf67d68ce2b770c4374cb3c )
Adam C. Emerson [Tue, 8 May 2018 23:53:19 +0000 (19:53 -0400)]
rgw: Catch exceptions at const references
/Never/ by value.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
25f6b639495ef9047480a286945793af50621bf6 )
Adam C. Emerson [Tue, 8 May 2018 23:43:33 +0000 (19:43 -0400)]
rgw: Remove extra 'const' from cast
Casting to pointer-to-const makes sense. Casting to a const
value (even a const pointer) doesn't.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
46b40274d42e54bf80adb0086b02e9785e0646db )
Adam C. Emerson [Tue, 8 May 2018 23:29:41 +0000 (19:29 -0400)]
rdma: Silence qualifier warnings
No point in reinterpret_casting something const anyway, you can always
assign non-const to const.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
7a551495d96ab984ef01cbadfddfe2055b44852f )
Adam C. Emerson [Tue, 8 May 2018 23:26:28 +0000 (19:26 -0400)]
msg/rdma/infiniband: Silence memset warning
Though it may be better in the long-run to replace the malloc-like
interface with an Allocator type interface.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
7fcfb60170e7cd293109c0c74ac1e4cdcd31b143 )
Adam C. Emerson [Tue, 8 May 2018 23:23:02 +0000 (19:23 -0400)]
rgw: Exceptions should be caught by const reference
/Not/ by value.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
1065d7996e359283f0f3e3804cdb77b4829a9191 )
Adam C. Emerson [Tue, 8 May 2018 22:58:12 +0000 (18:58 -0400)]
FuseStore: Expand buffers to prevent overflow
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
4365b1d358cd18c90d6371c96f5bc1a7516cd86b )
Adam C. Emerson [Tue, 8 May 2018 21:19:38 +0000 (17:19 -0400)]
perfglue: Silence truncation warning
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
a0d15b915f8092f9cfcd19a700e7059dbdaa5296 )
Adam C. Emerson [Tue, 8 May 2018 20:50:02 +0000 (16:50 -0400)]
mount: Enlarge buffer to fix overflow warning
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
5ef603f388957b472326180a1e23ade61e80c163 )
Adam C. Emerson [Tue, 8 May 2018 20:47:38 +0000 (16:47 -0400)]
mon: Remove unused variable
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
cfd425e319a28dfa472fd3e7532d7ef11cb888e6 )
Adam C. Emerson [Tue, 8 May 2018 20:42:56 +0000 (16:42 -0400)]
blkdev: Check return of snprintf and error on truncation
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
1683aed5395fb2c195a25715a3dedb83db871fc1 )
Adam C. Emerson [Tue, 8 May 2018 20:31:25 +0000 (16:31 -0400)]
blkdev: Get rid of get_device_by_uuid
This function's interface is bad, in that it takes char*s with no
sizes. Also nobody calls it.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
ef8465c2a534875864563e6f0d48ab0e351e67f5 )
Adam C. Emerson [Mon, 7 May 2018 20:36:42 +0000 (16:36 -0400)]
test: Enlarge a few buffers
To get rid of overflow warnings.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
d55048146acad2759b18e4c54248861c41567e33 )
Adam C. Emerson [Mon, 7 May 2018 20:24:17 +0000 (16:24 -0400)]
mds: Do not memset fnode_t
fnode_t can initialize itself.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
8dffe4eb954a20bdb5fddcbf02a752280b8a9816 )
Adam C. Emerson [Mon, 7 May 2018 20:13:18 +0000 (16:13 -0400)]
auto: Catch exceptions by const reference
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
6e8188498e66ea46a58c6c46c44cecbb243d661d )
Adam C. Emerson [Mon, 7 May 2018 20:11:12 +0000 (16:11 -0400)]
client: Do not memset frag_info_t and inode_t
They do a perfectly good job of initializing themselves.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
d5adb05a249b66a4ce909e0157178d83bc5abbb6 )
Adam C. Emerson [Mon, 7 May 2018 20:03:21 +0000 (16:03 -0400)]
test: Increase buffer to prevent possible truncation
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
5811a396e6602aaf792d69b23921b12632dfef83 )
Adam C. Emerson [Mon, 7 May 2018 20:00:45 +0000 (16:00 -0400)]
rgw: Fix uninitialized value warning
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
27e95a4144a3caf40e4db6a82b93b792f4f9d145 )
Kefu Chai [Mon, 7 May 2018 07:19:37 +0000 (15:19 +0800)]
test: silence -Wformat-truncation= warnings
this change silences following warnings:
: warning: ‘%s’ directive output may be truncated writing up to 127
bytes into a region of size between 109 and 119 [-W
format-truncation=]
snprintf(m_id_str, SysTestRunnable::ID_STR_SZ, "process_%d%s",
m_id, extra);
^~~~~~~~~~~~~~
~~~~~
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
ba3f82a46c7e6862d31b162ee2badd4773c00bb9 )
Kefu Chai [Mon, 7 May 2018 07:18:40 +0000 (15:18 +0800)]
auth: silence -Wparentheses warning
this change silences following warning:
warning: unnecessary parentheses in declaration of ‘os’ [-Wparentheses]
std::ostringstream(os);
^
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
b6fe1fec148cf5bcd9a8d780c993dbebc83b860d )
Kefu Chai [Mon, 7 May 2018 06:42:52 +0000 (14:42 +0800)]
mds,messages: silence -Wclass-memaccess warnings
this change silences warnings like:
warning: ‘void* memset(void*, int, size_t)’ writing to an object of
non-trivial type ‘struct uuid_d’; use assignment instead [-Wcla
ss-memaccess]
memset(&z.cluster_fsid, 1, sizeof(z.cluster_fsid));
^
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
4b99f88fac67d652fe9b7e790236899794ea6c1a )
Lenz Grimmer [Fri, 18 May 2018 10:33:38 +0000 (12:33 +0200)]
Merge pull request #22052 from tspmelo/wip-momentjs
mimic: mgr/dashboard: Fix moment.js deprecation warning
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Yuri Weinstein [Thu, 17 May 2018 17:31:27 +0000 (10:31 -0700)]
Merge pull request #22070 from yuriw/wip-yuriw-mimic-backport-21932-mimic
mimic: tests/qa: Adding $ distro mix - rgw
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 10 May 2018 15:58:37 +0000 (08:58 -0700)]
tests/qa: Adding $ distro mix - rgw
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit
7ce916394881a0e8db2a160f246af0d907aedb19 )
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Lenz Grimmer [Thu, 17 May 2018 14:56:05 +0000 (16:56 +0200)]
Merge pull request #21979 from votdev/bug_24097_mimic
mimic: mgr/dashboard: Navbar dropdown button does not respond for mobile browsers
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Lenz Grimmer [Thu, 17 May 2018 14:54:22 +0000 (16:54 +0200)]
Merge pull request #22032 from votdev/fix_deletion_dialog_mimic
mimic: mgr/dashboard: Deletion dialog falsely executes deletion when pressing 'Cancel'
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Lenz Grimmer [Thu, 17 May 2018 14:49:14 +0000 (16:49 +0200)]
Merge pull request #22029 from votdev/fix_deletion_mimic
mimic: mgr/dashboard: Handle errors during deletion
Reviewed-by: Tiago Melo <tmelo@suse.com>
Sage Weil [Thu, 17 May 2018 13:40:46 +0000 (08:40 -0500)]
Merge pull request #22048 from tchaikov/mimic-23653
mimic: cmake: do not check for aligned_alloc() anymore
Reviewed-by: Sage Weil <sage@redhat.com>
Tiago Melo [Mon, 14 May 2018 15:24:58 +0000 (16:24 +0100)]
mgr/dashboard: Fix moment.js deprecation warning
Fixes: https://tracker.ceph.com/issues/24115
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
89ae2577303a6b48b8822cddd3ec4fc255b6ff1f )
Kefu Chai [Thu, 17 May 2018 02:30:33 +0000 (10:30 +0800)]
cmake: do not check for aligned_alloc() anymore
this reverts
16f0a67d
Fixes: http://tracker.ceph.com/issues/23653
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
4d646ef579ee2f820a1cb0a7b0bd99b9a6cf20ea )
Jason Dillaman [Wed, 16 May 2018 23:25:55 +0000 (19:25 -0400)]
Merge pull request #22038 from dillaman/wip-22787-mimic
mimic: librbd: deep copy optionally support flattening cloned image
Reviewed-by: Mykola Golub <mgolub@suse.com>
Jason Dillaman [Wed, 16 May 2018 23:25:41 +0000 (19:25 -0400)]
Merge pull request #22039 from dillaman/wip-24141-mimic
mimic: rbd-mirror: potential deadlock when running asok 'flush' command
Reviewed-by: Mykola Golub <mgolub@suse.com>
Mykola Golub [Wed, 16 May 2018 07:40:29 +0000 (10:40 +0300)]
rbd-mirror: make 'flush' asok command asynchronous
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
6fce4cabe7874efef780c7adce8479db8571afe7 )
Mykola Golub [Wed, 16 May 2018 07:34:50 +0000 (10:34 +0300)]
rbd-mirror: don't reregister asok hook in process entry thread
It might get stuck if the asok is busy executing a command.
Instead kick status update, which will call reregister on finish.
Fixes: http://tracker.ceph.com/issues/24141
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
43e50bd582ba2d1b66f55d7f8d2b7f030da99ee6 )
Mykola Golub [Wed, 25 Apr 2018 21:02:57 +0000 (00:02 +0300)]
rbd: deep copy option to copy clone parent data
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
e387f9195545522351306ce420bd758b888dc774 )
Mykola Golub [Thu, 26 Apr 2018 08:30:03 +0000 (11:30 +0300)]
librbd: deep copy optionally support flattening cloned image
Fixes: http://tracker.ceph.com/issues/22787
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
0d43d2faceca158cc9cf2177802b80dda2b554c9 )
Mykola Golub [Thu, 10 May 2018 18:25:17 +0000 (21:25 +0300)]
librbd/deep_copy: adjust in-memory overlap if set_size updated it on disk
so set_parent won't be called when overlap is changed due to image
size change.
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
ca0893c4d9f54e3d80cf7ea90c8b4431d1f5a4f0 )
Mykola Golub [Tue, 8 May 2018 13:52:50 +0000 (16:52 +0300)]
librbd: hide parent object when deep copying empty child
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
3d884eaee89d39570f0dbe9bf1f25f7d27bcd907 )
Mykola Golub [Tue, 8 May 2018 12:29:38 +0000 (15:29 +0300)]
librbd: fix deep copy clone to destination with larger object size
When assembling a destination object from source objects we need to
read from parent if some (but not all) of assembles do not exist.
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
947993a8d36f60bde05bc7b9a49c333dd51da4c5 )
Conflicts:
src/test/librbd/deep_copy/test_mock_ImageCopyRequest.cc: trivial resolution
Mykola Golub [Tue, 8 May 2018 12:27:25 +0000 (15:27 +0300)]
test/librbd: add deep copy clone tests
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit
928540272f16911e3e0867db606ac5be40f49c27 )
Sage Weil [Wed, 16 May 2018 15:52:19 +0000 (10:52 -0500)]
Merge pull request #21836 from tchaikov/mimic-23962
mimic: pybind/ceph_daemon: expand the order of magnitude of
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 16 May 2018 15:51:47 +0000 (10:51 -0500)]
Merge pull request #21862 from cbodley/wip-gcc-8-mimic
mimic: cmake,common,filestore: silence gcc-8 warnings/errors
Sage Weil [Wed, 16 May 2018 15:51:09 +0000 (10:51 -0500)]
Merge pull request #21958 from tchaikov/mimic-24000
mimic: osdc: self-managed snapshot helper should catch decode exception
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Wed, 16 May 2018 15:50:30 +0000 (10:50 -0500)]
Merge pull request #21959 from tchaikov/mimic-23899
mimic: osd: clean up smart probe
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 16 May 2018 15:50:03 +0000 (10:50 -0500)]
Merge pull request #21974 from tchaikov/mimic-22302
mimic: selinux: Allow ceph to execute ldconfig
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Volker Theile [Wed, 16 May 2018 12:34:34 +0000 (14:34 +0200)]
mgr/dashboard: Handle errors during deletion
- Take care that the deletion dialog gets notified about errors to stop the progress spinner and enable the delete button again.
- Prettify JS code.
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
b2fa819fdfee93e6951666198720bce44c37b95d )
Volker Theile [Wed, 16 May 2018 13:51:32 +0000 (15:51 +0200)]
mgr/dashboard: Deletion dialog falsely executes deletion when pressing 'Cancel'
If a deletion fails and the 'Cancel' button is pressed to close the dialog, then the deletion process is triggered again.
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
0473b02872f9dbc1993ec5d6686484c24986e85c )
Lenz Grimmer [Wed, 16 May 2018 09:43:42 +0000 (11:43 +0200)]
Merge pull request #21977 from votdev/info_no_rgw_mimic
mimic: mgr/dashboard: Display notification if RGW is not configured
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Patrick Donnelly [Tue, 15 May 2018 13:46:33 +0000 (06:46 -0700)]
Merge PR #21988 into mimic
* refs/pull/21988/head:
mds: handle imported session race
mds: check for session import race
Reviewed-by: Zheng Yan <zyan@redhat.com>
Lenz Grimmer [Tue, 15 May 2018 11:30:02 +0000 (13:30 +0200)]
Merge pull request #21978 from votdev/improve_error_panel_mimic
mimic: mgr/dashboard: Improve error panel
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Patrick Donnelly [Mon, 14 May 2018 04:27:51 +0000 (21:27 -0700)]
mds: handle imported session race
Thanks to Yan Zheng for identifying and reviewing the fix.
Fixes: http://tracker.ceph.com/issues/24087
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
b9c3751e9e375c679bada1fab228b52420cf7a4b )
Patrick Donnelly [Mon, 14 May 2018 02:58:17 +0000 (19:58 -0700)]
mds: check for session import race
Credit to Yan Zheng for identifying the race condition [1].
[1] https://bugzilla.redhat.com/show_bug.cgi?id=
1572555 #c7
Test-for: http://tracker.ceph.com/issues/24072
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
fbc25b44865f6c13c9a9c4710049f9e37169747b )
Kefu Chai [Mon, 14 May 2018 15:31:14 +0000 (23:31 +0800)]
Merge pull request #21970 from wido/mgr-brag
mgr/telemetry: Add Ceph Telemetry module to send reports back to project
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 14 May 2018 13:46:37 +0000 (08:46 -0500)]
Merge pull request #21956 from tchaikov/mimic-pr-21942
mimic: qa/workunits/ceph-disk: --no-mon-config
Volker Theile [Mon, 14 May 2018 13:14:16 +0000 (15:14 +0200)]
mgr/dashboard: Navbar dropdown button does not respond for mobile-like browsers
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
b3175d9fa777ea4d7437f0c6d0f281b2b36d7560 )
Volker Theile [Mon, 14 May 2018 12:57:43 +0000 (14:57 +0200)]
mgr/dashboard: Improve error panel
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
a8dae80dce973c441db3d4b914febd4b48725f1e )
Volker Theile [Mon, 14 May 2018 12:28:51 +0000 (14:28 +0200)]
mgr/dashboard: Display useful info if RGW is not configured
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
83441af93cae11e62286a99e65e470a5788e8429 )
Volker Theile [Mon, 14 May 2018 12:28:35 +0000 (14:28 +0200)]
mgr/dashboard: Add ModuleStatusGuardService route guard
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
f49e192dd56fb471961cebe71583c16b823e0bed )
Volker Theile [Mon, 14 May 2018 12:27:50 +0000 (14:27 +0200)]
mgr/dashboard: Add info panel component
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
d1b179d757aac258d3ce0abc162ed8f6550a535a )
Yan, Zheng [Mon, 14 May 2018 12:00:37 +0000 (20:00 +0800)]
Merge pull request #21976 from ukernel/mimic-revert-23837
Revert "ceph-fuse: Delete inode's bufferhead was in Tx state would le…
Yan, Zheng [Mon, 14 May 2018 11:59:01 +0000 (19:59 +0800)]
Revert "ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail"
This reverts commit
ede7817a36e7b10f01f906000ce3ed621c0fc358 .
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Boris Ranto [Wed, 11 Apr 2018 13:25:59 +0000 (15:25 +0200)]
selinux: Allow ceph to block suspend
Ceph is now trying to block suspend in certain cases, we need to update
the policy accordingly.
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
e3be372d854f9014ca711f14525ca9e510d34f1a )
Boris Ranto [Thu, 25 Jan 2018 15:31:30 +0000 (16:31 +0100)]
selinux: Allow ceph to execute ldconfig
The ceph-volume testing showed that the ceph daemons can run ldconfig in
a corner case when they are forbidden access to some files. This patch
allows ceph to execute ldconfig in Enforcing mode.
Fixes: https://tracker.ceph.com/issues/22302
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
fa5071b6d7182f54cd7b1ffe171a4b006f5255cb )
Wido den Hollander [Fri, 27 Apr 2018 07:14:05 +0000 (09:14 +0200)]
mgr/telemetry: Add Ceph Telemetry module to send reports back to project
This Manager Module will send statistics and version information from
a Ceph cluster back to telemetry.ceph.com if the user has opted-in on sending
this information.
Additionally a user can tell that the information is allowed to be made
public which then allows other users to see this information.
Signed-off-by: Wido den Hollander <wido@42on.com>
Wido den Hollander [Fri, 27 Apr 2018 07:13:14 +0000 (09:13 +0200)]
brag: Remove ceph-brag
To be replaced by Telemetry module in Ceph Mgr
Signed-off-by: Wido den Hollander <wido@42on.com>
Sage Weil [Fri, 11 May 2018 20:21:46 +0000 (15:21 -0500)]
osd: clean up smart probe code a bit
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
eea18b45daba33bfdab25ec3879d1c9a5297dc1e )
Gu Zhongyan [Fri, 27 Apr 2018 10:20:02 +0000 (18:20 +0800)]
osd: fix osd smart data collection segment fault issue.
output.read_fd() could return zero length. it needs to
be handled gracefully.
always call invoke join() if spawn() is successfully returned.
otherwise there will be assert failure in ~SubProcess().
Fixes: http://tracker.ceph.com/issues/23899
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
(cherry picked from commit
00c5a30fa9b056ec97ff0b56e195b9a21dd1c136 )
Jason Dillaman [Wed, 9 May 2018 15:45:51 +0000 (11:45 -0400)]
mon: pool-ops against non-existent pools should return error
Fixes: http://tracker.ceph.com/issues/24000
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
43dbdb9d2997171868a590671fec3afe7089c3f3 )
Jason Dillaman [Thu, 3 May 2018 19:23:44 +0000 (15:23 -0400)]
osdc: self-managed snapshot helper should catch decode exception
Fixes: http://tracker.ceph.com/issues/24000
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
43f7b17129ea8ab0a98f615ffc4d78ccad98309f )
Kefu Chai [Fri, 11 May 2018 13:06:51 +0000 (21:06 +0800)]
qa/workunits/ceph-disk: --no-mon-config
port
a095ec8b to the qa/workunits
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
ee33dc8e53fb41b8ee23783a969ac5288d3211eb )
Patrick Donnelly [Fri, 11 May 2018 22:15:23 +0000 (15:15 -0700)]
Merge PR #21954 into mimic
* refs/pull/21954/head:
ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail
YunfeiGuan [Tue, 8 May 2018 11:35:32 +0000 (19:35 +0800)]
ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail
Prematurely delted the bh which was in Tx state may lead the object can't
be closed before its writer of this bh callback. Thus if inode's ref call
put_inode decrease ref to zero and release inode's oset.An assert fail occur
beacuse the oset can't be emptied.
If gather.has_subs() is true, we can't call flush_set_callback() because
this would cause a double drop of FILE_CACHE | FILE_BUFFER.
Fixes:http://tracker.ceph.com/issues/23837
Signed-off-by: Guan yunfei <yunfei.guan@xtaotech.com>
(cherry picked from commit
07e3bceea78dc8ecd76abb1cafca5c9d1fde521e )
Patrick Donnelly [Fri, 11 May 2018 22:12:11 +0000 (15:12 -0700)]
Merge PR #21953 into mimic
* refs/pull/21953/head:
mds: properly reconnect client caps after loading inodes
Yan, Zheng [Wed, 2 May 2018 02:23:33 +0000 (10:23 +0800)]
mds: properly reconnect client caps after loading inodes
Commit
e43c02d6 "mds: filter out blacklisted clients when importing
caps" makes MDCache::process_imported_caps() ignore clients that are
not in MDCache::rejoin_imported_session_map. The map does not contain
clients from which mds has received reconnect messages. This causes
some client caps (corresponding inodes were not in cache when mds was
in reconnect state) to get dropped.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
48f60e7f274de9d76499816a528eff859bb161e3 )
Patrick Donnelly [Fri, 11 May 2018 22:05:46 +0000 (15:05 -0700)]
Merge PR #21952 into mimic
* refs/pull/21952/head:
mds: tighten conditions of calling rejoin_gather_finish()
mds: avoid calling rejoin_gather_finish() two times successively
Yan, Zheng [Tue, 8 May 2018 03:32:01 +0000 (11:32 +0800)]
mds: tighten conditions of calling rejoin_gather_finish()
Handle two cases:
1. mds receives all cache rejoin messages, then receives mdsmap that
says mds cluster enters rejoining state.
2. when opening undef inodes/dirfrags, other mds restarts.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
0a38a499b86c0ee13aa0e783a8359bcce0876088 )
Yan, Zheng [Tue, 8 May 2018 02:42:05 +0000 (10:42 +0800)]
mds: avoid calling rejoin_gather_finish() two times successively
If MDCache::rejoin_gather is empty and MDCache::rejoins_pending is true
when MDCache::process_imported_caps() calls maybe_send_pending_rejoins()
Both MDCache::rejoin_send_rejoins() and MDCache::process_imported_caps()
may call rejoin_gather_finish().
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/24047
(cherry picked from commit
0451dae777a2a9b1e70303d7bbc4398849f45f3e )
Patrick Donnelly [Fri, 11 May 2018 22:01:52 +0000 (15:01 -0700)]
Merge PR #21951 into mimic
* refs/pull/21951/head:
mds: set could_consume to false when no purge queue item actually executed
Xuehan Xu [Thu, 10 May 2018 04:22:24 +0000 (12:22 +0800)]
mds: set could_consume to false when no purge queue item actually executed
Fixes: http://tracker.ceph.com/issues/24073
Signed-off-by: Xuehan Xu <xuxuehan@360.cn>
(cherry picked from commit
46b4e6afa631058fe066bfd58c76d644d5c2181d )
Nathan Cutler [Fri, 11 May 2018 09:02:08 +0000 (11:02 +0200)]
Merge pull request #21916 from smithfarm/wip-24062-mimic
mimic: rgw: policy: modify s3:ListBucketMultiPartUploads to s3:ListBucketMul
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Sage Weil [Thu, 10 May 2018 17:16:44 +0000 (12:16 -0500)]
ceph_release: we are an rc now
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Thu, 10 May 2018 15:27:43 +0000 (11:27 -0400)]
Merge pull request #21930 from dillaman/wip-rbd-backports-mimic
rbd: backport of mimic bug fixes
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 9 May 2018 19:01:18 +0000 (15:01 -0400)]
Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"
This reverts commit
6c722cd5f3f829ccf14280e7e36387bafd819c7a .
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3c6b01574766ca128818461d6630866cc0c0405b )
Jason Dillaman [Wed, 9 May 2018 16:37:22 +0000 (12:37 -0400)]
rbd: don't load config overrides from monitor initially
The overrides will be loaded when we connect to the cluster via librados
and the current approach prevents running 'rbd help' without a running
cluster.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
46eafdabde57736d2a8b63f55cab94461885a957 )
Jason Dillaman [Fri, 4 May 2018 15:14:34 +0000 (11:14 -0400)]
rbd-mirror: ensure remote demotion is replayed locally
The bootstrap process cannot immediately quit if it notices the remote
image is not primary. Instead, it needs to continue if the local image is
still chained to the remote.
Fixes: http://tracker.ceph.com/issues/24009
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d35bc94319c6fa267e973e533f4591568289ee96 )
Jason Dillaman [Fri, 4 May 2018 13:24:43 +0000 (09:24 -0400)]
rbd-mirror: fix potential race between image sync and shut down
Fixes: http://tracker.ceph.com/issues/24008
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4f2dbcefc5e3547926b8d34135a808266bd059b8 )
Jason Dillaman [Fri, 4 May 2018 13:23:27 +0000 (09:23 -0400)]
rbd-mirror: ensure instance replayer is stoped before destructing
Fixes: http://tracker.ceph.com/issues/24008
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9ba94f303072374b5c7c9265c3a493fddce2f8ca )
Nathan Cutler [Thu, 10 May 2018 05:15:34 +0000 (07:15 +0200)]
Merge pull request #21918 from smithfarm/wip-24003-mimic
script: build-integration-branch: avoid Unicode error
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Thu, 3 May 2018 20:42:04 +0000 (22:42 +0200)]
script: build-integration-branch: avoid Unicode error
When run on PRs that have non-ASCII characters in their titles, the script
fails like this when run in a non UTF-8 environment:
UnicodeEncodeError: 'latin-1' codec can't encode character u'\u2026' in
position 651: ordinal not in range(256)
Since failing like that is not useful, avoid the error by forcing ASCII
encoding and filtering out any non-ASCII characters.
Fixes: http://tracker.ceph.com/issues/24003
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
6dd31fdbec43e37bece24c0de886d2c4083901c8 )
xiangxiang [Tue, 20 Mar 2018 12:38:07 +0000 (20:38 +0800)]
rgw: policy: modify s3:ListBucketMultiPartUploads to s3:ListBucketMultipartUploads
according to AWS S3, the permission keyword should be s3:ListBucketMultipartUploads
rather than s3:ListBucketMultiPartUploads.
all operation permission list in AWS S3 as follows:
https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html?shortFooter=true
Signed-off-by: xiangxiang <xiangxiang@xsky.com>
(cherry picked from commit
41ef62d9047ca7469023181f203e79c63ec30d64 )
Venky Shankar [Wed, 9 May 2018 15:07:19 +0000 (20:37 +0530)]
doc: fix iscsi target name when configuring target
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
3b2d739e4c12120d27fdaf6b0af0e0de5bb972f3 )
Tatjana Dehler [Wed, 9 May 2018 14:59:32 +0000 (16:59 +0200)]
Merge pull request #21855 from votdev/fix_rgw_backend_mimic
mimic: mgr/dashboard: Refactor RGW backend
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Kefu Chai [Wed, 9 May 2018 14:08:52 +0000 (22:08 +0800)]
Merge pull request #21835 from tchaikov/mimic-23921
mimic: crush, osd: handle multiple parents properly when applying pg upmaps
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Kefu Chai [Wed, 9 May 2018 13:03:50 +0000 (21:03 +0800)]
Merge pull request #21834 from tchaikov/mimic-23966
mimic: osdc: guard op->on_notify_finish with lock
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Wed, 9 May 2018 12:12:13 +0000 (20:12 +0800)]
Merge pull request #21830 from tchaikov/mimic-qa-cephfs-snap
mimic: qa: fix test on "ceph fs set cephfs allow_new_snaps"
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kefu Chai [Wed, 9 May 2018 12:10:00 +0000 (20:10 +0800)]
Merge pull request #21859 from dillaman/wip-23966-mimic
librados: fix potential race condition if notify immediately fails
Reviewed-by: Kefu Chai <kchai@redhat.com>