]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agomgr/dashboard: Rename SSLCherryPyConfig 24734/head
Boris Ranto [Tue, 18 Sep 2018 07:33:22 +0000 (09:33 +0200)]
mgr/dashboard: Rename SSLCherryPyConfig

The class does not always set up SSL, dropping the SSL bit.

Fixes: http://tracker.ceph.com/issues/36069
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 035b3a8b33d888b1d26662075f78d5f0fb14ed17)

6 years agomgr/dashboard: Do not require cert for http
Boris Ranto [Fri, 14 Sep 2018 10:03:23 +0000 (12:03 +0200)]
mgr/dashboard: Do not require cert for http

The ceph dashboard currently requires a SSL certificate even if it is
not running in the SSL mode since it is always querying for the
certificate file/key pair.

This patch fixes the behaviour by querying for the certificate file/key
only if it is running in the SSL mode.

Fixes: http://tracker.ceph.com/issues/36069
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 20ed0de477966d4b64283ac82d3132b3688f9e2d)

6 years agomgr/dashboard: Add option to disable SSL
Wido den Hollander [Fri, 15 Jun 2018 14:39:09 +0000 (16:39 +0200)]
mgr/dashboard: Add option to disable SSL

Although is preferred and should be enabled by default users might
want to disable SSL as the dashboard might be running behind a proxy
which terminates the SSL.

Fixes: https://tracker.ceph.com/issues/24674
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 21fbfc9c3a00edfe6063c33c738d49fdba21ea73)

Conflicts:
src/pybind/mgr/dashboard/controllers/docs.py: did not exist in
mimic

6 years agoMerge pull request #24319 from smithfarm/wip-35979-mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:11:38 +0000 (16:11 -0400)]
Merge pull request #24319 from smithfarm/wip-35979-mimic

mimic: multisite: data sync error repo processing does not back off on empty

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #23197 from pdvian/wip-25024-mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:09:22 +0000 (16:09 -0400)]
Merge pull request #23197 from pdvian/wip-25024-mimic

mimic: qa/suites/rgw/verify/tasks/cls_rgw: test cls_rgw

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agoMerge pull request #24071 from pdvian/wip-35708-mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:06:48 +0000 (16:06 -0400)]
Merge pull request #24071 from pdvian/wip-35708-mimic

mimic: rgw: raise default rgw_curl_low_speed_time to 300 seconds

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24101 from pdvian/wip-35710-mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:05:48 +0000 (16:05 -0400)]
Merge pull request #24101 from pdvian/wip-35710-mimic

mimic: rgw: fix deadlock on RGWIndexCompletionManager::stop

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24189 from joke-lee/mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:05:17 +0000 (16:05 -0400)]
Merge pull request #24189 from joke-lee/mimic

mimic:rgw: return x-amz-version-id: null when delete obj in versioning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24235 from pdvian/wip-35857-mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:04:52 +0000 (16:04 -0400)]
Merge pull request #24235 from pdvian/wip-35857-mimic

mimic: multisite: segfault on shutdown/realm reload

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24363 from pdvian/wip-36125-mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:04:10 +0000 (16:04 -0400)]
Merge pull request #24363 from pdvian/wip-36125-mimic

mimic:rgw: fix chunked-encoding for chunks >1MiB

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24417 from pdvian/wip-36138-mimic
Yuri Weinstein [Wed, 17 Oct 2018 20:01:17 +0000 (16:01 -0400)]
Merge pull request #24417 from pdvian/wip-36138-mimic

mimic: rgw: async sync_object and remove_object does not access coroutine me…

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24571 from joke-lee/mimic-list-RGWPostObj-when-enable-versioning
Yuri Weinstein [Wed, 17 Oct 2018 20:00:41 +0000 (16:00 -0400)]
Merge pull request #24571 from joke-lee/mimic-list-RGWPostObj-when-enable-versioning

mimic:rgw: list bucket can not show the object uploaded by RGWPostObj when enable bucket versioning

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #23026 from smithfarm/wip-24889-mimic
Yuri Weinstein [Wed, 17 Oct 2018 19:58:16 +0000 (15:58 -0400)]
Merge pull request #23026 from smithfarm/wip-24889-mimic

mimic: osd: crash in OpTracker::unregister_inflight_op via OSD::get_health_metrics

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #24116 from dzafman/wip-35992
Yuri Weinstein [Wed, 17 Oct 2018 19:57:22 +0000 (15:57 -0400)]
Merge pull request #24116 from dzafman/wip-35992

