]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agovstart: infer the mon public_network 36335/head
Michael Fritch [Tue, 28 Jul 2020 17:24:21 +0000 (11:24 -0600)]
vstart: infer the mon public_network

set the mon public_network when deploying with the cephadm flag

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #36328 from tchaikov/wip-crimson-cls_cxx_map_get_vals
Kefu Chai [Tue, 28 Jul 2020 15:22:14 +0000 (23:22 +0800)]
Merge pull request #36328 from tchaikov/wip-crimson-cls_cxx_map_get_vals

crimson/osd: implement cls_cxx_map_get_vals()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: implement cls_cxx_map_get_vals() 36328/head
Kefu Chai [Tue, 28 Jul 2020 14:39:21 +0000 (22:39 +0800)]
crimson/osd: implement cls_cxx_map_get_vals()

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #34928 from p-se/wip-pse-revise-monitoring-doc
Kefu Chai [Tue, 28 Jul 2020 12:49:58 +0000 (20:49 +0800)]
Merge pull request #34928 from p-se/wip-pse-revise-monitoring-doc

mgr/dashboard: revise monitoring documentation

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #36285 from sebastian-philipp/orch-completion-generic
Sebastian Wagner [Tue, 28 Jul 2020 12:46:20 +0000 (14:46 +0200)]
Merge pull request #36285 from sebastian-philipp/orch-completion-generic

mgr/orch: Add some more type annotations

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #36258 from rhcs-dashboard/fix-cpu-stats
Volker Theile [Tue, 28 Jul 2020 12:00:25 +0000 (14:00 +0200)]
Merge pull request #36258 from rhcs-dashboard/fix-cpu-stats

mgr/dashboard: cpu stats incorrectly displayed

Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agomgr/orch: Add some more type annotations 36285/head
Sebastian Wagner [Fri, 24 Jul 2020 15:29:28 +0000 (17:29 +0200)]
mgr/orch: Add some more type annotations

Made `orch.Completion` a generic type

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36012 from adk3798/cephadm_44886
Sebastian Wagner [Tue, 28 Jul 2020 09:54:12 +0000 (11:54 +0200)]
Merge pull request #36012 from adk3798/cephadm_44886

mgr/cephadm: allow use of authenticated registry

4 years agoMerge pull request #36262 from sebastian-philipp/orch-readd-apply_dg
Sebastian Wagner [Tue, 28 Jul 2020 09:52:53 +0000 (11:52 +0200)]
Merge pull request #36262 from sebastian-philipp/orch-readd-apply_dg

mgr/cephadm: re-add `apply_drivegroups()`

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
4 years agoMerge pull request #36306 from smithfarm/wip-add-octopus-to-release-table
Nathan Cutler [Tue, 28 Jul 2020 09:33:30 +0000 (11:33 +0200)]
Merge pull request #36306 from smithfarm/wip-add-octopus-to-release-table

doc/releases: add "octopus" column to Release Timeline

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36301 from sebastian-philipp/doc-cephadm-status-no-progress
Sebastian Wagner [Tue, 28 Jul 2020 09:29:01 +0000 (11:29 +0200)]
Merge pull request #36301 from sebastian-philipp/doc-cephadm-status-no-progress

doc/cephadm: `status` doesn't show a progress

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #36090 from inspur-wyq/wip-37532
Kefu Chai [Tue, 28 Jul 2020 02:21:24 +0000 (10:21 +0800)]
Merge pull request #36090 from inspur-wyq/wip-37532

mon: fix the 'Error ERANGE' message when conf "osd_objectstore" is filestore

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36283 from rzarzynski/wip-bl-raw-privatization
Kefu Chai [Tue, 28 Jul 2020 02:20:00 +0000 (10:20 +0800)]
Merge pull request #36283 from rzarzynski/wip-bl-raw-privatization

common/bl: don't access raw::data nor raw::len directly. Use getters instead.

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agodoc/releases: add "octopus" column to Release Timeline 36306/head
Nathan Cutler [Mon, 27 Jul 2020 15:40:58 +0000 (17:40 +0200)]
doc/releases: add "octopus" column to Release Timeline

Octopus has been out for awhile. I suppose this should have been done
earlier, but "better late than never".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #36245 from smithfarm/wip-mimic-is-eol
Nathan Cutler [Mon, 27 Jul 2020 15:39:22 +0000 (17:39 +0200)]
Merge pull request #36245 from smithfarm/wip-mimic-is-eol

