]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoradosgw-admin: add pretty 'bucket sync status' command 21908/head
Casey Bodley [Tue, 1 May 2018 14:42:11 +0000 (10:42 -0400)]
radosgw-admin: add pretty 'bucket sync status' command

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

Conflicts:
src/rgw/rgw_admin.cc (no readonly_ops_list, no std::string_view)

7 years agorgw: expose struct bucket_index_marker_info in header
Casey Bodley [Tue, 1 May 2018 14:40:20 +0000 (10:40 -0400)]
rgw: expose struct bucket_index_marker_info in header

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

7 years agorgw: rgw_bucket_sync_status takes bucket info
Casey Bodley [Mon, 30 Apr 2018 15:42:46 +0000 (11:42 -0400)]
rgw: rgw_bucket_sync_status takes bucket info

rgw_bucket_sync_status() no longer reads the bucket instance info, and
instead requires the caller to pass it in

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

7 years agoradosgw-admin: rename 'bucket sync status' to 'bucket sync markers'
Casey Bodley [Mon, 30 Apr 2018 14:52:37 +0000 (10:52 -0400)]
radosgw-admin: rename 'bucket sync status' to 'bucket sync markers'

renames the command to 'bucket sync markers' because it only returns the
local sync status markers for use in multisite tests

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

Conflicts:
src/rgw/rgw_admin.cc (no readonly_ops_list)

7 years agorgw: translate the state in rgw_data_sync_marker
lvshanchun [Wed, 7 Feb 2018 05:40:00 +0000 (13:40 +0800)]
rgw: translate the state in rgw_data_sync_marker

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit 7ddca6e50d85380505134481d37734b4f1433f1a)

7 years agodoc: update radosgw-admin.rst and help.t about data sync status
lvshanchun [Mon, 5 Feb 2018 13:03:18 +0000 (21:03 +0800)]
doc: update radosgw-admin.rst and help.t about data sync status

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit 33a0ec7164eff9fb66f05d984eb92b0de4ced9b1)

7 years agorgw: add --shard-id for data sync status
lvshanchun [Mon, 5 Feb 2018 12:53:39 +0000 (20:53 +0800)]
rgw: add --shard-id for data sync status

when specified --shard-id with data sync status, it'll
display the realated pending and recovering bucket shards, as well as sync
marker, besides this, we can specified --max-entries to limit the number
of datalog entries(for pending buckets) or omapkey entries(for recovering
buckets) be consumed.

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit 1dc7f5ea207dc17c743bfa1e06db446e16d31aa6)

7 years agorgw: read behind bucket shards of a specified data log shard
lvshanchun [Mon, 5 Feb 2018 12:43:39 +0000 (20:43 +0800)]
rgw: read behind bucket shards of a specified data log shard

add read_shard_status to read pending bucket shards,
recovering bucket shards and sync marker

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit 9c5ff46ad9c849eb0c99a4d78be3f9dd2299779c)

Conflicts:
rgw_data_sync.cc (make_move_iterator fails to build with gcc<5)

7 years agorgw: display data sync recovering shards in radosgw-admin sync status
lvshanchun [Mon, 8 Jan 2018 03:39:20 +0000 (03:39 +0000)]
rgw: display data sync recovering shards in radosgw-admin sync status

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit 8c3ea263b910db99dfe7e7aa5f17193941c70d1d)

7 years agorgw: add RGWReadDataSyncRecoveringShardsCR to read recovering shards
lvshanchun [Thu, 28 Dec 2017 06:39:39 +0000 (14:39 +0800)]
rgw: add RGWReadDataSyncRecoveringShardsCR to read recovering shards

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit f4de5b58e27f320e8eed6a72684ad7621a7c1110)

7 years agorgw: display errors of object sync failed in sync error list
lvshanchun [Mon, 18 Dec 2017 08:37:04 +0000 (16:37 +0800)]
rgw: display errors of object sync failed in sync error list

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit 39fd90c8ad2ce5af8d074a7f52d12dea3b06c730)

7 years agorgw: add lagging shard ids in rgw sync status
lvshanchun [Mon, 18 Dec 2017 08:36:19 +0000 (16:36 +0800)]
rgw: add lagging shard ids in rgw sync status

Signed-off-by: lvshanchun <lvshanchun@gmail.com>
(cherry picked from commit 99f3c3f8e97159cda401b280ea25f9822b14b90d)

7 years agorgw: RGWRadosGetOmapKeysCR uses omap_get_keys2
Casey Bodley [Tue, 9 Jan 2018 20:18:55 +0000 (15:18 -0500)]
rgw: RGWRadosGetOmapKeysCR uses omap_get_keys2

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