mimic: tools: ceph-objectstore-tool: Allow target level as first positional …

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #24401 from dillaman/wip-36144-mimic
Yuri Weinstein [Wed, 17 Oct 2018 19:56:50 +0000 (15:56 -0400)]
Merge pull request #24401 from dillaman/wip-36144-mimic

mimic: librbd: blacklisted client might not notice it lost the lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #24573 from pdvian/wip-36292-mimic
Yuri Weinstein [Wed, 17 Oct 2018 19:56:08 +0000 (15:56 -0400)]
Merge pull request #24573 from pdvian/wip-36292-mimic

mimic: osd: Remove old bft= which has been superceded by backfill=

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
6 years agoMerge pull request #24388 from pdvian/wip-36129-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:52:18 +0000 (16:52 -0400)]
Merge pull request #24388 from pdvian/wip-36129-mimic

mimic: rgw: abort_bucket_multiparts() ignores individual NoSuchUpload errors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24400 from smithfarm/wip-36201-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:51:53 +0000 (16:51 -0400)]
Merge pull request #24400 from smithfarm/wip-36201-mimic

mimic: multisite: intermittent test_bucket_index_log_trim failures

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24413 from dillaman/wip-36225-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:51:11 +0000 (16:51 -0400)]
Merge pull request #24413 from dillaman/wip-36225-mimic

mimic: librbd: object map improperly flagged as invalidated

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #24414 from smithfarm/wip-36208-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:50:38 +0000 (16:50 -0400)]
Merge pull request #24414 from smithfarm/wip-36208-mimic

mimic: multisite: invalid read in RGWCloneMetaLogCoroutine

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24418 from pdvian/wip-36140-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:50:13 +0000 (16:50 -0400)]
Merge pull request #24418 from pdvian/wip-36140-mimic

mimic: rgw: raise debug level on redundant data sync error messages

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24436 from croit/mimic-36041
Yuri Weinstein [Mon, 15 Oct 2018 20:49:40 +0000 (16:49 -0400)]
Merge pull request #24436 from croit/mimic-36041

mimic: rgw/beast: drop privileges after binding ports

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24481 from pdvian/wip-36150-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:49:10 +0000 (16:49 -0400)]
Merge pull request #24481 from pdvian/wip-36150-mimic

mimic: crush/CrushWrapper: fix crush tree json dumper

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #24516 from pdvian/wip-36211-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:48:38 +0000 (16:48 -0400)]
Merge pull request #24516 from pdvian/wip-36211-mimic

mimic: rgw: RGWAsyncGetBucketInstanceInfo does not access coroutine memory

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24518 from pdvian/wip-36213-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:48:13 +0000 (16:48 -0400)]
Merge pull request #24518 from pdvian/wip-36213-mimic

mimic:rgw: fix leak of curl handle on shutdown

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24526 from theanalyst/wip-mimic-36381
Yuri Weinstein [Mon, 15 Oct 2018 20:47:55 +0000 (16:47 -0400)]
Merge pull request #24526 from theanalyst/wip-mimic-36381

mimic: rgw: resharding produces invalid values of bucket stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24536 from pdvian/wip-36216-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:47:13 +0000 (16:47 -0400)]
Merge pull request #24536 from pdvian/wip-36216-mimic

mimic: multisite: data full sync does not limit concurrent bucket sync

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #24537 from pdvian/wip-36228-mimic
Yuri Weinstein [Mon, 15 Oct 2018 20:46:36 +0000 (16:46 -0400)]
Merge pull request #24537 from pdvian/wip-36228-mimic

mimic: qa: add test that builds example librados programs

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agorgw: list bucket can not show the object uploaded by RGWPostObj 24571/head
yuliyang [Sun, 30 Sep 2018 09:26:58 +0000 (17:26 +0800)]
rgw: list bucket can not show the object uploaded by RGWPostObj
when enable bucket versioning

fix https://tracker.ceph.com/issues/36265

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit 38407f69da898eacf77027d04e2b9544f310ebff)

6 years agoosd: Remove old bft= which has been superceded by backfill= 24573/head
David Zafman [Mon, 24 Sep 2018 21:21:59 +0000 (14:21 -0700)]
osd: Remove old bft= which has been superceded by backfill=

Fixes: http://tracker.ceph.com/issues/36170
Caused by: 1b4f86cb0

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

6 years agoqa: add test that builds example librados programs 24537/head
Nathan Cutler [Thu, 19 Jul 2018 15:59:04 +0000 (17:59 +0200)]
qa: add test that builds example librados programs

Fixes: http://tracker.ceph.com/issues/15100
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c46c890d0241972cee10260f071f65b4beedf92c)

