]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agocls/rbd: fixed last read key for interrupted mirror_image_map_list 22105/head
Jason Dillaman [Wed, 16 May 2018 20:14:36 +0000 (16:14 -0400)]
cls/rbd: fixed last read key for interrupted mirror_image_map_list

Previously, the image map would only return a maximum of 64 mappings.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3cbe0cedcd3057066cee88e98ccf8a19dbdf52d2)

7 years agoqa/suites/rbd: reduce runtime of rbd-mirror fsx test case
Jason Dillaman [Mon, 14 May 2018 18:58:40 +0000 (14:58 -0400)]
qa/suites/rbd: reduce runtime of rbd-mirror fsx test case

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 61e94e6905ca6bc6931782277dfd63478f281898)

7 years agoqa/suites/rbd: added active/active rbd-mirror tests
Jason Dillaman [Thu, 3 May 2018 16:49:51 +0000 (12:49 -0400)]
qa/suites/rbd: added active/active rbd-mirror tests

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e2d5f8441aae08dccded6ec740181efc54bde19a)

7 years agoqa/workunits/rbd: fixed rbd-mirror snapshot comparison loop
Jason Dillaman [Tue, 15 May 2018 20:13:16 +0000 (16:13 -0400)]
qa/workunits/rbd: fixed rbd-mirror snapshot comparison loop

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 917f8a037cf2e9e8795fd4bedeffc8655b515bac)

7 years agoqa/workunits/rbd: fixed missing error code on trap handler
Jason Dillaman [Mon, 14 May 2018 15:11:08 +0000 (11:11 -0400)]
qa/workunits/rbd: fixed missing error code on trap handler

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 02e32fe45a3c6c922feeb09fd1e6b95f90278674)

7 years agoqa/workunits/rbd: skip rbd-mirror start/stop cases when thrashing daemons
Jason Dillaman [Mon, 14 May 2018 12:35:57 +0000 (08:35 -0400)]
qa/workunits/rbd: skip rbd-mirror start/stop cases when thrashing daemons

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3086f29b64adef963ce9d9292cc5275b91d85952)

7 years agoqa/workunits/rbd: rbd-mirror admin socket commands should retry
Jason Dillaman [Wed, 9 May 2018 17:31:39 +0000 (13:31 -0400)]
qa/workunits/rbd: rbd-mirror admin socket commands should retry

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit a6a8c8a2abfe19b10f9315946eb48f0c1cf630f4)

7 years agoqa/workunits/rbd: don't override rbd-mirror logs if running under teuthology
Jason Dillaman [Mon, 7 May 2018 16:00:02 +0000 (12:00 -0400)]
qa/workunits/rbd: don't override rbd-mirror logs if running under teuthology

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1bb6d4fd89c6434de9441581f125eb8ef55c6d07)

7 years agoqa/workunits/rbd: append rbd-mirror instance number for all-daemon asok command
Jason Dillaman [Thu, 3 May 2018 16:04:55 +0000 (12:04 -0400)]
qa/workunits/rbd: append rbd-mirror instance number for all-daemon asok command

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 15a197ed06ce80dd0a42d2467595908095cf648e)

7 years agotest/rbd: fsx should utilize the default image features
Jason Dillaman [Mon, 14 May 2018 18:57:23 +0000 (14:57 -0400)]
test/rbd: fsx should utilize the default image features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c1e111e9855047d69762d06bb9094f93c6c12139)

7 years agotest/rbd_mirror: fix race condition with image map timer callbacks
Jason Dillaman [Thu, 10 May 2018 16:43:00 +0000 (12:43 -0400)]
test/rbd_mirror: fix race condition with image map timer callbacks

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2534e5e4558b624eb62639a1f620dfb42b21044c)

7 years agolibrbd: deep-copy should remove parent metadata if overlap updated
Jason Dillaman [Tue, 15 May 2018 19:07:21 +0000 (15:07 -0400)]
librbd: deep-copy should remove parent metadata if overlap updated

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit af4298464d6809969eb35382b3cbbb1ea0b3bd1e)

7 years agolibrbd: journal replay should no-op out-of-bounds IO
Jason Dillaman [Tue, 15 May 2018 19:55:04 +0000 (15:55 -0400)]
librbd: journal replay should no-op out-of-bounds IO

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 9a1fcef5edbfdfc77293c4b60c9e038db49abf1f)

7 years agolibrbd: don't assert if parent pool doesn't exist
Jason Dillaman [Thu, 10 May 2018 12:54:41 +0000 (08:54 -0400)]
librbd: don't assert if parent pool doesn't exist

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 88436b58bca5b271403f583f6b95e1d30ea81f8f)

7 years agorbd-mirror: image create should lookup local parent snapshot id
Jason Dillaman [Tue, 15 May 2018 18:07:35 +0000 (14:07 -0400)]
rbd-mirror: image create should lookup local parent snapshot id