Conflicts: (no sync tracing)
src/rgw/rgw_data_sync.cc
src/rgw/rgw_sync.cc

7 years agorgw: RGWRadosGetOmapKeysCR uses completion return code
Casey Bodley [Tue, 9 Jan 2018 20:02:19 +0000 (15:02 -0500)]
rgw: RGWRadosGetOmapKeysCR uses completion return code

when this operates on a nonexistent object, the osd will reject the
request with ENOENT before trying to process the subops. so Objecter
will get back a subop return code of 0, try to decode an empty
bufferlist into the result and map that subop return code to EIO

by using the AioCompletion's return code, we get the correct result of
ENOENT instead

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

7 years agoMerge pull request #21109 from pdvian/wip-23474-luminous
Yuri Weinstein [Wed, 9 May 2018 14:55:14 +0000 (07:55 -0700)]
Merge pull request #21109 from pdvian/wip-23474-luminous

luminous: client: add ceph_ll_sync_inode

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
7 years agoMerge pull request #21346 from pdvian/wip-23632-luminous
Yuri Weinstein [Wed, 9 May 2018 14:54:30 +0000 (07:54 -0700)]
Merge pull request #21346 from pdvian/wip-23632-luminous

luminous: mds: mds shutdown fixes and optimization

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21354 from pdvian/wip-23635-luminous
Yuri Weinstein [Wed, 9 May 2018 14:53:56 +0000 (07:53 -0700)]
Merge pull request #21354 from pdvian/wip-23635-luminous

luminous: client: fix request send_to_auth was never really used

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21638 from smithfarm/wip-23852-luminous
Yuri Weinstein [Tue, 8 May 2018 23:04:53 +0000 (16:04 -0700)]
Merge pull request #21638 from smithfarm/wip-23852-luminous

luminous: osd: do not crash on empty snapset

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21359 from xiexingguo/backport-pr-21315
Yuri Weinstein [Tue, 8 May 2018 23:04:09 +0000 (16:04 -0700)]
Merge pull request #21359 from xiexingguo/backport-pr-21315

luminous: crush/CrushWrapper: fix potential invalid use of iterator

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #21366 from pdvian/wip-23636-luminous
Yuri Weinstein [Tue, 8 May 2018 19:47:12 +0000 (12:47 -0700)]
Merge pull request #21366 from pdvian/wip-23636-luminous

luminous: mds: fix unhealth heartbeat during rejoin

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21372 from pdvian/wip-23637-luminous
Yuri Weinstein [Tue, 8 May 2018 19:46:47 +0000 (12:46 -0700)]
Merge pull request #21372 from pdvian/wip-23637-luminous

luminous: mds: mark damaged if sessions' preallocated inos don't match inotable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21441 from pdvian/wip-23702-luminous
Yuri Weinstein [Tue, 8 May 2018 19:46:24 +0000 (12:46 -0700)]
Merge pull request #21441 from pdvian/wip-23702-luminous

luminous: mds: properly dirty sessions opened by journal replay

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21447 from pdvian/wip-23703-luminous
Yuri Weinstein [Tue, 8 May 2018 19:45:58 +0000 (12:45 -0700)]
Merge pull request #21447 from pdvian/wip-23703-luminous

luminous: MDSMonitor: fix mds health printed in bad format

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21448 from pdvian/wip-23750-luminous
Yuri Weinstein [Tue, 8 May 2018 19:45:18 +0000 (12:45 -0700)]
Merge pull request #21448 from pdvian/wip-23750-luminous

luminous: mds: make rstat.rctime follow inodes' ctime

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21512 from pdvian/wip-23791-luminous
Yuri Weinstein [Tue, 8 May 2018 19:44:20 +0000 (12:44 -0700)]
Merge pull request #21512 from pdvian/wip-23791-luminous

luminous: MDSMonitor: initialize new Filesystem epoch from pending

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21542 from pdvian/wip-23802-luminous
Yuri Weinstein [Tue, 8 May 2018 19:43:54 +0000 (12:43 -0700)]
Merge pull request #21542 from pdvian/wip-23802-luminous

luminous:client: flush the mdlog in _fsync before waiting on unstable reqs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21596 from joscollin/wip-23771-luminous
Yuri Weinstein [Tue, 8 May 2018 19:43:26 +0000 (12:43 -0700)]
Merge pull request #21596 from joscollin/wip-23771-luminous