6 years agorgw: data sync checks whether the lease failed to renew 24536/head
Casey Bodley [Mon, 13 Aug 2018 19:47:29 +0000 (15:47 -0400)]
rgw: data sync checks whether the lease failed to renew

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

 Conflicts:
src/rgw/rgw_data_sync.cc : Resolved in full_sync

6 years agorgw: data sync holds lease over transition from full to incremental
Casey Bodley [Sat, 11 Aug 2018 15:39:35 +0000 (11:39 -0400)]
rgw: data sync holds lease over transition from full to incremental

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

6 years agorgw: enforce spawn_window for data full sync
Casey Bodley [Fri, 10 Aug 2018 20:34:42 +0000 (16:34 -0400)]
rgw: enforce spawn_window for data full sync

limit the number of concurrent bucket sync crs spawned by data full sync

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

6 years agorgw: copy actual stats from the source shards during reshard 24526/head
Abhishek Lekshmanan [Fri, 5 Oct 2018 09:19:18 +0000 (11:19 +0200)]
rgw: copy actual stats from the source shards during reshard

Currently we don't copy the actual_stats field during reshard, which makes
resharded buckets show a size_utilized as 0, which further has the problem that
a subsequent object removal would subtract the object size from the 0 size
utilized showing up large uint64_t values. Copy the size_actual from the source
object in both cls and in reshard_process. This will fix the new buckets,
existing buckets will still have to go through a bucket check --fix for their
stats to be corrected.

Fixes: http://tracker.ceph.com/issues/36290
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit beb90638ae3d5329653b61bae0d6714796c41d04)

6 years agorgw: fix leak of curl handle on shutdown 24518/head
Casey Bodley [Wed, 5 Sep 2018 20:56:41 +0000 (16:56 -0400)]
rgw: fix leak of curl handle on shutdown

addresses a valgrind leak reported from curl_multi_add_handle().
requests that are still linked to the curl_multi handle need to be
unlinked and finished with ECANCELED, rather than just finished

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

6 years agoMerge pull request #24176 from pdvian/wip-35836-mimic 24567/head
Neha Ojha [Wed, 10 Oct 2018 02:05:46 +0000 (19:05 -0700)]
Merge pull request #24176 from pdvian/wip-35836-mimic

mimic: mon: mgr options not parse propertly

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
6 years agoMerge pull request #24281 from pdvian/wip-35930-mimic
Neha Ojha [Wed, 10 Oct 2018 02:00:09 +0000 (19:00 -0700)]
Merge pull request #24281 from pdvian/wip-35930-mimic

mimic: mon/OSDMonitor: invalidate max_failed_since on cancel_report

Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>
6 years agorgw: RGWAsyncGetBucketInstanceInfo does not access coroutine memory 24516/head
Casey Bodley [Fri, 7 Sep 2018 20:13:27 +0000 (16:13 -0400)]
rgw: RGWAsyncGetBucketInstanceInfo does not access coroutine memory

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

6 years agocrush/CrushWrapper: fix crush tree json dumper 24481/head
songshuangyang [Fri, 14 Sep 2018 06:53:17 +0000 (14:53 +0800)]
crush/CrushWrapper: fix crush tree json dumper

    The output json string is invalid for 'osd crush tree --format=json'
    command. It contains a array of 'nodes' and a array of 'stray', but
    not in a json object, and the stray array was not implemented.
    Applications which depends on the output of the above MonCommand will
    occur json parse error.

Signed-off-by: Oshyn Song <dualyangsong@gmail.com>
(cherry picked from commit 35c0d1f45cd676f201d4031cb8f447f7ea6aee0e)

6 years agoMerge pull request #24113 from smithfarm/wip-35717-mimic
Yuri Weinstein [Sat, 6 Oct 2018 16:15:48 +0000 (09:15 -0700)]
Merge pull request #24113 from smithfarm/wip-35717-mimic

mimic: msg: challenging authorizer messages appear at debug_ms=0

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
6 years agoMerge pull request #24241 from smithfarm/wip-36121-mimic
Yuri Weinstein [Sat, 6 Oct 2018 16:14:49 +0000 (09:14 -0700)]
Merge pull request #24241 from smithfarm/wip-36121-mimic

mimic: kernel_untar_build.sh: bison: command not found

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #24298 from pdvian/wip-35959-mimic
Yuri Weinstein [Sat, 6 Oct 2018 16:14:22 +0000 (09:14 -0700)]
Merge pull request #24298 from pdvian/wip-35959-mimic

