Merge pull request #38608 from tchaikov/wip-crimson-build

rpm,deb: conditionally package crimson-store-nbd in ceph-test

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #38578 from cyx1231st/wip-seastar-onode-tree-fix-stage-type

crimson/onode-staged-tree: fix match_stage_t related compile issue

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #38625 from batrick/tox-fix

qa: fix tox failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

qa: fix tox failures

Fixes: c6121e48ecb7224e5addf4b5fdeb64907a8d8683
Fixes: https://tracker.ceph.com/issues/48633
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #38548 from rhcs-dashboard/wip-48570-master

github: add action to manage needs-rebase label

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge branch 'CVE-2020-27781' into master

* CVE-2020-27781:
  tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize
  pybind/ceph_volume_client: Optionally authorize existing auth-ids
  pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id
  pybind/ceph_volume_client: Disallow authorize auth_id

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>

Merge pull request #38580 from anthonyeleven/anthonyeleven/48301-underscores

doc: standardize config option names with interstitial underscores

Reviewed-by: Zac Dover <zac.dover@gmail.com>

crimson/onode-staged-tree: comment out excessive range checks

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #38316 from rhcs-dashboard/temporary-lockout

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #38534 from votdev/issue_48542_rgw_status

mgr/dashboard: The /rgw/status endpoint does not check for running service

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

Merge pull request #38536 from dillaman/wip-48553

librbd/mirror: unlink the third snapshot when the limit is reached

Reviewed-by: Mykola Golub <mgolub@suse.com>

mgr/dashboard: Updating the docs regarding the user lockout

Fixes: https://tracker.ceph.com/issues/40914
Signed-off-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: Temporary User Lockout if 10 Invalid Login attempts

Implemented a user lockout mechanism if the user enters 10 invalid attempts. The attempt count gets resetted to 0 once the user succesfully logins before getting disabled. Once the user gets disabled administrator has to manually enable the user which will also resets the number of attempts.

Fixes: https://tracker.ceph.com/issues/40914
Signed-off-by: Nizamudeen A <nia@redhat.com>

Merge pull request #38606 from rhcs-dashboard/log-e2e-fix

mgr/dashboard: Fixing dashboard logs e2e test

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

mgr/dashboard: Fixing dashboard logs e2e test

Yesterday there were some changes went in which disables the logging of config set and config-key set to to be logged in mgr audit logs. Dashboard has an e2e test which checks for this config set and broke the current e2e jenkins job. This commit removes that certain test to fix the jenkins job.

Fixes: https://tracker.ceph.com/issues/48623
Signed-off-by: Nizamudeen A <nia@redhat.com>

debian: install crimson-store-nbd with pkg.ceph.crimson profile

Signed-off-by: Kefu Chai <kchai@redhat.com>

rpm: package crimson-store-nbd in ceph-test package

when building with seastar enabled, package crimson-store-ndb in
"ceph-test" package. "crimson-store-nbd" is a new tool for testing
seastore using nbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #38581 from cyx1231st/wip-seastar-msgr-fix-test-preemptive-shutdown

crimson/net: fix test_preemptive_shutdown() failure

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #31358 from ideepika/wip-jaegertracing-in-ceph

jaegertracing build/ops integration

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

doc: standardize config option names to use interstitial underscores

Ceph config option names may use spaces, underscores, or by one reference hyphens
as interstitial separators. Most usage within the doc tree uses underscores,
though example conf files and especially structured lists of options mostly
use spaces. Mostly. Underscores help differentiate the config names from
surrounding text, and moreover facilitate scripting, grep, awk, etc and match
their form in src/common/options.cc.

This PR conforms these occurrences of option names to use interstitial underscores instead of spaces.

Fixes: https://tracker.ceph.com/issues/48301
Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #38479 from neha-ojha/wip-37503-2

Do not add sensitive information in Ceph log files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #38514 from lixiaoy1/rbd_types_fix