luminous: client: Fix the gid_count check

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21732 from batrick/i23792
Yuri Weinstein [Tue, 8 May 2018 19:42:51 +0000 (12:42 -0700)]
Merge pull request #21732 from batrick/i23792

luminous: MDSMonitor: cleanup and protect fsmap access

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21796 from dalgaaf/luminous-issue-23873
Yuri Weinstein [Tue, 8 May 2018 19:42:07 +0000 (12:42 -0700)]
Merge pull request #21796 from dalgaaf/luminous-issue-23873

luminous: client: use common interp of st_nlink for dirs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21840 from pdvian/wip-23930-luminous
Yuri Weinstein [Tue, 8 May 2018 19:41:28 +0000 (12:41 -0700)]
Merge pull request #21840 from pdvian/wip-23930-luminous

luminous: mds: properly trim log segments after scrub repairs something

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #21844 from pdvian/wip-23934-luminous
Yuri Weinstein [Tue, 8 May 2018 19:41:03 +0000 (12:41 -0700)]
Merge pull request #21844 from pdvian/wip-23934-luminous

luminous: mds: properly check auth subtree count in MDCache::shutdown_pass()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: properly check auth subtree count in MDCache::shutdown_pass() 21844/head
Yan, Zheng [Mon, 23 Apr 2018 10:36:37 +0000 (18:36 +0800)]
mds: properly check auth subtree count in MDCache::shutdown_pass()

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23813
(cherry picked from commit cb60472bd2803878c04dbb961fd7f7f54707f25b)

7 years agomds: properly trim log segments after scrub repairs something 21840/head
Yan, Zheng [Thu, 26 Apr 2018 07:50:39 +0000 (15:50 +0800)]
mds: properly trim log segments after scrub repairs something

Before calling MDLog::trim_all(), we need to make sure mdlog get flushed
Otherwise, there can be zero expiring log segments. This can cause
MDSGatherBuilder to malfunction. (MDSGatherBuilder::activate() does not
execute empty MDSGatherBuilder's finish context)

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
http://tracker.ceph.com/issues/23880
(cherry picked from commit 5be40f35c3365265b76a12a3bd0e17c3f8761bb9)

7 years agoMerge pull request #21740 from pdvian/wip-23881-luminous
Yuri Weinstein [Fri, 4 May 2018 17:17:05 +0000 (10:17 -0700)]
Merge pull request #21740 from pdvian/wip-23881-luminous

luminous: os/bluestore/bluefs_types: make block_mask 64-bit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21752 from pdvian/wip-23904-luminous
Yuri Weinstein [Fri, 4 May 2018 17:16:24 +0000 (10:16 -0700)]
Merge pull request #21752 from pdvian/wip-23904-luminous

luminous: osdc/Objecter: prevent double-invocation of linger op callback

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21778 from pdvian/wip-23924-luminous
Yuri Weinstein [Fri, 4 May 2018 17:15:41 +0000 (10:15 -0700)]
Merge pull request #21778 from pdvian/wip-23924-luminous

luminous: ceph_test_rados_api_aio: fix race with full pool and osdmap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21737 from pdvian/wip-23870-luminous
Yuri Weinstein [Fri, 4 May 2018 17:14:47 +0000 (10:14 -0700)]
Merge pull request #21737 from pdvian/wip-23870-luminous

luminous: osd: publish osdmap to OSDService before starting wq threads

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #21518 from smithfarm/wip-23784-luminous
Yuri Weinstein [Fri, 4 May 2018 17:12:32 +0000 (10:12 -0700)]
Merge pull request #21518 from smithfarm/wip-23784-luminous

luminous: osd: Warn about objects with too many omap entries

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #21655 from liewegas/wip-23786
Yuri Weinstein [Fri, 4 May 2018 17:11:10 +0000 (10:11 -0700)]
Merge pull request #21655 from liewegas/wip-23786

luminous: qa: disable -Werror when compiling env_librados_test

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21760 from badone/wip-summarise-osds-when-issuing-slow-request...
Yuri Weinstein [Fri, 4 May 2018 16:54:20 +0000 (09:54 -0700)]
Merge pull request #21760 from badone/wip-summarise-osds-when-issuing-slow-request-warning-luminous

luminous: mon/PGMap: Summarise OSDs in blocked/stuck requests

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agomon/PGMap: Summarise OSDs in blocked/stuck requests 21760/head
Brad Hubbard [Tue, 3 Apr 2018 07:49:08 +0000 (17:49 +1000)]
mon/PGMap: Summarise OSDs in blocked/stuck requests

This fix is luminous specific since this code was changed in Mimic to
use the new SLOW_OPS errors.

Fixes: https://tracker.ceph.com/issues/23205
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoclient: use common interp of st_nlink for dirs 21796/head
Patrick Donnelly [Wed, 25 Apr 2018 20:07:34 +0000 (13:07 -0700)]
client: use common interp of st_nlink for dirs

Apparently some applications use this (like mail servers) and since it's
trivial to support, let's do it. Idea is that st_nlinks for a directory is
either 0 (it is unlinked) or 2 + the number of sub-directories (which have ..
parent links).

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

Conflicts:
        src/client/Inode.cc

7 years agoqa/workunits/rados/test_large_omap_detection: Scrub pgs instead of OSDs 21518/head
Brad Hubbard [Fri, 13 Apr 2018 01:10:22 +0000 (11:10 +1000)]
qa/workunits/rados/test_large_omap_detection: Scrub pgs instead of OSDs

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit aba1e74e03c753366009996dedcb59ef83e155de)