mimic: osd/ECBackend: don't get result code of subchunk-read overwritten

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #24309 from neha-ojha/wip-36239-mimic
Yuri Weinstein [Sat, 6 Oct 2018 16:13:49 +0000 (09:13 -0700)]
Merge pull request #24309 from neha-ojha/wip-36239-mimic

mimic: osd/PrimaryLogPG: fix potential pg-log overtrimming

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #24344 from pdvian/wip-35963-mimic
Yuri Weinstein [Sat, 6 Oct 2018 16:13:11 +0000 (09:13 -0700)]
Merge pull request #24344 from pdvian/wip-35963-mimic

mimic: osd/PG: avoid choose_acting picking want with > pool size items

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #24345 from pdvian/wip-35964-mimic
Yuri Weinstein [Sat, 6 Oct 2018 16:12:48 +0000 (09:12 -0700)]
Merge pull request #24345 from pdvian/wip-35964-mimic

mimic: RADOS: probably missing clone location for async_recovery_targets

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #24233 from liewegas/wip-35998-mimic
Yuri Weinstein [Fri, 5 Oct 2018 21:41:00 +0000 (14:41 -0700)]
Merge pull request #24233 from liewegas/wip-35998-mimic

mimic: mgr/DaemonServer: fix Session leak

Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agoMerge pull request #24339 from ifed01/wip-ifed-fix-repairer-mimic
Yuri Weinstein [Fri, 5 Oct 2018 21:19:25 +0000 (14:19 -0700)]
Merge pull request #24339 from ifed01/wip-ifed-fix-repairer-mimic

mimic: os/bluestore: fix bloom filter num entry miscalculation in repairer

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #24352 from ifed01/wip-ifed-bluestore-tool-fixes-mimic
Yuri Weinstein [Fri, 5 Oct 2018 21:18:49 +0000 (14:18 -0700)]
Merge pull request #24352 from ifed01/wip-ifed-bluestore-tool-fixes-mimic

mimic: ceph-bluestore-tool: fix set label functionality for specific keys

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #24386 from pdvian/wip-36127-mimic
Yuri Weinstein [Fri, 5 Oct 2018 21:18:12 +0000 (14:18 -0700)]
Merge pull request #24386 from pdvian/wip-36127-mimic

mimic: msg/async: clean up local buffers on dispatch

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
6 years agorgw/beast: drop privileges after binding ports 24436/head
Paul Emmerich [Tue, 25 Sep 2018 14:25:55 +0000 (14:25 +0000)]
rgw/beast: drop privileges after binding ports

Fixes: http://tracker.ceph.com/issues/36041
Signed-off-by: Paul Emmerich <paul.emmerich@croit.io>
(cherry picked from commit 6489566e867cee81a753b246913b61815819d9b3)

 Conflicts:
src/rgw/rgw_asio_frontend.cc

6 years agolibrbd: keep IO blocked until after snapshot object map created 24413/head
Jason Dillaman [Mon, 24 Sep 2018 19:07:15 +0000 (15:07 -0400)]
librbd: keep IO blocked until after snapshot object map created

The IO was being unblocked before object map was created, allowing
a potential copyup request to fail to update a still-to-be-created
object map.

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

Conflicts:
src/librbd/object_map/SnapshotCreateRequest.cc: trivial resolution
src/librbd/operation/SnapshotCreateRequest.cc: trivial resolution

6 years agolibrbd: do not invalidate object map if update races with copyup
Jason Dillaman [Mon, 24 Sep 2018 18:45:09 +0000 (14:45 -0400)]
librbd: do not invalidate object map if update races with copyup

The copyup state machine needs to iterate over all object maps to update
the existence for the object. If an snapshot is being removed concurrently,
it's possible to invalidate the object map for the image.

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

Conflicts:
src/librbd/ObjectMap.cc: trivial resolution
src/librbd/ObjectMap.h: trivial resolution
src/librbd/io/CopyupRequest.cc: trivial resolution
src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc: trivial resolution
src/test/librbd/test_mock_ObjectMap.cc: trivial resolution

6 years agolibrbd: do not invalidate object map when attempting to delete non-existent snapshot
Jason Dillaman [Fri, 14 Sep 2018 15:46:13 +0000 (11:46 -0400)]
librbd: do not invalidate object map when attempting to delete non-existent snapshot

If duplicate snapshot remove requests are received by the lock owner from a peer
client, the first request will remove the object map. If the second request
arrives while the first is in-progress, it will again attempt to remove the
object map but fail to load it since it's already been deleted. This incorrectly
results in the next object map being flagged as invalid.

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

Conflicts:
src/librbd/object_map/SnapshotRemoveRequest.cc: trivial resolution