librbd/cmake: Add missed PWL related types

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #38546 from rhcs-dashboard/round-button

mgr/dashboard: Making the edges of not rounded button rounded

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #38269 from rhcs-dashboard/fix-44960-master

mgr/dashboard: replace cdCopy2ClipboardButton Directive with a component

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #37937 from p-se/cd-alternative-grafana-fe-url

mgr/dashboard: enable different URL for users of browser to Grafana

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

github: add action to manage needs-rebase label

Fixes: https://tracker.ceph.com/issues/48570
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

Merge pull request #36715 from rhcs-dashboard/fix-39128-master

mgr/dashboard: new generic HTTP error page component

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #38456 from SMIL-Infra/fix-crush-map-viewer

mgr/dashboard: Fix CRUSH map viewer VirtualScroll

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

mgr/dashboard: replace cdCopy2ClipboardButton Directive with a component
Replaces Directive-Based copy2ClipboardButton with a Component-based version.
Further replaces all instances of Directive use with Component version.
Similar toastr logic used.
Fixes: https://tracker.ceph.com/issues/44960
Signed-off-by: Courtney Caldwell <ccaldwel@redhat.com>

mon, messages: use TOPNSPC::common for crimson compatibility

Signed-off-by: Neha Ojha <nojha@redhat.com>

mgr/ActivePyModules.cc: don't log config value in get_typed_config

Signed-off-by: Neha Ojha <nojha@redhat.com>

mon/ConfigMonitor.cc: don't log config values in refresh_config

Signed-off-by: Neha Ojha <nojha@redhat.com>

mgr: don't add config values to mgr log in config_callback and module_config

The original code has been commented out and left for future debugging
purposes.

Signed-off-by: Neha Ojha <nojha@redhat.com>

mon/ConfigMonitor.cc: don't dump all keys and values in config map

Signed-off-by: Neha Ojha <nojha@redhat.com>

mon: don't log "config set" and "config-key set" dispatch and finished messages

Signed-off-by: Neha Ojha <nojha@redhat.com>

messages/MMonCommand, MMonCommandAck: don't log values for "config set" and "config-key set"

This acts like a big hammer to avoid adding sensitive information, like passwords
into mon/mgr/cluster logs when using "config set" and "config-key set" to set keys
whose values should be secure.

Fixes: https://tracker.ceph.com/issues/37503
Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #38010 from cbodley/wip-rgw-doc-reshard-syncstop

doc/rgw: update reshard design regarding 'bucket sync disable'

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #38585 from tchaikov/wip-doc-dev-errorator

doc/dev/crimson: highlight code blocks using C++ lexer

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

Merge pull request #38582 from tchaikov/wip-crimson-cleanup

crimson/osd: cleanups

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

doc/dev/crimson: quote inline codeblock using "``"

backquote is used for quoting italic typed text.

Signed-off-by: Kefu Chai <kchai@redhat.com>

doc/dev/crimson: highlight code blocks using C++ lexer

also remove redundant ":", normally "::" would suffice to start a
codeblock.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: handle error using handle_error()

no need to use safe_then() for this purpose.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: do not use __func__ in lambda

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: drop log messages only for debugging

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: do not capture dup variable

first can be deduced by variable already captured, so store it as a
local variable. it's less expensive than storing it as a captured
variable.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: do not use do_with() unless necessary

in this change, a seastar::do_with() is removed, as the captured
variables are passed to submit_push_data() by value. so no need to keep
them alive after the call.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: let trim_pushed_data() return extents

trim_pushed_data() is responsible for building up the extents to be used
for pushing. so let it return the extents.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: use range-based for loop

also add comment explaining
ReplicatedRecoveryBackend::trim_pushed_data()

and move the definition of local variable closer to where it is used.

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #38539 from dillaman/wip-48526

librbd/object_map: don't assert if a snapshot doesn't exist

Reviewed-by: Mykola Golub <mgolub@suse.com>