7 years agoosd: Add a flag to ScrubMap to signal check needed
Brad Hubbard [Fri, 13 Oct 2017 05:46:47 +0000 (15:46 +1000)]
osd: Add a flag to ScrubMap to signal check needed

If we know none of the scrub maps have errors early in
be_large_omap_check() we can return without doing a lot of unnecessary
work.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 2094fda7655ddd82b56850b3ded961a8c5c66966)

7 years agoosd: Warn about objects with too many omap entries
Brad Hubbard [Tue, 27 Jun 2017 01:40:47 +0000 (11:40 +1000)]
osd: Warn about objects with too many omap entries

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 71bf04775bef90c9291bd825da626bc9de6f9ec1)

Conflicts:
src/osd/osd_types.h (trivial resolution)

7 years agoosd: Move creation of 'master_set' to scrub_compare_maps
Brad Hubbard [Mon, 9 Oct 2017 07:24:17 +0000 (17:24 +1000)]
osd: Move creation of 'master_set' to scrub_compare_maps

Moving it to scrub_compare_maps allows us to pass it to multiple
subsequently called functions.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 63ef97b3db81c0c725119943c8594a4a0d12154e)

7 years agoMerge pull request #21717 from croit/luminous-23915
Yuri Weinstein [Thu, 3 May 2018 13:50:51 +0000 (06:50 -0700)]
Merge pull request #21717 from croit/luminous-23915

luminous: mon: handle bad snapshot removal reqs gracefully

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #21568 from cbodley/wip-22937
Yuri Weinstein [Thu, 3 May 2018 13:49:48 +0000 (06:49 -0700)]
Merge pull request #21568 from cbodley/wip-22937

luminous: rgw: beast frontend can listen on multiple endpoints

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
7 years agoMerge pull request #21083 from pdvian/wip-23227-luminous
Yuri Weinstein [Thu, 3 May 2018 13:43:14 +0000 (06:43 -0700)]
Merge pull request #21083 from pdvian/wip-23227-luminous

luminous: common: fix BoundedKeyCounter const_pointer_iterator

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoceph_test_rados_api_aio: fix race with full pool and osdmap 21778/head
Sage Weil [Fri, 27 Apr 2018 22:32:38 +0000 (17:32 -0500)]
ceph_test_rados_api_aio: fix race with full pool and osdmap

We send ops until we get a EDQUOT, and then assert our next op to
a different object also gets EDQUOT.  However, if the second osd
doesn't have as new a map it may succeed.  Make sure the client has
the latest (mon) map, and thus the one marking the pool full, before
we send the second op.  That ensures the second OSD also has that
newer map and also returns EDQUOT.

Fixes: http://tracker.ceph.com/issues/23917
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 5e067b9dcf9bcccd9a1c0153d94818dccf6a0f71)

7 years agocmake: 'make check' builds radosgw and its cls dependencies 21568/head
Casey Bodley [Tue, 13 Feb 2018 15:32:11 +0000 (10:32 -0500)]
cmake: 'make check' builds radosgw and its cls dependencies

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

7 years agorgw: beast frontend can listen on multiple endpoints
Casey Bodley [Tue, 23 Jan 2018 21:03:13 +0000 (16:03 -0500)]
rgw: beast frontend can listen on multiple endpoints

rgw_frontends options port= and endpoint= can be given multiple times,
and the beast frontend will listen on each endpoint

Fixes: http://tracker.ceph.com/issues/22779
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 1bff073b0e3e19e341fc0a08918abb510f0711b4)