6 years agolibrbd: use the correct error code when the exclusive lock isn't locked 24401/head
Jason Dillaman [Thu, 6 Sep 2018 21:08:12 +0000 (17:08 -0400)]
librbd: use the correct error code when the exclusive lock isn't locked

If the client is currently blacklisted, use -EBLACKLISTED, otherwise
use -EROFS.

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

Conflicts:
src/librbd/ExclusiveLock.cc: trivial resolution
src/librbd/Operations.cc: trivial resolution
src/librbd/deep_copy/ObjectCopyRequest.cc: trivial resolution
src/librbd/deep_copy/SetHeadRequest.cc: trivial resolution
src/librbd/deep_copy/SnapshotCopyRequest.cc: trivial resolution
src/librbd/deep_copy/SnapshotCreateRequest.cc: trivial resolution

6 years agolibrbd: helper to retrieve the correct error code for read-only op
Jason Dillaman [Thu, 6 Sep 2018 21:15:50 +0000 (17:15 -0400)]
librbd: helper to retrieve the correct error code for read-only op

When the exclusive lock is unlocked, the error code should be
-EBLACKLISTED when the client is blacklisted, otherwise -EROFS.

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

6 years agolibrbd: reacquire lock should properly handle failed watcher
Jason Dillaman [Thu, 6 Sep 2018 17:38:17 +0000 (13:38 -0400)]
librbd: reacquire lock should properly handle failed watcher

If the watch has been lost, assume the lock has been lost but attempt
to reacquire it if and when the watch is re-established.

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

Conflicts:
src/librbd/ManagedLock.cc: trivial resolution

6 years agolibrbd: assume lock is unlocked if blacklisted or object deleted
Jason Dillaman [Thu, 30 Aug 2018 19:12:27 +0000 (15:12 -0400)]
librbd: assume lock is unlocked if blacklisted or object deleted

This will ensure that it's possible to potentially re-acquire the
lock should the blacklist expire before the image is closed.

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

6 years agolibrbd: watcher should internally track blacklisted state
Jason Dillaman [Thu, 6 Sep 2018 13:44:59 +0000 (09:44 -0400)]
librbd: watcher should internally track blacklisted state

Since it will periodically attempt to re-acquire the watch,
it will know when the RADOS client has been blacklisted and
when the blacklist has been removed.

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

Conflicts:
src/librbd/Watcher.cc: trivial resolution

6 years agolibrbd: attempt to recover lost image watcher upon all failures
Jason Dillaman [Thu, 30 Aug 2018 20:51:10 +0000 (16:51 -0400)]
librbd: attempt to recover lost image watcher upon all failures

For example, if an image is blacklisted and the blacklist eventually
expires, the image should recover its watch.

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

Conflicts:
src/librbd/watcher/RewatchRequest.cc: trivial resolution
src/test/librbd/test_mock_Watcher.cc: trivial resolution

6 years agoMerge pull request #24420 from karunjosy/wip-36308-mimic
Nathan Cutler [Thu, 4 Oct 2018 09:39:52 +0000 (11:39 +0200)]
Merge pull request #24420 from karunjosy/wip-36308-mimic

mimic: doc: Typo error on cephfs/fuse/

Reviewed-by: Nathan Cutler <ncutler@suse.com>
6 years agodoc: Fix typo error on cephfs/fuse/ 24420/head
Karun Josy [Tue, 2 Oct 2018 11:53:25 +0000 (17:23 +0530)]
doc: Fix typo error on cephfs/fuse/

Fixes: http://tracker.ceph.com/issues/36180
Signed-off-by: Karun Josy <kjosy@redhat.com>
(cherry picked from commit d312cdbd36d9c0e76409feac1f3e289b247dc2dc)

6 years agorgw: raise debug level on redundant data sync error messages 24418/head
Casey Bodley [Fri, 7 Sep 2018 13:51:56 +0000 (09:51 -0400)]
rgw: raise debug level on redundant data sync error messages

each of these errors have already been logged at a lower level with a
more detailed error message. by logging them as ERRORs at level 0 here,
the messages could be easily confused as separate failures

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

Conflicts:
src/rgw/rgw_data_sync.cc : Resolved in operate

6 years agorgw: async sync_object and remove_object does not access coroutine memory 24417/head
Tianshan Qu [Mon, 10 Sep 2018 10:00:45 +0000 (18:00 +0800)]
rgw: async sync_object and remove_object does not access coroutine memory

Fixes: http://tracker.ceph.com/issues/35905
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit 2d38306e9333772a21ffdc9d92838e3b6b5c3148)