doc/releases: Mimic is EOL

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36279 from tchaikov/wip-crimson-msgr-v2.1
Kefu Chai [Mon, 27 Jul 2020 14:53:07 +0000 (22:53 +0800)]
Merge pull request #36279 from tchaikov/wip-crimson-msgr-v2.1

crimson/net: enable on-wire-encryt and v2.1 support

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agodoc/cephadm: `status` doesn't show a progress 36301/head
Sebastian Wagner [Mon, 27 Jul 2020 14:50:01 +0000 (16:50 +0200)]
doc/cephadm: `status` doesn't show a progress

Fixes: https://tracker.ceph.com/issues/45858
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #35852 from smithfarm/wip-opensuse-os-recommendations
Nathan Cutler [Mon, 27 Jul 2020 14:25:30 +0000 (16:25 +0200)]
Merge pull request #35852 from smithfarm/wip-opensuse-os-recommendations

doc/start/os-recommendations: current state of openSUSE

Reviewed-by: Tim Serong <tserong@suse.com>
4 years agoMerge pull request #36269 from dang/wip-dang-46692
Casey Bodley [Mon, 27 Jul 2020 13:54:46 +0000 (09:54 -0400)]
Merge pull request #36269 from dang/wip-dang-46692

RGW - fix bulkupload, broken by zipper

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #36219 from guits/guits-fix_zap_osdid_osdfsid
Jan Fajerski [Mon, 27 Jul 2020 08:29:21 +0000 (10:29 +0200)]
Merge pull request #36219 from guits/guits-fix_zap_osdid_osdfsid

ceph-volume: filter by osd-id or osd-fsid when zapping

5 years agoceph-volume: filter by osd-id or osd-fsid when zapping 36219/head
Guillaume Abrioux [Mon, 20 Jul 2020 13:43:38 +0000 (15:43 +0200)]
ceph-volume: filter by osd-id or osd-fsid when zapping

2f5c10c12c37e6865ce54bb4940d3779353cba4f introduced a bug:

`ceph-volume lvm zap` command fails under certain conditions.

when passing `--osd-id` or `--osd-fsid` to `ceph-volume lvm zap` command
it tries to zap additionnal devices that have nothing to do with the osd
being zapped.

When calling `api.get_lvs()` in `ensure_associated_lvs()` we have to
pass the osd-id/osd-fsid information so only related devices are
returned by `get_lvs()` method

Closes: https://tracker.ceph.com/issues/46627
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
5 years agomessages/MOSDBoot: pass OSDSuperblock by const ref 36279/head
Kefu Chai [Sat, 25 Jul 2020 09:22:14 +0000 (17:22 +0800)]
messages/MOSDBoot: pass OSDSuperblock by const ref

MOSDBoot's ctor does not change the parameter, so let's pass by const
reference.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/os/alienstore: always use fsid in bluestore
Kefu Chai [Sat, 25 Jul 2020 09:13:41 +0000 (17:13 +0800)]
crimson/os/alienstore: always use fsid in bluestore

alienstore should not be stateful in this perspective, it should proxy
all acccess of fsid to bluestore.

there are couple issues in existing implementation:

* when mkfs, bluestore tries to generate a new osd_fsid if the specified
  one is empty. but we explicitly pass the given uuid down to
  AlienStore::mkfs() so the bluestore can use it. so we should pass it
  down instad of storing it locally.
* when persisting superblock in OSD::mkfs(), superblock.osd_fsid() is
  read from store->get_fsid(), if user specifies an empty uuid, we
  should persist the generated uuid in the superblock.

in this change, all access to fsid is proxied to the underlying
bluestore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agostop.sh: stop osd before mon
Kefu Chai [Sat, 25 Jul 2020 07:45:26 +0000 (15:45 +0800)]
stop.sh: stop osd before mon

osd sends a MOSDMarkMeDown message to monitor and waits for its ack
before timeout, so if we can stop osd before stopping mon, stop.sh can
return sooner without waiting until the timeout.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/mgr: only pick the addr of the same type
Kefu Chai [Sat, 25 Jul 2020 05:04:58 +0000 (13:04 +0800)]
crimson/mgr: only pick the addr of the same type

to avoid the attempts to connect an OSD which is bound to a v2
address to a v1 address of a mgr.

in general, osd is bound to both v1 and v2 addresses, but crimson
msgr does not support multiple bound address at the time of writing, so
to avoid the failures when trying to connect to incompatible addresses,
let's filter out them when connecting to monitor. this change
silence warnings like:

peer_addr_for_me v1:172.21.15.106:60008/0 type doesn't match myaddr
v2:0.0.0.0:6802/26710

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomon/MgrMap: let get_active_addrs() return a const ref
Kefu Chai [Sat, 25 Jul 2020 05:02:49 +0000 (13:02 +0800)]
mon/MgrMap: let get_active_addrs() return a const ref

no need to create a temporary instance for referencing those addresses.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/mon: only pick the addr of the same type
Kefu Chai [Sat, 25 Jul 2020 04:38:04 +0000 (12:38 +0800)]
crimson/mon: only pick the addr of the same type

to avoid the attempts to connect an OSD which is bound to a v2 address
to a v1 addrss of a monitor.

in general, osd is bound to both v1 and v2 addresses, but crimson msgr
does not support multiple bound address at the time of writing, so to
avoid the failures when trying to connect to incompatible addresses,
let's filter out them when connecting to monitor. this change silence
warnings like:

peer_addr_for_me v1:172.21.15.106:60008/0 type doesn't match myaddr
v2:0.0.0.0:6802/26710

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/osd: print out client caps
Kefu Chai [Fri, 24 Jul 2020 15:13:37 +0000 (23:13 +0800)]
crimson/osd: print out client caps

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoauth/cephx: implement random()->get_bytes() for crimson
Kefu Chai [Fri, 24 Jul 2020 15:10:51 +0000 (23:10 +0800)]
auth/cephx: implement random()->get_bytes() for crimson

instead of using CryptoRandom use the C++ standard library for
generating secret.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/admin: catch thrown exception
Kefu Chai [Fri, 24 Jul 2020 13:11:08 +0000 (21:11 +0800)]
crimson/admin: catch thrown exception

if the socket file exists, a std::system_error is thrown. and we should
catch it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/msgr: Revert "don't advertise the on-wire format v2.1."
Kefu Chai [Fri, 24 Jul 2020 09:00:06 +0000 (17:00 +0800)]
crimson/msgr: Revert "don't advertise the on-wire format v2.1."

This reverts commit a74948bc5095b32212189352c163030bfe10db71.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/net: enable msgr v2.1 support
Kefu Chai [Fri, 24 Jul 2020 10:03:16 +0000 (18:03 +0800)]
crimson/net: enable msgr v2.1 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/net: enable on_wire encryption support
Kefu Chai [Fri, 24 Jul 2020 10:01:12 +0000 (18:01 +0800)]
crimson/net: enable on_wire encryption support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/net: set is_rev1 for messenger v2.1 support
Kefu Chai [Fri, 24 Jul 2020 08:59:58 +0000 (16:59 +0800)]
crimson/net: set is_rev1 for messenger v2.1 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/net: keep rx_preamble for msgr v2.1 support
Kefu Chai [Fri, 24 Jul 2020 08:55:36 +0000 (16:55 +0800)]
crimson/net: keep rx_preamble for msgr v2.1 support

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/net: drop stale TODO
Kefu Chai [Fri, 24 Jul 2020 08:45:46 +0000 (16:45 +0800)]
crimson/net: drop stale TODO

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/net: use rx_frame_asm for handling data read from wire
Kefu Chai [Fri, 24 Jul 2020 08:33:22 +0000 (16:33 +0800)]
crimson/net: use rx_frame_asm for handling data read from wire

by leveraging FrameAssembler, it's much simpler. and it also pave the
road to a better messenger v2.0 and v2.1 protocol support.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agocrimson/net: mark abort_ functions [[noreturn]]
Kefu Chai [Fri, 24 Jul 2020 08:30:44 +0000 (16:30 +0800)]
crimson/net: mark abort_ functions [[noreturn]]

otherwise compiler complains if control reaches end of non-void
function.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomsg/async/crypto_onwire: drop unused member variable
Kefu Chai [Fri, 24 Jul 2020 03:51:57 +0000 (11:51 +0800)]
msg/async/crypto_onwire: drop unused member variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36259 from majianpeng/bluefs-reduce-ceph_clock_now
Kefu Chai [Sat, 25 Jul 2020 18:03:02 +0000 (02:03 +0800)]
Merge pull request #36259 from majianpeng/bluefs-reduce-ceph_clock_now