A recent code change associated with a librbd cleanup incorrectly started
using the remote parent image's snapshot id.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 02afa2a5b41074c651e62a5475ed4828df982ed4)

7 years agorbd-mirror: do not propagate image map instance updates when shutting down
Jason Dillaman [Mon, 14 May 2018 14:34:28 +0000 (10:34 -0400)]
rbd-mirror: do not propagate image map instance updates when shutting down

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4525b7a597ccfa6e966243e24bd9e9662c994a41)

7 years agorbd-mirror: propagate image delete if leader was offline
Jason Dillaman [Wed, 9 May 2018 14:33:03 +0000 (10:33 -0400)]
rbd-mirror: propagate image delete if leader was offline

In an active/active scenario, if the leader was offline while mirroring for
a remote image was disabled, the assigned replayer instance may not detect
the image removal.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b3acc569837985590fad2705ae2dcd7f148667a5)

7 years agorbd-mirror: avoid sending duplicate re-acquire messages upon leader startup
Jason Dillaman [Wed, 9 May 2018 14:25:22 +0000 (10:25 -0400)]
rbd-mirror: avoid sending duplicate re-acquire messages upon leader startup

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit a9d335d8399984b338d7cfe2b7d49e1f67940ebf)

7 years agorbd-mirror: reduce unnecessary logging for periodic start image replayer
Jason Dillaman [Wed, 9 May 2018 14:00:12 +0000 (10:00 -0400)]
rbd-mirror: reduce unnecessary logging for periodic start image replayer

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit d7cb5db188faf133904ec4532620bbd210cb60e5)

7 years agorbd-mirror: cancel image replayer status timer task at shut down
Jason Dillaman [Tue, 8 May 2018 21:09:58 +0000 (17:09 -0400)]
rbd-mirror: cancel image replayer status timer task at shut down

Also avoid attempting to send status using an invalid librados::IoCtx
handle due to a deleted pool.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e2a00887c1a2c08cab8566d930dede1dac186b9b)

7 years agorbd-mirror: policy map shouldn't default to first instance if dead
Jason Dillaman [Tue, 8 May 2018 20:25:42 +0000 (16:25 -0400)]
rbd-mirror: policy map shouldn't default to first instance if dead

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 524f08cef697c94b331d52b2077c09a0b3ff9d2e)

7 years agorbd-mirror: prevent blacklisting of local instance after failover/back
Jason Dillaman [Mon, 7 May 2018 21:43:13 +0000 (14:43 -0700)]
rbd-mirror: prevent blacklisting of local instance after failover/back

If the leader role is manually released, upon failback the instance
will have removed its local instance object, preventing RPC
messaging.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ce974305893c4262b62547ce184d514578358218)

7 years agorbd-mirror: instantly remove instances without associated images
Jason Dillaman [Fri, 4 May 2018 17:49:10 +0000 (13:49 -0400)]
rbd-mirror: instantly remove instances without associated images

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit bce5328a328f3f9b98674d9e4611a2a40bdf3ddb)

7 years agorbd-mirror: instance replayer now respects manual stop command
Jason Dillaman [Thu, 3 May 2018 16:03:01 +0000 (12:03 -0400)]
rbd-mirror: instance replayer now respects manual stop command

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 06e1244ee53640edbbab0168d3050152d048d681)

7 years agorbd-mirror: support optionally enabling active/active mirroring
Jason Dillaman [Thu, 3 May 2018 13:56:14 +0000 (09:56 -0400)]
rbd-mirror: support optionally enabling active/active mirroring

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 53b87b9d22b268e57c293e977aa8220bc2b1fddf)

7 years agoMerge pull request #22004 from tchaikov/mimic-22420
Sage Weil [Fri, 18 May 2018 14:30:52 +0000 (09:30 -0500)]
Merge pull request #22004 from tchaikov/mimic-22420

mon,osd: dump "compression_algorithms" in "mon metadata"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #22005 from batrick/i23768-mimic
Sage Weil [Fri, 18 May 2018 14:30:18 +0000 (09:30 -0500)]
Merge pull request #22005 from batrick/i23768-mimic

mimic: MDSMonitor: clean up use of pending fsmap in uncommitted ops

7 years agoMerge pull request #22013 from wido/mimic-telegraf
Sage Weil [Fri, 18 May 2018 14:29:57 +0000 (09:29 -0500)]
Merge pull request #22013 from wido/mimic-telegraf

mimic: mgr/telegraf: Telegraf module for Ceph Mgr

7 years agoMerge pull request #22041 from dzafman/wip-24045-mimic
Sage Weil [Fri, 18 May 2018 14:29:41 +0000 (09:29 -0500)]
Merge pull request #22041 from dzafman/wip-24045-mimic