6 years agorgw: dont access rgw_http_req_data::client of canceled request 24414/head
Casey Bodley [Fri, 7 Sep 2018 21:01:25 +0000 (17:01 -0400)]
rgw: dont access rgw_http_req_data::client of canceled request

if a request has been canceled with RGWHTTPClient::cancel(), the client
may have been destroyed. check req_data->registered before reading
from req_data->client->receive_pause_skip

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

6 years agolibrbd: converted object map snapshot remove state machine to new style
Jason Dillaman [Fri, 14 Sep 2018 15:21:28 +0000 (11:21 -0400)]
librbd: converted object map snapshot remove state machine to new style

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

Conflicts:
src/librbd/object_map/SnapshotRemoveRequest.cc: trivial resolution

6 years agolibrbd: test_flags helper should require snap id parameter
Jason Dillaman [Fri, 14 Sep 2018 13:59:35 +0000 (09:59 -0400)]
librbd: test_flags helper should require snap id parameter

The HEAD and snapshots have potentially different flag states
since object maps get invalidated per revision.

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

Conflicts:
src/librbd/ObjectMap.cc: trivial resolution
src/test/librbd/test_Migration.cc: DNE

6 years agoMerge pull request #24002 from pdvian/wip-35705-mimic
Yuri Weinstein [Wed, 3 Oct 2018 15:21:28 +0000 (08:21 -0700)]
Merge pull request #24002 from pdvian/wip-35705-mimic

mimic:rbd: fix error import when the input is a pipe

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24122 from pdvian/wip-35712-mimic
Yuri Weinstein [Wed, 3 Oct 2018 15:21:04 +0000 (08:21 -0700)]
Merge pull request #24122 from pdvian/wip-35712-mimic

mimic: librbd: journaling unable request can not be sent to remote lock owner

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24137 from pdvian/wip-35714-mimic
Yuri Weinstein [Wed, 3 Oct 2018 15:20:30 +0000 (08:20 -0700)]
Merge pull request #24137 from pdvian/wip-35714-mimic

mimic: librbd: ensure exclusive lock acquired when removing sync point snaps…

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24240 from smithfarm/wip-35077-mimic
Yuri Weinstein [Wed, 3 Oct 2018 15:19:59 +0000 (08:19 -0700)]
Merge pull request #24240 from smithfarm/wip-35077-mimic

mimic: qa: install dependencies for rbd_workunit_kernel_untar_build

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
6 years agoMerge pull request #24244 from dillaman/wip-36117-mimic
Yuri Weinstein [Wed, 3 Oct 2018 15:19:22 +0000 (08:19 -0700)]
Merge pull request #24244 from dillaman/wip-36117-mimic

mimic: test/librbd: not valid to have different parents between image snapshots

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #24321 from smithfarm/wip-36120-mimic
Yuri Weinstein [Wed, 3 Oct 2018 15:17:43 +0000 (08:17 -0700)]
Merge pull request #24321 from smithfarm/wip-36120-mimic

mimic: [rbd-mirror] failed assertion when updating mirror status

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #24356 from dillaman/wip-35957-mimic
Yuri Weinstein [Wed, 3 Oct 2018 15:16:36 +0000 (08:16 -0700)]
Merge pull request #24356 from dillaman/wip-35957-mimic

mimic: librbd: fixed assert when flattening clone with zero overlap

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
6 years agoMerge pull request #24381 from alfredodeza/mimic-rm36247
Andrew Schoen [Wed, 3 Oct 2018 15:00:22 +0000 (10:00 -0500)]
Merge pull request #24381 from alfredodeza/mimic-rm36247

mimic ceph-volume: skip processing devices that don't exist when scanning system disks

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agorgw: remove BucketChangeObserver from data sync thread 24400/head
Casey Bodley [Thu, 20 Sep 2018 15:37:06 +0000 (11:37 -0400)]
rgw: remove BucketChangeObserver from data sync thread

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

Conflicts:
src/rgw/rgw_data_sync.h
- argument lists are different

6 years agorgw: add BucketChangeObserver to RGWDataChangesLog
Casey Bodley [Thu, 20 Sep 2018 15:34:42 +0000 (11:34 -0400)]
rgw: add BucketChangeObserver to RGWDataChangesLog

this means that BucketTrimManager will track active buckets based on
local changes, rather than changes in remote datalogs or error repos

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

6 years agorgw: abort_bucket_multiparts() ignores individual NoSuchUpload errors 24388/head
Casey Bodley [Fri, 14 Sep 2018 18:56:23 +0000 (14:56 -0400)]
rgw: abort_bucket_multiparts() ignores individual NoSuchUpload errors