os/bluestore/BlueFS: reduce unnecessary ceph_clock_now().

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
5 years agoMerge pull request #33899 from rs-fabrica/rados_generic_options_usage_message
Kefu Chai [Sat, 25 Jul 2020 18:00:15 +0000 (02:00 +0800)]
Merge pull request #33899 from rs-fabrica/rados_generic_options_usage_message

rados: include generic options in usage message

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36115 from BenoitKnecht/diskprediction-local-array-shape
Kefu Chai [Sat, 25 Jul 2020 17:57:49 +0000 (01:57 +0800)]
Merge pull request #36115 from BenoitKnecht/diskprediction-local-array-shape

mgr/diskprediction_local: Fix array size error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #35306 from changchengx/blk
Kefu Chai [Sat, 25 Jul 2020 17:57:11 +0000 (01:57 +0800)]
Merge pull request #35306 from changchengx/blk

blk: add option to set device type to select blk driver

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36274 from xiexingguo/wip-peer-num-objects
Kefu Chai [Sat, 25 Jul 2020 17:54:29 +0000 (01:54 +0800)]
Merge pull request #36274 from xiexingguo/wip-peer-num-objects

osd/PeeringState: prevent peer's num_objects going negative

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: yanjun <yan.jun8@zte.com.cn>
5 years agoMerge pull request #36236 from tchaikov/wip-std-bind
Kefu Chai [Sat, 25 Jul 2020 10:22:08 +0000 (18:22 +0800)]
Merge pull request #36236 from tchaikov/wip-std-bind

test/librados_test_stub: use std::bind

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
5 years agoMerge pull request #36071 from rzarzynski/wip-crimson-errorator-assert-cleanup
Kefu Chai [Sat, 25 Jul 2020 06:41:33 +0000 (14:41 +0800)]
Merge pull request #36071 from rzarzynski/wip-crimson-errorator-assert-cleanup

crimson: improve assertions in errorator

Reviewed-by: Samuel Just <sjust@redhat.com>
5 years agoosd/PeeringState: prevent peer's num_objects going negative 36274/head
xie xingguo [Fri, 24 Jul 2020 01:57:40 +0000 (09:57 +0800)]
osd/PeeringState: prevent peer's num_objects going negative

Saw it in a teuthology run:

 -5645> 2020-07-20 04:34:32.067 7f351e329700  5 osd.5 pg_epoch: 667 ... exit Started/Primary/Active/Backfilling
 -5642> 2020-07-20 04:34:32.067 7f351e329700  5 osd.5 pg_epoch: 667 ... enter Started/Primary/Active/Recovered
 -5633> 2020-07-20 04:34:32.067 7f351e329700 20 osd.5 pg_epoch: 667 ... _update_calc_stats shard 5 primary objects 0 missing 0
 -5632> 2020-07-20 04:34:32.067 7f351e329700 20 osd.5 pg_epoch: 667 ... _update_calc_stats shard 3 objects -1 missing 1
 -5631> 2020-07-20 04:34:32.067 7f351e329700 20 osd.5 pg_epoch: 667 ... _update_calc_stats shard 6 objects 0 missing 0

This will crash the choose_acting() procedure as it will mistakenly
think that peer 3 should continue to perform asynchronous recovery
(e.g., due to num_objects_missing = 1) in contrast to fully
backfill-recovered.

While I did not dig into the real cause, there are a couple of
possible explanations of how num_objects can be off. I think that
if a roll forward or log replay could delete something twice, maybe
there would be an undercount. Or maybe something as simple as a
corruption.

Since _update_calc_stats() is going to fix num_objects_missing
for that peer anyway, let's make sure it always starts with a
clean state.

Fixes: https://tracker.ceph.com/issues/46705
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge pull request #36121 from aclamk/wip-bluefs-log-replay-rescue
Neha Ojha [Fri, 24 Jul 2020 23:13:55 +0000 (16:13 -0700)]
Merge pull request #36121 from aclamk/wip-bluefs-log-replay-rescue

Rescue procedure for extremely large bluefs log

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #35909 from dzafman/wip-46275
Neha Ojha [Fri, 24 Jul 2020 21:47:44 +0000 (14:47 -0700)]
Merge pull request #35909 from dzafman/wip-46275

osd: Cancel in-progress scrubs (not user requested)

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoRGW - fix bulkupload, broken by zipper 36269/head
Daniel Gryniewicz [Thu, 23 Jul 2020 16:38:11 +0000 (12:38 -0400)]
RGW - fix bulkupload, broken by zipper