mimic: osd: Don't evict even when preemption has restarted with smaller chunk

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #22079 from LenzGr/mgr-dashboard-documentation-mimic
Alfredo Deza [Fri, 18 May 2018 14:12:42 +0000 (10:12 -0400)]
Merge pull request #22079 from LenzGr/mgr-dashboard-documentation-mimic

mimic: doc: Updated dashboard documentation (features, SSL config)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc: Updated dashboard documentation (features, SSL config) 22079/head
Lenz Grimmer [Thu, 17 May 2018 15:34:36 +0000 (17:34 +0200)]
doc: Updated dashboard documentation (features, SSL config)

Updated Ceph manager dashboard documentation: added SSL to the
feature overview, added new section about configuring SSL certificates.
Rearranged installation instructions for setting host name and port.

Signed-off-by: Lenz Grimmer <lgrimmer@suse.com>
(cherry picked from commit 32e0660556ee0566b340b29cb9dbd2fdb8c17bfd)

7 years agoMerge pull request #22052 from tspmelo/wip-momentjs
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>
7 years agoMerge pull request #22070 from yuriw/wip-yuriw-mimic-backport-21932-mimic
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>
7 years agotests/qa: Adding $ distro mix - rgw 22070/head
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>
7 years agoMerge pull request #21979 from votdev/bug_24097_mimic
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>
7 years agoMerge pull request #22032 from votdev/fix_deletion_dialog_mimic
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>
7 years agoMerge pull request #22029 from votdev/fix_deletion_mimic
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>
7 years agoMerge pull request #22048 from tchaikov/mimic-23653
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>
7 years agomgr/dashboard: Fix moment.js deprecation warning 22052/head
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)

7 years agocmake: do not check for aligned_alloc() anymore 22048/head
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)

7 years agoMerge pull request #22038 from dillaman/wip-22787-mimic
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>
7 years agoMerge pull request #22039 from dillaman/wip-24141-mimic
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>
7 years agoosd: Clear part of cleaned_meta_map in case of a restarted smaller chunk 22041/head
David Zafman [Wed, 16 May 2018 00:32:50 +0000 (17:32 -0700)]
osd: Clear part of cleaned_meta_map in case of a restarted smaller chunk

This can not happen at the primary because scrub_compare_maps() is only
called once per chunk start.

Preemption causes a smaller chunk from start to be processed again at
replicas.  We clear any of the previous chunk's information.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9e0ac797c602a088447679b04e14ec0cfaf9dd7b)

7 years agoosd: Don't evict even when preemption has restarted with smaller chunk
David Zafman [Thu, 10 May 2018 00:32:39 +0000 (17:32 -0700)]
osd: Don't evict even when preemption has restarted with smaller chunk

Fixes: https://tracker.ceph.com/issues/24045
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 818b59fa95ee60e86991276f18c4dee405dc79b1)

7 years agorbd-mirror: make 'flush' asok command asynchronous 22039/head
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)

7 years agorbd-mirror: don't reregister asok hook in process entry thread
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)

7 years agorbd: deep copy option to copy clone parent data 22038/head
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)

7 years agolibrbd: deep copy optionally support flattening cloned image
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)

7 years agolibrbd/deep_copy: adjust in-memory overlap if set_size updated it on disk
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)

7 years agolibrbd: hide parent object when deep copying empty child
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)

7 years agolibrbd: fix deep copy clone to destination with larger object size
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

7 years agotest/librbd: add deep copy clone tests
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)

7 years agoMerge pull request #21836 from tchaikov/mimic-23962
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>
7 years agoMerge pull request #21862 from cbodley/wip-gcc-8-mimic
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

7 years agoMerge pull request #21958 from tchaikov/mimic-24000
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>
7 years agoMerge pull request #21959 from tchaikov/mimic-23899
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>
7 years agoMerge pull request #21974 from tchaikov/mimic-22302
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>
7 years agomgr/dashboard: Handle errors during deletion 22029/head
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)

7 years agomgr/dashboard: Deletion dialog falsely executes deletion when pressing 'Cancel' 22032/head
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)

7 years agoMerge pull request #21977 from votdev/info_no_rgw_mimic
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>
7 years agomgr/telegraf: Telegraf module for Ceph Mgr 22013/head
Wido den Hollander [Mon, 26 Mar 2018 11:47:45 +0000 (13:47 +0200)]
mgr/telegraf: Telegraf module for Ceph Mgr

Telegraf is a agent for collecting and reporting metrics.

It has multiple inputs and can send data to various outputs like
for example InfluxDB or ElasticSearch.

This module works by using the socket_listener of Telegraf and can
send data over UDP, TCP and a local Unix Socket.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit d15d510babe06a54a17a6949ed7c22c495b08b97)