if the bucket index lists multipart meta objects that don't actually
exist in rados, this error prevents the bucket from being deleted

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

6 years agomsg/async: clean up local buffers on dispatch 24386/head
Greg Farnum [Fri, 14 Sep 2018 17:58:49 +0000 (10:58 -0700)]
msg/async: clean up local buffers on dispatch

The AsyncConnection keeps local (member variable) bufferlists of incoming
messages before they're placed into the Message's front/data/middle buffers.
Previously these were reset only when a new Message is being received, which
means in steady state we store a full Message for every Connection even if
it's inactive!

Instead we obviously want to drop our local references to Message state
once it's been dispatched, so that it can go away.

Fixes: http://tracker.ceph.com/issues/35987
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 47ed036753223c44c7bf66c64d4a4adfe7267c0a)

6 years agoceph-volume util.disk when there are no devices mapped, skip to the next one 24381/head
Alfredo Deza [Tue, 2 Oct 2018 15:18:44 +0000 (11:18 -0400)]
ceph-volume util.disk when there are no devices mapped, skip to the next one

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

6 years agoceph-volume tests.util verify devices that don't exist don't break get_devices
Alfredo Deza [Tue, 2 Oct 2018 15:18:22 +0000 (11:18 -0400)]
ceph-volume tests.util verify devices that don't exist don't break get_devices

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

6 years agorgw: use coarse_real_clock for req_state::time 24319/head
Casey Bodley [Tue, 8 May 2018 19:23:41 +0000 (15:23 -0400)]
rgw: use coarse_real_clock for req_state::time

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

6 years agoencoding: add overloads for chrono durations
Casey Bodley [Tue, 8 May 2018 19:07:43 +0000 (15:07 -0400)]
encoding: add overloads for chrono durations

std::chrono::durations can be encoded in the same format as time_points
and utime_t

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

Conflicts:
src/test/encoding/test_ceph_time.h
src/test/encoding/types.h

6 years agoencoding: add test for ceph::coarse_real_time
Casey Bodley [Tue, 8 May 2018 17:52:59 +0000 (13:52 -0400)]
encoding: add test for ceph::coarse_real_time

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

Conflicts:
src/test/encoding/test_ceph_time.h
src/test/encoding/types.h

6 years agoinclude: utime_t can convert from ceph::coarse_real_time
Casey Bodley [Tue, 8 May 2018 17:04:17 +0000 (13:04 -0400)]
include: utime_t can convert from ceph::coarse_real_time

instead of accepting ceph::real_time directly, the converting
constructor takes a std::chrono::time_point<Clock>, constrained to
clocks that support timespec conversions. this currently just means
ceph::real_time and ceph::coarse_real_time

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

6 years agoencoding: constrain the time_point templates
Casey Bodley [Tue, 8 May 2018 19:06:10 +0000 (15:06 -0400)]
encoding: constrain the time_point templates

disable use of encode/decode for time_points that don't provide
conversions to/from timespec. these are only intended for use by
real_clock and coarse_real_clock

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

6 years agorgw: data sync respects error_retry_time for backoff on error_repo
Casey Bodley [Tue, 14 Aug 2018 15:16:16 +0000 (11:16 -0400)]
rgw: data sync respects error_retry_time for backoff on error_repo

don't restart processing the error_repo until error_retry_time. when
data sync is otherwise idle, don't sleep past error_retry_time

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

Conflicts:
src/rgw/rgw_data_sync.cc

6 years agocommon: adding missing ceph::coarse_real_clock helpers
Casey Bodley [Tue, 14 Aug 2018 15:12:48 +0000 (11:12 -0400)]
common: adding missing ceph::coarse_real_clock helpers

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

6 years agorgw: data sync uses coarse clock for error_retry_time
Casey Bodley [Tue, 14 Aug 2018 15:11:22 +0000 (11:11 -0400)]
rgw: data sync uses coarse clock for error_retry_time

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

6 years agoMerge pull request #24357 from alfredodeza/mimic-rm36249
Andrew Schoen [Tue, 2 Oct 2018 11:31:50 +0000 (06:31 -0500)]
Merge pull request #24357 from alfredodeza/mimic-rm36249

mimic ceph-volume:  activate option --auto-detect-objectstore respects --no-systemd

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agorgw: fix chunked-encoding for chunks >1MiB 24363/head
Robin H. Johnson [Fri, 14 Sep 2018 21:23:49 +0000 (14:23 -0700)]
rgw: fix chunked-encoding for chunks >1MiB