Bulkupload depended on the existence of empty bucketinfo.  Fix that, to
avoid a crash.  In additions, the error handler for swift used buckets.

Fixes 46692

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
5 years agotest: Check for interuption of scrubs with nosrub/nodeep_scrub 35909/head
David Zafman [Tue, 7 Jul 2020 01:02:08 +0000 (18:02 -0700)]
test: Check for interuption of scrubs with nosrub/nodeep_scrub

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoosd: Cancel in-progress scrubs (not user requested)
David Zafman [Thu, 2 Jul 2020 17:05:57 +0000 (10:05 -0700)]
osd: Cancel in-progress scrubs (not user requested)

This change adds new scrubber.req_scrub to track user
requested scrubs, deep_scrub or repair.

Fixes: https://tracker.ceph.com/issues/46275
Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoosd: Arrange code so that it is clearer should not cause any change
David Zafman [Thu, 23 Jul 2020 16:40:54 +0000 (09:40 -0700)]
osd: Arrange code so that it is clearer should not cause any change

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agotest: mon-last-epoch-clean.sh fixed to avoid shell globbing
David Zafman [Tue, 21 Jul 2020 20:58:42 +0000 (13:58 -0700)]
test: mon-last-epoch-clean.sh fixed to avoid shell globbing

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoosd: Fix dump_scrub_reservation usage
David Zafman [Thu, 9 Jul 2020 18:25:46 +0000 (11:25 -0700)]
osd: Fix dump_scrub_reservation usage

Signed-off-by: David Zafman <dzafman@redhat.com>
5 years agoMerge pull request #35376 from Devp00l/update-backport-doc
Laura Paduano [Fri, 24 Jul 2020 13:26:56 +0000 (15:26 +0200)]
Merge pull request #35376 from Devp00l/update-backport-doc

doc: Resolving conflicts with ceph-backport.sh

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agocommon/bl: don't access raw::len directly. Use the getter instead. 36283/head
Radoslaw Zarzynski [Fri, 24 Jul 2020 10:14:25 +0000 (10:14 +0000)]
common/bl: don't access raw::len directly. Use the getter instead.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agocommon/bl: don't access raw::data directly. Use the getter instead.
Radoslaw Zarzynski [Wed, 22 Jul 2020 18:57:51 +0000 (18:57 +0000)]
common/bl: don't access raw::data directly. Use the getter instead.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #36238 from yuvalif/fix_zippet_notif_merge
Yuval Lifshitz [Fri, 24 Jul 2020 11:46:55 +0000 (14:46 +0300)]
Merge pull request #36238 from yuvalif/fix_zippet_notif_merge

rgw/notification: fix merge issues from zipper6

5 years agoMerge pull request #36268 from tchaikov/wip-crimson-msgr
Kefu Chai [Fri, 24 Jul 2020 10:17:14 +0000 (18:17 +0800)]
Merge pull request #36268 from tchaikov/wip-crimson-msgr

crimson/net: do not reset need_addr before learning it

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
5 years agocrimson/net: do not reset need_addr before learning it 36268/head
Kefu Chai [Thu, 23 Jul 2020 16:09:08 +0000 (00:09 +0800)]
crimson/net: do not reset need_addr before learning it

because we don't bind both v1 and v2 addresses, when monitor returns a
v1 peer address, as the client side, crimson-osd just drops the
connection. but this failed attempt to learn the myaddr resets
`need_addr`. and this prevents crimson-osd from learning the v2 address
returned by monitor.

in this change, we reset need_addr only after it is learned from the
peer.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36256 from tchaikov/wip-ceph-debug-docker-crimson
Kefu Chai [Fri, 24 Jul 2020 02:11:02 +0000 (10:11 +0800)]
Merge pull request #36256 from tchaikov/wip-ceph-debug-docker-crimson

ceph-debug-docker: add --flavor option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoceph-debug-docker: add --flavor option 36256/head
Kefu Chai [Thu, 23 Jul 2020 05:58:25 +0000 (13:58 +0800)]
ceph-debug-docker: add --flavor option

* add --flavor option, which is "default" by default, so one can, for
  example, pass "--flavor crimson" to ceph-debug-docker
* extract $repo_url to avoid repeating the shared bits between centos
  and debian derivatives envs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoos/bluestore/BlueFS: avoid useless ceph_clock_now() call. 36259/head