Conflicts: rgw_asio_frontend.cc (boost::asio::string_view not available,
                                 replaced with BOOST_ASIO_STRING_VIEW_PARAM
                                 which falls back to 'const std::string&')

7 years agorgw: civetweb accepts multiple port= entries
Casey Bodley [Tue, 23 Jan 2018 18:37:05 +0000 (13:37 -0500)]
rgw: civetweb accepts multiple port= entries

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

7 years agoosdc/Objecter: prevent double-invocation of linger op callback 21752/head
Jason Dillaman [Wed, 25 Apr 2018 17:23:00 +0000 (13:23 -0400)]
osdc/Objecter: prevent double-invocation of linger op callback

Fixes: http://tracker.ceph.com/issues/23872
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1bc6f31f8f5ce33176b8a346492b087728947a71)

7 years agoMDSMonitor: cleanup and protect fsmap access 21732/head
Patrick Donnelly [Tue, 17 Apr 2018 03:46:39 +0000 (20:46 -0700)]
MDSMonitor: cleanup and protect fsmap access

This commit is designed to permanently protect the current epoch FSMap from
accidental changes. Modifications to the pending_fsmap are protected by
checking if the monitor is the leader. Additionally, code must explicitly
request a writeable reference.

Fixes http://tracker.ceph.com/issues/23762

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

Conflicts:
src/mon/MDSMonitor.cc
src/mon/MDSMonitor.h

7 years agoMerge pull request #21746 from alfredodeza/backport-rm23874
Andrew Schoen [Mon, 30 Apr 2018 19:52:50 +0000 (19:52 +0000)]
Merge pull request #21746 from alfredodeza/backport-rm23874

luminous  ceph-volume failed ceph-osd --mkfs command doesn't halt the OSD creation process

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume tests mkfs bluestore fails on non-zero exit status 21746/head
Alfredo Deza [Thu, 26 Apr 2018 20:35:45 +0000 (16:35 -0400)]
ceph-volume tests mkfs bluestore fails on non-zero exit status

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 978552a51f000952e0c820422369522063fd581a)

7 years agoceph-volume tests allow setting return values on stubbed process.call
Alfredo Deza [Thu, 26 Apr 2018 20:25:46 +0000 (16:25 -0400)]
ceph-volume tests allow setting return values on stubbed process.call

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b57e90105721d2817908b60ec39c2b4cbb1ca8f3)

7 years agoceph-volume util.prepare raise on non-zero exit statuso
Alfredo Deza [Thu, 26 Apr 2018 20:26:30 +0000 (16:26 -0400)]
ceph-volume util.prepare raise on non-zero exit statuso

Just for bluestore objectstore that uses process.call

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoos/bluestore/bluefs_types: make block_mask 64-bit 21740/head
Sage Weil [Tue, 24 Apr 2018 22:11:15 +0000 (17:11 -0500)]
os/bluestore/bluefs_types: make block_mask 64-bit

Since block_size is 32 bits, we return 0x00000000fffff000 (or similar).
This breaks things if you get a file (e.g., bluefs metadata log file)
over 4GB.

Fixes: https://tracker.ceph.com/issues/23840
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 55dd28a9dee08a028c6a8db82a8be77b3af88e44)

7 years agoosd: publish osdmap to OSDService before starting wq threads 21737/head
Sage Weil [Tue, 24 Apr 2018 18:02:14 +0000 (13:02 -0500)]
osd: publish osdmap to OSDService before starting wq threads

The worker threads may request the map from the service (notably,
advance_pg() does this).

Fixes: http://tracker.ceph.com/issues/21977
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ef3e5b1069c81f4e5b64e6119b467aeb7193e0b7)

Conflicts:
src/osd/OSD.cc: Resolved in OSD::init

7 years agomon: handle bad snapshot removal reqs gracefully 21717/head
Paul Emmerich [Sun, 11 Mar 2018 00:26:45 +0000 (01:26 +0100)]
mon: handle bad snapshot removal reqs gracefully

Snapshot deletion requests on snap ids larger than the snap_seq of
the pool will leave the pool in a state with snap_seq being less
than max(removed_snaps).

This is bad because further deletion requests to a pool in this state
might crash the mon in some cases: the deletion also inserts the new
snap_seq into the removed_snaps set -- which might already exist
in this case and trigger an assert.

Such bad requests will be generated by rbd clients without a fix for
issue #21567.

The change in OSDMonitor prevents pools from getting into this state
and may prevent old broken clients from incorrectly deleting snaps.
The change in osd_types avoids a crash if a pool is already in this
state.

Fixes #18746