crimson/net: abort on-going v1 protocol when closed

Fixes: http://tracker.ceph.com/issues/48108
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

crimson/net: track closing connections for v1

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

crimson/net: report unexpected exceptions during closing

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

crimson/net: assert connection gate is not unexpectedly closed

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

crimson/net: fix test error report

Report unexpected exceptions before destructing the tests.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

Merge pull request #38570 from rzarzynski/wip-crimson-recover_missing-noopt

crimson/osd: recover_missing() doesn't return std::optional anymore.

Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #38569 from tchaikov/wip-crimson-cleanups

crimson/osd: cleanups

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Xuehan Xu <xxhdx1985126@gmail.com>

Merge pull request #38525 from varshar16/wip-ls-nfs-services

mgr/rook: Fix various 'orch ls' issues

Reviewed-by: Travis Nielsen <tnielsen@redhat.com>

Merge pull request #38557 from pcuzner/bootstrap-allocate-output-dir

cephadm: create default output dir during bootstrap

Reviewed-by: Tim Serong <tserong@suse.com>

Merge pull request #38577 from athanatos/sjust/wip-fix-crimson-nbd

crimson/tools: fix bugs introduced in 3333ff

Reviewed-by: Kefu Chai <kchai@redhat.com>

mgr/dashboard: new generic HTTP error page component

Added a generic Error component for HTTP Errors such as 404,403,501

Fixes:https://tracker.ceph.com/issues/39128
Signed-off-by: Aashish Sharma <aasharma@redhat.com>

crimson/onode-staged-tree: fix match_stage_t related compile issue

Change the type to int8_t for potential negative value when
substantiating the templates.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>

crimson/tools: fix bugs introduced in 3333ff

You can't actually mix buffered and direct io on a stream.

Signed-off-by: Samuel Just <sjust@redhat.com>

Merge pull request #38572 from rzarzynski/wip-crimson-obc-not-blocker

crimson/osd: ObjectContext is not a Blocker anymore.

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #38563 from tchaikov/wip-admin-breathe

admin/doc-requirements.txt: require breathe >= 4.20

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #38567 from rzarzynski/wip-doc-dev-errorator

doc/dev/crimson: exemplify errorator usage in error-handling.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>

messages,osd,crimson: let MOSDPGPull::take_pulls() return pulls

so the caller can grab the pulls without creating a pull vector first.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: let build_push_op() return PushOp

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #38111 from ronen-fr/wip-ronenf-scrub-v2

osd: Extracting scrub-related code from the PG & friends

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

rbd-mirror: validate that remote start snapshot still exists

Perform a basic sanity check to verify that the remote start snapshot
still exists. This was previosly being deleted as part of the unlink
process due to a race condition between the remote side completing
a sync between snapshots 1 and 2 and snapshot 2 being unlinked due
to reaching max snapshots.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #38566 from tchaikov/crimson-tools

crimson/tools: use helpers from byteorder.hh

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #38565 from tchaikov/wip-crimson-cmake

cmake: add alien::cflags and move SubProcess.cc into crimson-alien-common

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

cephadm: update permissions on newly created dirs

Use 755 instead of 700 on new directories created during
bootstrap

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>

crimson/osd: ObjectContext is not a Blocker anymore.

This is a follow-up to the c2dc437f78cd8be393c4d2eb8d79ce9c351ec4de
which removes unused OBC mebers after the with_lock() transition.

I'm not sure there is a reason to keep the `Blocker` bits as all
`ObjectContext::dump_detail()` does is just dumping `object_state_t`
while entering the OBC stage is already denoted by `PGPipeline::get_obc`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

crimson/osd: recover_missing() doesn't return std::optional anymore.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

cmake: add "alien::cflags" library

which exposes the definitions needed for building alienized bluestore
and the shared facilities compiled with -DWITH_ALIEN and -DWITH_SEASTAR