Jianpeng Ma [Fri, 24 Jul 2020 00:52:14 +0000 (08:52 +0800)]
os/bluestore/BlueFS:  avoid useless ceph_clock_now() call.

The overhead of utime_t constructor utime_t()  is less than ceph_clock_now().

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
5 years agoMerge PR #36136 into master
Patrick Donnelly [Fri, 24 Jul 2020 00:12:43 +0000 (17:12 -0700)]
Merge PR #36136 into master

* refs/pull/36136/head:
qa/tasks/nfs:Add test for relative and just '/' pseudo path
mgr/nfs: Check if pseudo path is absolute path or just '/'

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agomgr/cephadm: allow use of authenticated registry 36012/head
Adam King [Fri, 10 Jul 2020 12:09:39 +0000 (08:09 -0400)]
mgr/cephadm: allow use of authenticated registry

Add option to use custom authenticated registry during
bootstrap as well as a registry-login command in order
to let user change authenticated registry login info

Fixes: https://tracker.ceph.com/issues/44886
Signed-off-by: Adam King <adking@redhat.com>
5 years agoMerge pull request #36239 from sebastian-philipp/cephadm-parallel-hosts
Sebastian Wagner [Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)]
Merge pull request #36239 from sebastian-philipp/cephadm-parallel-hosts

mgr/cephadm: create OSDs in parallel

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agoMerge pull request #35839 from mgfritch/cephadm-ignore-mon-mgr-svc-id
Sebastian Wagner [Thu, 23 Jul 2020 15:52:49 +0000 (17:52 +0200)]
Merge pull request #35839 from mgfritch/cephadm-ignore-mon-mgr-svc-id

python-common: clean-up ServiceSpec.service_id handling

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #36251 from neha-ojha/wip-fix-43888
Neha Ojha [Thu, 23 Jul 2020 14:36:47 +0000 (07:36 -0700)]
Merge pull request #36251 from neha-ojha/wip-fix-43888

osd/OSD.cc: remove osd_lock for bench

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
5 years agoMerge pull request #36261 from tchaikov/wip-unforty-seastar
Kefu Chai [Thu, 23 Jul 2020 14:26:11 +0000 (22:26 +0800)]
Merge pull request #36261 from tchaikov/wip-unforty-seastar

ceph.spec.in: cull _FORTIFY_SOURCE macro from CXXFLAGS for seastar

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #36252 from tchaikov/wip-doc-crimson
Kefu Chai [Thu, 23 Jul 2020 14:19:56 +0000 (22:19 +0800)]
Merge pull request #36252 from tchaikov/wip-doc-crimson

doc/dev/crimson: remove redundant options

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
5 years agoMerge pull request #36263 from tchaikov/wip-more-log-for-dashboard-test
Kefu Chai [Thu, 23 Jul 2020 13:13:44 +0000 (21:13 +0800)]
Merge pull request #36263 from tchaikov/wip-more-log-for-dashboard-test

mgr/dashboard: print more osd log when backend-api-tests fails

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agomgr/dashboard: print more log when backend-api-tests fails 36263/head
Kefu Chai [Thu, 23 Jul 2020 09:47:14 +0000 (17:47 +0800)]
mgr/dashboard: print more log when backend-api-tests fails

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36242 from dillaman/wip-46668
Mykola Golub [Thu, 23 Jul 2020 09:20:43 +0000 (12:20 +0300)]
Merge pull request #36242 from dillaman/wip-46668

librbd: flush all queued object IO from simple scheduler

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agodoc/dev/crimson: add more examples for seastar-addr2line 36252/head
Kefu Chai [Thu, 23 Jul 2020 08:53:41 +0000 (16:53 +0800)]
doc/dev/crimson: add more examples for seastar-addr2line

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agomgr/cephadm: re-add `apply_drivegroups()` 36262/head
Sebastian Wagner [Thu, 23 Jul 2020 08:43:17 +0000 (10:43 +0200)]
mgr/cephadm: re-add `apply_drivegroups()`

Fixes: d348d7bf8d3663140c089937b62a0b316b69176b
Fixes: https://tracker.ceph.com/issues/46681
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoceph.spec.in: cull _FORTIFY_SOURCE macro from CXXFLAGS for seastar 36261/head
Kefu Chai [Thu, 23 Jul 2020 08:03:06 +0000 (16:03 +0800)]
ceph.spec.in: cull _FORTIFY_SOURCE macro from CXXFLAGS for seastar