Signed-off-by: Paul Emmerich <paul.emmerich@croit.io>
(cherry picked from commit f42a6ba4c37cb10869718ec296352ae55254b44a)

 Conflicts:
src/osd/osd_types.cc

7 years agorgw: frontend config uses multimap
Casey Bodley [Tue, 23 Jan 2018 18:21:11 +0000 (13:21 -0500)]
rgw: frontend config uses multimap

this allows us to configure multiple values for a given key without
resorting to string formatting to cram them into a single key/value pair

ex. port=80 port=443s instead of port=80+443s

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

Conflicts:
        rgw_frontend.cc: missing overload of get_str_vec()

7 years agoMerge pull request #21654 from alfredodeza/backport-rm23451
Andrew Schoen [Thu, 26 Apr 2018 15:13:29 +0000 (15:13 +0000)]
Merge pull request #21654 from alfredodeza/backport-rm23451

luminous ceph-volume include physical devices associated with an LV when listing

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoqa: disable -Werror when compiling env_librados_test 21655/head
Kefu Chai [Sun, 15 Apr 2018 14:38:08 +0000 (22:38 +0800)]
qa: disable -Werror when compiling env_librados_test

to silence warnings like

utilities/env_librados.cc:175:33: warning: unused parameter ‘offset’ [-Wunused-parameter]
   Status InvalidateCache(size_t offset, size_t length) {
                                 ^~~~~~

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

7 years agodoc/ceph-volume include information for devices in listing 21654/head
Alfredo Deza [Wed, 25 Apr 2018 14:48:45 +0000 (10:48 -0400)]
doc/ceph-volume include information for devices in listing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 009d49a4f5cf8c97a156b710342d4786b734747b)

7 years agoceph-volume tests verify associated pvs reporting on listing
Alfredo Deza [Wed, 25 Apr 2018 13:50:24 +0000 (09:50 -0400)]
ceph-volume tests verify associated pvs reporting on listing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f57cc594c282cf06a75b2278ca1c2b2d38f87aa3)

7 years agoceph-volume tests update to include devices on listing
Alfredo Deza [Tue, 24 Apr 2018 21:35:08 +0000 (17:35 -0400)]
ceph-volume tests update to include devices on listing

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 08dea1b7d1d92d893c2f0a5e6e750d838d9cdbe4)

7 years agoceph-volume lvm.listing include associated physical devices
Alfredo Deza [Tue, 24 Apr 2018 21:16:50 +0000 (17:16 -0400)]
ceph-volume lvm.listing include associated physical devices

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit be1e6c2ae9a6e6a77fcb5297badb1aa58548180c)

7 years agoceph-volume api.lvm include lv_uuid on pvs listings
Alfredo Deza [Tue, 24 Apr 2018 21:11:42 +0000 (17:11 -0400)]
ceph-volume api.lvm include lv_uuid on pvs listings

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 12a7a48c53b16f52a76ad74773aaa67f8bfc7c52)

7 years agoosd: don't crash on empty snapset 21638/head
Mykola Golub [Tue, 27 Mar 2018 07:39:47 +0000 (10:39 +0300)]
osd: don't crash on empty snapset

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 3996c0ae9c344de12eac2226e260c586ef48b09f)

Conflicts:
src/osd/PrimaryLogPG.cc - retain legacy snapshot handling in luminous -
                 i.e., do not backport 89c3439191325c2ee39ab4490985e77e5865e28a

7 years ago12.2.5 v12.2.5
Jenkins Build Slave User [Mon, 23 Apr 2018 16:18:33 +0000 (16:18 +0000)]
12.2.5

7 years agoclient: Fix the gid_count check 21596/head
Jos Collin [Wed, 11 Apr 2018 05:43:51 +0000 (11:13 +0530)]
client: Fix the gid_count check

Make the right check for gid_count.

Fixes: http://tracker.ceph.com/issues/23652
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 956d5501facc6a65903b0bad0d4b87c88139c787)

7 years agoMerge pull request #21565 from alfredodeza/backport-wip-ceph-volume
Andrew Schoen [Fri, 20 Apr 2018 18:23:04 +0000 (18:23 +0000)]
Merge pull request #21565 from alfredodeza/backport-wip-ceph-volume

luminous: ceph-volume: Nits noticed while studying code

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #21574 from alfredodeza/backport-cv-doc-updates
Andrew Schoen [Fri, 20 Apr 2018 18:07:51 +0000 (18:07 +0000)]
Merge pull request #21574 from alfredodeza/backport-cv-doc-updates