Signed-off-by: Kefu Chai <kchai@redhat.com>

cmake: move SubProcess.cc from crimson-common to crimson-alien-common

SubProcess is used by blkdev.cc only

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: let prep_push() return a map of PushOp

ReplicatedRecoveryBackend::prep_push() is responsible for building
PushOps, so it's more natural to let it return a map of PushOp.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: move unrelated continuation out of do_with()

if the variables held by do_with() is not used by the continuation, and
the continuation does not depend on the other continuations called in
the do_with(), let's move it out for smaller lexical scope. and hence
better readability.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: mark const method "const"

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: pass vector<pg_shard_t> for recovery

std::list<std::map<pg_shard_t, pg_missing_t>::const_iterator> is
difficult to parse and understand. and what we need is no more than a
collection of pg_shard_t here. we do the look in
ReplicatedRecoveryBackend::prep_push() again anyway.

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: use range-based for loop

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: do not return unused value

do not return a bool from
`ReplicatedRecoveryBackend::maybe_pull_missing_obj()` anymore, as the
caller does not check it at all.

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #36146 from rhcs-dashboard/wip-46577-master

mgr: add types to MODULE_OPTIONS

Reviewed-by: p-se <pseidensal@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: sebastian-philipp <swagner@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #38406 from votdev/issue_48438_drop_rgw_instance

mgr/dashboard: Drop invalid RGW client instances, improve logging

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>

doc/dev/crimson: exemplify errorator usage in error-handling.rst

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

doc/dev/crimson: add error-handling.rst

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #37642 from alimaredia/wip-rgw-apache-log-timestamp-change

rgw: add request time into beast log instead of current time

vstart: add jaeger option + misc refactoring

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #38559 from xxhdx1985126/wip-crimson-bug-fix

crimson/osd: fix two bugs

Reviewed-by: Kefu Chai <kchai@redhat.com>

crimson/tools: use helpers from byteorder.hh

simpler this way

Signed-off-by: Kefu Chai <kchai@redhat.com>

crimson/osd: recovery read lock should be held across the hole object push phase

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

mgr/dashboard: Drop invalid RGW client instances, improve logging

* Log RGW settings for easier problem tracking.
* Drop RGW client instances that do not exist anymore. This happens when a RGW service is removed via the orchestrator. The Dashboard tries to access the RGW client using the previous settings which leads to an error which might be confusing. Without dropping the error message 'RGW REST API failed request ...' is displayed instead of the correct one 'No RGW found'. Dropping the RGW client instance will produce correct error messages the next time the backend tries to establish a new connection.

Fixes: https://tracker.ceph.com/issues/48586
Signed-off-by: Volker Theile <vtheile@suse.com>

mgr: add types to MODULE_OPTIONS

Uses a typed Option class for MODULE_OPTIONS and replaces those in the
modules that are checked by mypy.

Fixes: https://tracker.ceph.com/issues/46577
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>

admin/doc-requirements.txt: require breathe >= 4.20

to be compatible with Sphinx 3.2
see https://github.com/michaeljones/breathe/tree/v4.20.0#change-log

Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #37047 from sebastian-philipp/doc-cephadm-rm-host

doc/cephadm: Add remove host to operations

Reviewed-by: Zac Dover <zac.dover@gmail.com>

crimson/osd: allow obc to promote lock state from none to excl

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

cephadm: create default output dir during bootstrap

If the output dir doesn't exist the old behaviour was to
abort bootstrap. Since we're running with UID=0, this
patch will create the missing dirs for the user to keep the
bootstrap process going

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>

Merge pull request #38545 from tchaikov/wip-crimson-test-errorator

test/crimson: add a test to verify that errorator does not copy

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

test/crimson: add a test to verify that errorator does not copy

Signed-off-by: Kefu Chai <kchai@redhat.com>

test/crimson: move member variable into test

so the test is more self-contained.

Signed-off-by: Kefu Chai <kchai@redhat.com>