seastar uses setjmp() and longjmp() to implement coroutine, but
longjmp() is defined as ____longjmp_chk() by GCC if _FORTIFY_SOURC is
defined. ____longjmp_chk() simply bails out with an error message if
the dest stack pointer is higher than the src stack pointer, or the dest
stack pointer is not in the sigaltstack. in the case of seastar, the dst
%sp is not necessarily higher than src stack pointer, and it's not
handling a signal for switching the thread context. that's why we have
the "longjmp causes uninitialized stack frame" error when running
crimson-osd on RHEL/CentOS 8 using the prebuilt rpm packages.

the optflags rpm macro adds -D_FORTIFY_SOURCE=2 to CFLAGS and CXXFLAGS,
so even seastar tries to pass -U_FORTIFY_SOURCE to GCC, there is chance
that cmake append CXXFLAGS at the end of the option list passed to GCC.
and this renders seastar's attempt to undefine _FORTIFY_SOURCE useless.

another way to address this issue is to undefine this macro in
seastar:src/core/thread.cc. but since seastar tries neutralize the macro
in its cmake script instead of source file, i assume they have their
considerations. let's drop it in the rpm recipe instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36225 from votdev/cephadm_fix_typos
Sebastian Wagner [Thu, 23 Jul 2020 08:01:39 +0000 (10:01 +0200)]
Merge pull request #36225 from votdev/cephadm_fix_typos

doc/cephadm: Fix typos in 'Cephadm Concepts' document.

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoqa/tasks/nfs:Add test for relative and just '/' pseudo path 36136/head
Varsha Rao [Tue, 21 Jul 2020 09:59:35 +0000 (15:29 +0530)]
qa/tasks/nfs:Add test for relative and just '/' pseudo path

Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/nfs: Check if pseudo path is absolute path or just '/'
Varsha Rao [Thu, 16 Jul 2020 10:50:36 +0000 (16:20 +0530)]
mgr/nfs: Check if pseudo path is absolute path or just '/'

Fixes: https://tracker.ceph.com/issues/46565
Signed-off-by: Varsha Rao <varao@redhat.com>
5 years agomgr/dashboard: cpu stats incorrectly displayed 36258/head
Avan Thakkar [Thu, 23 Jul 2020 06:27:32 +0000 (11:57 +0530)]
mgr/dashboard: cpu stats incorrectly displayed

Fixes: https://tracker.ceph.com/issues/46683
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
5 years agoMerge pull request #36158 from dillaman/wip-45169
Mykola Golub [Thu, 23 Jul 2020 06:05:23 +0000 (09:05 +0300)]
Merge pull request #36158 from dillaman/wip-45169

immutable-object-cache: fixed crashes on start up

Reviewed-by: Mykola Golub <mgolub@suse.com>
5 years agoMerge pull request #36240 from tchaikov/wip-ceph-debug-docker-el8
Kefu Chai [Thu, 23 Jul 2020 03:54:26 +0000 (11:54 +0800)]
Merge pull request #36240 from tchaikov/wip-ceph-debug-docker-el8

ceph-debug-docker: support centos 8

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge PR #36203 into master
Patrick Donnelly [Thu, 23 Jul 2020 01:49:08 +0000 (18:49 -0700)]
Merge PR #36203 into master

* refs/pull/36203/head:
client: cleanup the fuse client code

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agodoc/dev/crimson: remove redundant options
Kefu Chai [Thu, 23 Jul 2020 01:39:30 +0000 (09:39 +0800)]
doc/dev/crimson: remove redundant options

`--smp` and `--cpuset` have been passed to crimson-osd by vstart.sh, so
no need to pass them when launching vstart.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodoc/mgr/orchestrator: add missing OSD service_id 35839/head
Michael Fritch [Wed, 22 Jul 2020 22:35:32 +0000 (16:35 -0600)]
doc/mgr/orchestrator: add missing OSD service_id

example for deploying multiple specs via yaml was missing the service_id

Fixes: https://tracker.ceph.com/issues/46377
Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agopython-common: clean-up ServiceSpec.service_id handling
Michael Fritch [Tue, 30 Jun 2020 22:06:20 +0000 (16:06 -0600)]
python-common: clean-up ServiceSpec.service_id handling

service_id is required for iscsi, mds, nfs, osd, rgw.

any other service_type (mon, mgr, etc.) should not contain a service_id