luminous: ceph-volume update man page for prepare/activate flags

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agodoc/man/ceph-volume update flags for activate 21574/head
Alfredo Deza [Fri, 20 Apr 2018 16:22:40 +0000 (12:22 -0400)]
doc/man/ceph-volume update flags for activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a454abc863817cd393e01e8c135174c1e1839be2)

7 years agodoc/man/ceph-volume update flags for prepare
Alfredo Deza [Fri, 20 Apr 2018 16:46:48 +0000 (12:46 -0400)]
doc/man/ceph-volume update flags for prepare

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit ae96b9f0a283a65ddf6887461f3515a5a756572b)

7 years agoMerge pull request #21492 from b-ranto/wip-mgr-rgw-luminous
Yuri Weinstein [Fri, 20 Apr 2018 17:01:22 +0000 (10:01 -0700)]
Merge pull request #21492 from b-ranto/wip-mgr-rgw-luminous

[luminous] Backport recent prometheus rgw changes

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
7 years agoRemove unused and wrongly-described _lsblk_type 21565/head
Dan Mick [Tue, 17 Apr 2018 02:13:18 +0000 (19:13 -0700)]
Remove unused and wrongly-described _lsblk_type

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit a97419f5d2b23131242a3602f2fa5f91ac7bc74d)

7 years agoFix mixing of format() and %-interpolation
Dan Mick [Tue, 17 Apr 2018 01:37:30 +0000 (18:37 -0700)]
Fix mixing of format() and %-interpolation

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 9e9a07c9ae41cc72e587dfd6551fd83389cc35e6)

7 years agoSpelling/typos
Dan Mick [Tue, 17 Apr 2018 01:35:33 +0000 (18:35 -0700)]
Spelling/typos

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 15ef400bb35e70cbb27144d595759d31a075aa37)

7 years agoMerge pull request #21538 from alfredodeza/backport-rm23678
Andrew Schoen [Fri, 20 Apr 2018 15:13:28 +0000 (15:13 +0000)]
Merge pull request #21538 from alfredodeza/backport-rm23678

luminous: ceph-volume: allow skipping systemd interactions on activate/create

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agomgr/dashboard: performance counter browsers 21492/head
Rubab-Syed [Tue, 9 Jan 2018 23:32:42 +0000 (04:32 +0500)]
mgr/dashboard: performance counter browsers

Signed-off-by: Rubab-Syed <rubab.syed21@gmail.com>
(cherry picked from commit 25ecfbd9cfb620463de1545ca0be50001c805460)
Conflicts: Removed dashboard changes

7 years agomgr: expose have_mon_connection to python modules
John Spray [Thu, 9 Nov 2017 11:27:24 +0000 (06:27 -0500)]
mgr: expose have_mon_connection to python modules

So that they can warn their end users if the data
we have is probably stale.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 5633328e28c0f7a5122229737c2ca132174a4349)

7 years agoclient: flush the mdlog in _fsync before waiting on unstable reqs 21542/head
Jeff Layton [Mon, 16 Apr 2018 17:48:10 +0000 (13:48 -0400)]
client: flush the mdlog in _fsync before waiting on unstable reqs

Recently, we changed ganesha to call to ceph_ll_sync_inode after
issuing a setattr call, to ensure that the attribute changes makes it
to the backing store before returning.

While testing with this, I noticed that we'd occasionally see setattr
calls stall for a long time. Analysis showed that the client's _fsync
request was stalled waiting on an mdlog flush.

This patch adds a call to flush_mdlog_sync prior to waiting on unsafe
requests in _fsync and seems to resolve the issue.

Tracker: http://tracker.ceph.com/issues/23714
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit d790108158d21616fdf6ea148bf7f9d1534326d0)

7 years agoceph-volume lvm.activate add --no-systemd flag to skip starting/enabling services 21538/head
Alfredo Deza [Wed, 18 Apr 2018 00:29:26 +0000 (20:29 -0400)]
ceph-volume lvm.activate add --no-systemd flag to skip starting/enabling services

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 75685e33bfc192f3a3b16ad57b8cd40313bd8bc6)

7 years agoceph-volume lvm.common add --no-systemd flag to skip enabling/starting services
Alfredo Deza [Wed, 18 Apr 2018 00:28:14 +0000 (20:28 -0400)]
ceph-volume lvm.common add --no-systemd flag to skip enabling/starting services

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 832da49ca8f1a57807f8a892cd734aa9b37216a6)