7 years agoMerge PR #21988 into mimic
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>
7 years agoMDSMonitor: clean up use of pending fsmap in uncommitted ops 22005/head
Patrick Donnelly [Mon, 7 May 2018 02:06:47 +0000 (19:06 -0700)]
MDSMonitor: clean up use of pending fsmap in uncommitted ops

Gist of this commit is to eliminate use of PaxosFSMap::get_working_fsmap which
allowed looking at the pending FSMap depending if it's the leader. Instead,
pass the FSMap being worked on to helper functions.

Also, ensure that we are only looking at the committed (i.e. current) FSMap
in the preprocess_* service methods.

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

7 years agoMDSMonitor: refactor last_beacons to use mono_clock
Patrick Donnelly [Sun, 6 May 2018 03:30:19 +0000 (20:30 -0700)]
MDSMonitor: refactor last_beacons to use mono_clock

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 1933bdf37098130342d0debacf4daa0a41011351)

7 years agomds: refactor MDSMap init
Patrick Donnelly [Sun, 6 May 2018 02:59:22 +0000 (19:59 -0700)]
mds: refactor MDSMap init

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 7be74fd004686dc12c3c6b8d2be5f83cb2f3dea8)

7 years agomds: refactor FSMap init
Patrick Donnelly [Sun, 6 May 2018 02:54:27 +0000 (19:54 -0700)]
mds: refactor FSMap init

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 344be27d696f8f7f9522f75c8aae55a2b62cdd7c)

7 years agomds: refactor Filesystem init
Patrick Donnelly [Sun, 6 May 2018 02:53:09 +0000 (19:53 -0700)]
mds: refactor Filesystem init

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 91c01dc958c8bae29ee31a38e63187a341376ecc)

7 years agomds: move compat set methods to MDSMap
Patrick Donnelly [Sun, 6 May 2018 02:44:56 +0000 (19:44 -0700)]
mds: move compat set methods to MDSMap

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit db3a24c94924dbe12796307704d3b12278c8c8a3)

7 years agomon,osd: dump "compression_algorithms" in "mon metadata" 22004/head
Kefu Chai [Fri, 4 May 2018 03:52:06 +0000 (11:52 +0800)]
mon,osd: dump "compression_algorithms" in "mon metadata"

Fixes: http://tracker.ceph.com/issues/22420
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 1684ac34331f48e59c0485c3e18b1fe55b66c690)

7 years agocompressor: use initializer_list for compression_algorithms
Casey Bodley [Thu, 3 May 2018 15:19:24 +0000 (11:19 -0400)]
compressor: use initializer_list for compression_algorithms

use a compile-type array instead of heap-allocated tree to associate
compression types with their names

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

7 years agoMerge pull request #21978 from votdev/improve_error_panel_mimic
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>
7 years agomds: handle imported session race 21988/head
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)

7 years agomds: check for session import race
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)

7 years agoMerge pull request #21970 from wido/mgr-brag
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>
7 years agoMerge pull request #21956 from tchaikov/mimic-pr-21942
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

7 years agomgr/dashboard: Navbar dropdown button does not respond for mobile-like browsers 21979/head
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)

7 years agomgr/dashboard: Improve error panel 21978/head
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)

7 years agomgr/dashboard: Display useful info if RGW is not configured 21977/head
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)

7 years agomgr/dashboard: Add ModuleStatusGuardService route guard
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)

7 years agomgr/dashboard: Add info panel component
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)

7 years agoMerge pull request #21976 from ukernel/mimic-revert-23837
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…

7 years agoRevert "ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert... 21976/head
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>
7 years agoselinux: Allow ceph to block suspend 21974/head
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)

7 years agoselinux: Allow ceph to execute ldconfig
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)

7 years agomgr/telemetry: Add Ceph Telemetry module to send reports back to project 21970/head
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>
7 years agobrag: Remove ceph-brag
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>
7 years agoosd: clean up smart probe code a bit 21959/head
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)

7 years agoosd: fix osd smart data collection segment fault issue.
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)

7 years agomon: pool-ops against non-existent pools should return error 21958/head
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)

7 years agoosdc: self-managed snapshot helper should catch decode exception
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)

7 years agoqa/workunits/ceph-disk: --no-mon-config 21956/head
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)

7 years agoMerge PR #21954 into mimic
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

7 years agoceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail 21954/head
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)

7 years agoMerge PR #21953 into mimic
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

7 years agomds: properly reconnect client caps after loading inodes 21953/head
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)

7 years agoMerge PR #21952 into mimic
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

7 years agomds: tighten conditions of calling rejoin_gather_finish() 21952/head
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)

7 years agomds: avoid calling rejoin_gather_finish() two times successively
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)

7 years agoMerge PR #21951 into mimic
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

7 years agomds: set could_consume to false when no purge queue item actually executed 21951/head
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)