Fixes: https://tracker.ceph.com/issues/46175
Signed-off-by: Michael Fritch <mfritch@suse.com>
5 years agoosd/OSD.cc: remove osd_lock for bench 36251/head
Neha Ojha [Fri, 17 Jul 2020 16:52:56 +0000 (16:52 +0000)]
osd/OSD.cc: remove osd_lock for bench

8987f94416f453829eae6dda08837ef5a42531c6 introduced the osd_lock for the
bench command. Taking the osd_lock in bench can lead to deadlocks, causing the
command to hang as seen in https://tracker.ceph.com/issues/43888.

Fixes: https://tracker.ceph.com/issues/43888
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #35667 from jschmid1/cephadm_deterministic_simplescheduler
Sebastian Wagner [Wed, 22 Jul 2020 20:12:00 +0000 (22:12 +0200)]
Merge pull request #35667 from jschmid1/cephadm_deterministic_simplescheduler

mgr/cephadm: rework --dry-run/previews

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agodoc/releases: Mimic is EOL 36245/head
Nathan Cutler [Wed, 22 Jul 2020 18:15:08 +0000 (20:15 +0200)]
doc/releases: Mimic is EOL

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agolibrbd: flush all queued object IO from simple scheduler 36242/head
Jason Dillaman [Wed, 22 Jul 2020 15:25:56 +0000 (11:25 -0400)]
librbd: flush all queued object IO from simple scheduler

Normally IO is tracked via the AioCompletion's async_op but the
scheduler will "complete" writes while the IO might be still
executing. Therefore, prior to shutting down this dispatch layer
we need to wait for all IO to complete.

Fixes: https://tracker.ceph.com/issues/46668
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36216 from sebastian-philipp/cephadm-fix-undefined-container_path
Sebastian Wagner [Wed, 22 Jul 2020 15:52:37 +0000 (17:52 +0200)]
Merge pull request #36216 from sebastian-philipp/cephadm-fix-undefined-container_path

cephadm: fix UnboundLocalError: `container_path`

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoceph-debug-docker: support centos 8 36240/head
Kefu Chai [Wed, 22 Jul 2020 13:41:41 +0000 (21:41 +0800)]
ceph-debug-docker: support centos 8

* default to centos:8, as we've moved to centos:8 now
* do not assume that the base image is centos:7, use centos:8 if it is
  specified.
* install python3-* packages for centos:8 and install python36-*
  packages for centos:7. as el8 is now a python3 distro, and
  centos:7 now has python36.
* s/screen/tmux/. because screen is now offered by EPEL, while tmux
  is in BaseOS.

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #35694 from rhcs-dashboard/wip-45901-master
Laura Paduano [Wed, 22 Jul 2020 14:58:44 +0000 (16:58 +0200)]
Merge pull request #35694 from rhcs-dashboard/wip-45901-master

mgr/dashboard: increase API test coverage in API controllers

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agodoc: add notes about --dry-run 35667/head
Joshua Schmid [Mon, 6 Jul 2020 09:59:49 +0000 (11:59 +0200)]
doc: add notes about --dry-run

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agomgr/cephadm: rework --dry-run/previews
Joshua Schmid [Wed, 10 Jun 2020 08:33:36 +0000 (10:33 +0200)]
mgr/cephadm: rework --dry-run/previews

Signed-off-by: Joshua Schmid <jschmid@suse.de>
5 years agoclient: cleanup the fuse client code 36203/head
Xiubo Li [Wed, 22 Jul 2020 00:25:29 +0000 (08:25 +0800)]
client: cleanup the fuse client code

Signed-off-by: Xiubo Li <xiubli@redhat.com>
5 years agomgr/cephadm: create OSDs in parallel 36239/head
Sebastian Wagner [Wed, 22 Jul 2020 12:45:09 +0000 (14:45 +0200)]
mgr/cephadm: create OSDs in parallel

Should speedup day 1 OSD creation by something like factor 10

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agomgr/cephadm: move `forall_hosts()` to utils module
Sebastian Wagner [Wed, 22 Jul 2020 12:39:26 +0000 (14:39 +0200)]
mgr/cephadm: move `forall_hosts()` to utils module

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
5 years agoMerge pull request #35866 from tchaikov/wip-qa-tempest-pin-openstackclients
Kefu Chai [Wed, 22 Jul 2020 12:38:54 +0000 (20:38 +0800)]
Merge pull request #35866 from tchaikov/wip-qa-tempest-pin-openstackclients

qa/keystone: pin python-openstackclient

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>