For HTTP responses sent with chunked-encoding, and greater than 1MiB in
size, the chunk-size field was being printed wrong.

Specifically, the chunk-size field was being sent with a mangled or
missing trailer of '\r\n'.

This bug manifested as HTTP clients being unable to read the response:
Chrome generates ERR_INCOMPLETE_CHUNKED_ENCODING
Python/boto generates httplib.LineTooLong: got more than 65536 bytes when reading chunk size

The wrong variable was being used to determine the size of the buffer
used for the chunk-size field.

Fix it by using the correct variable, and rename the variables to
clearly reflect their purpose.

Prior to PR#23940, this would only have been seen in some Swift
operations. PR#23940 changed some S3 operations to also use chunked
encoding to get responses sent faster, and made the bug easier to
detect. It was initially reported for a ListBucket call with a high
max-keys argument.

Backport: luminous, mimic
Reference: https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.6.1
Reference: https://github.com/ceph/ceph/pull/23940
Fixes: http://tracker.ceph.com/issues/35990
Signed-off-by: Robin H. Johnson <rjohnson@digitalocean.com>
(cherry picked from commit 3b864482d6aef2efe0b03be70ea83c38f7a6d99b)

6 years agoceph-volume lvm.activate pass no_systemd args when detecting objectstore 24357/head
Alfredo Deza [Mon, 1 Oct 2018 15:54:19 +0000 (11:54 -0400)]
ceph-volume lvm.activate pass no_systemd args when detecting objectstore

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

6 years agoceph-volume tests.lvm verify activate works with --auto-detect-objectstore
Alfredo Deza [Mon, 1 Oct 2018 15:53:37 +0000 (11:53 -0400)]
ceph-volume tests.lvm verify activate works with --auto-detect-objectstore

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

6 years agolibrbd: fixed assert when flattening clone with zero overlap 24356/head
Jason Dillaman [Wed, 12 Sep 2018 01:52:05 +0000 (21:52 -0400)]
librbd: fixed assert when flattening clone with zero overlap

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

Conflicts:
src/librbd/Operations.cc: trivial resolution
src/test/librbd/test_librbd.cc: trivial resolution

6 years agoMerge pull request #24334 from alfredodeza/mimic-rm36098
Andrew Schoen [Mon, 1 Oct 2018 14:54:23 +0000 (09:54 -0500)]
Merge pull request #24334 from alfredodeza/mimic-rm36098

mimic ceph-volume:  lsblk can fail to find PARTLABEL, must fallback to blkid

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
6 years agotools/ceph-bluestore-tool: update size label on bluefs expand 24351/head 24352/head
Igor Fedotov [Thu, 24 May 2018 16:05:48 +0000 (19:05 +0300)]
tools/ceph-bluestore-tool: update size label on bluefs expand

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 71c3b58da4e7ced3422bce2b1da0e3fa9331530b)

6 years agotools/ceph-bluestore-tool: add support for proper setting size, btime,
Igor Fedotov [Thu, 24 May 2018 13:32:01 +0000 (16:32 +0300)]
tools/ceph-bluestore-tool: add support for proper setting size, btime,
description, osd_uuid fields

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit ffac450da5d6e09cf14b8363b35f21819b48f38b)

6 years agotool/ceph-bluestore-tool: avoid mon/config access when calling global_init
Igor Fedotov [Fri, 18 May 2018 14:47:29 +0000 (17:47 +0300)]
tool/ceph-bluestore-tool: avoid mon/config access when calling global_init
This caused a permanent stuck on tool's startup.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit fa65e7bf65bea514b66f56053d5cbf2c16045f4c)

6 years agoosd/PrimaryLogPG: is_degraded_on_async_recovery_target - restrict to async_recovery_t... 24345/head
xie xingguo [Mon, 3 Sep 2018 04:05:14 +0000 (12:05 +0800)]
osd/PrimaryLogPG: is_degraded_on_async_recovery_target - restrict to async_recovery_targets only

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 6923a4371b6757c7a2a4dfb6320e7190ce61c645)

6 years agoosd/PrimaryLogPG: update missing_loc more carefully
xie xingguo [Tue, 14 Aug 2018 07:30:37 +0000 (15:30 +0800)]
osd/PrimaryLogPG: update missing_loc more carefully

There could be clones and hence we should update missing_loc
based on log entry itself.

Also I think the **have** field of missing_loc is not quite accurate here
but should be fine.

Fixes: http://tracker.ceph.com/issues/35546
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit b09dedf2e9f37ae117a909796727adea71e32422)