7 years agoceph-volume tests functional python tests for --no-systemd in activate
Alfredo Deza [Wed, 18 Apr 2018 12:20:57 +0000 (08:20 -0400)]
ceph-volume tests functional python tests for --no-systemd in activate

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 8848d037086f889a880f5ea1d3bb2254e16faf7b)

7 years agoMerge pull request #21533 from alfredodeza/backport-rm23067
Andrew Schoen [Thu, 19 Apr 2018 19:55:24 +0000 (19:55 +0000)]
Merge pull request #21533 from alfredodeza/backport-rm23067

luminous: ceph-volume Implement an 'activate all' to help with dense servers or migrating OSDs

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #21506 from liewegas/wip-rados-test-luminous
Sage Weil [Thu, 19 Apr 2018 18:40:50 +0000 (13:40 -0500)]
Merge pull request #21506 from liewegas/wip-rados-test-luminous

qa/workunits/rados/test-upgrade-to-mimic.sh: fix tee output

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agopybind/mgr/prometheus: fix creation of osd_metadata metric
Jan Fajerski [Thu, 19 Apr 2018 15:27:03 +0000 (17:27 +0200)]
pybind/mgr/prometheus: fix creation of osd_metadata metric

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 05a37d4a61c427ed532138ab0c13a9dd4d0f65fb)

7 years agomgr/prometheus: fix and complete PG state names
John Spray [Sun, 8 Apr 2018 14:21:27 +0000 (15:21 +0100)]
mgr/prometheus: fix and complete PG state names

...and reformat into a flat list in the same
order as found in osd_types.cc so that it's
easy to cross check.

Fixes: https://tracker.ceph.com/issues/23584
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 48acc6c7981ef6cbb962883cd36e2666a16d9c23)

7 years agomgr/prometheus: skip OSD output if missing from CRUSH devices
John Spray [Wed, 28 Feb 2018 14:03:42 +0000 (14:03 +0000)]
mgr/prometheus: skip OSD output if missing from CRUSH devices

Apparently this occurs as a transient state while adding
OSDs.

Fixes: https://tracker.ceph.com/issues/23166
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit e8e5bffbb0842cc9c41bb64e7e9b5c6e2898fc0c)

7 years agoceph-volume lvm.activate error if no bluestore OSDs are found 21533/head
Alfredo Deza [Tue, 10 Apr 2018 00:00:27 +0000 (20:00 -0400)]
ceph-volume lvm.activate error if no bluestore OSDs are found

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit b1920d6e731f194c4829810d849dba6b087ce3a4)

7 years agoceph-volume tests/functional add 'activate all' for xenial/filestore/dmcrypt
Alfredo Deza [Mon, 9 Apr 2018 17:56:45 +0000 (13:56 -0400)]
ceph-volume tests/functional add 'activate all' for xenial/filestore/dmcrypt

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit d6524297ac423ffc7ea82dc9598d27b4cc61a0ae)

7 years agoceph-volume tests/functional add 'activate all' for xenial/bluestore/dmcrypt
Alfredo Deza [Mon, 9 Apr 2018 17:56:31 +0000 (13:56 -0400)]
ceph-volume tests/functional add 'activate all' for xenial/bluestore/dmcrypt

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 452081e57e5de9bb3a1391f22ffcac1bb712f2e9)

7 years agoceph-volume tests/functional add 'activate all' for centos7/filestore/dmcrypt
Alfredo Deza [Mon, 9 Apr 2018 17:56:12 +0000 (13:56 -0400)]
ceph-volume tests/functional add 'activate all' for centos7/filestore/dmcrypt

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 5513f4de4ee0b4802bc1c0d1af754dd2d80486ed)

7 years agoceph-volume tests/functional add 'activate all' for centos7/bluestore/dmcrypt
Alfredo Deza [Mon, 9 Apr 2018 17:55:59 +0000 (13:55 -0400)]
ceph-volume tests/functional add 'activate all' for centos7/bluestore/dmcrypt

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 16421c9058011e115cf043de4cf279cbbd0ac0ce)

7 years agoceph-volume tests/functional add 'activate all' in filestore playbook
Alfredo Deza [Mon, 9 Apr 2018 17:55:15 +0000 (13:55 -0400)]
ceph-volume tests/functional add 'activate all' in filestore playbook

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit ef09f3996b8a165112afc4e6912a119015c798be)

7 years agoceph-volume tests/functional add 'activate all' in bluestore playbook
Alfredo Deza [Mon, 9 Apr 2018 17:55:05 +0000 (13:55 -0400)]
ceph-volume tests/functional add 'activate all' in bluestore playbook

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 797518a54603ad8fc9b57a66eab7cf7e55ea0299)