qa/workunits/rbd: use https protocol for devstack git operations

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

Merge pull request #27740 from ifed01/wip-ifed-fix-39446

nautilus: os/bluestore: fix out-of-bound access in bmap allocator.

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

Merge pull request #27803 from pdvian/wip-39205-nautilus

nautilus: osd: shutdown recovery_request_timer earlier

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #28065 from yuriw/wip-yuriw-fix-distros-nautilus

qa/tests: cleaned up supported distro for nautilus

qa/tests: cleaned up supported disto for nautilus

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #27608 from liewegas/wip-38157-nautilus

nautilus: mgr/progress: behave if pgs disappear (due to a racing pg merge)

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #27654 from neha-ojha/wip-38881-nautilus

nautilus: osd/PG: skip rollforward when !transaction_applied during append_log()

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #27854 from smithfarm/wip-39504-nautilus

nautilus: core: Give recovery for inactive PGs a higher priority

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

Merge pull request #27857 from ashishkumsingh/wip-39465-nautilus

nautilus: msg: output peer address when detecting bad CRCs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #27939 from pdvian/wip-39308-nautilus

nautilus: mgr/ActivePyModules: handle_command - fix broken lock

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #27642 from LenzGr/nautilus-documentation

nautilus: doc: Backported dashboard documentation changes

Merge pull request #27936 from dillaman/wip-39450-nautilus

nautilus: librbd: re-add support for nautilus clients talking to jewel clusters

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

Merge pull request #28046 from neha-ojha/wip-28036-nautilus

nautilus: doc/dev/osd_internals/async_recovery: update cost calculation

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

doc/dev/osd_internals/async_recovery: update cost calculation

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 984073e44d096a3322d90b85da42c593fff94c6d)

Merge pull request #28024 from ricardoasmarques/wip-39630-nautilus

nautilus: mgr/dashboard: iSCSI GET requests should not be logged

Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #27942 from LenzGr/wip-39524-nautilus

nautilus: mgr/dashboard: make auth token work with UTC times only

mgr/dashboard: iSCSI GET requests should not be logged

Fixes: https://tracker.ceph.com/issues/39492
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 93d74cf9b9926c1638f15da6c8e6d3fd68d61831)

Merge pull request #27758 from ricardoasmarques/wip-39452-nautilus

nautilus: mgr/dashboard: iSCSI form is showing a warning

Reviewed-by: Tiago Melo <tmelo@suse.com>

nautilus: mgr/dashboard: Adapt iSCSI discovery auth for read-only users (#27759)

nautilus: mgr/dashboard: Adapt iSCSI discovery auth for read-only users

Reviewed-by: Tiago Melo <tmelo@suse.com>

nautilus: mgr/dashboard: Upgrade to ceph-iscsi config v9 (#28001)

nautilus: mgr/dashboard: Upgrade to ceph-iscsi config v9

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

mgr/dashboard: Support ceph-iscsi config v9

Fixes: https://tracker.ceph.com/issues/39147
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 1b5bf05a2ce0590f034bbbc7ae750ed478f6ffe3)

nautilus: mgr/dashboard: Make all columns sortable (#27889)

nautilus: mgr/dashboard: Make all columns sortable

Reviewed-by: Alfonso Martínez <almartin@redhat.com>

nautilus: mgr/dashboard: Buggy data table search field (#27672)

nautilus: mgr/dashboard: Buggy data table search field

Reviewed-by: Alfonso Martínez <almartin@redhat.com>

Merge pull request #27886 from rhcs-dashboard/39459-nautilus-prometheus-replace-whitespaces

nautilus: mgr/prometheus: replace whitespaces in metrics' names

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #27673 from Devp00l/wip-39371-nautilus

 nautilus: mgr/dashboard: Localization for date picker module

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

PendingReleaseNotes: librbd can open images on Jewel clusters

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

doc: Fix small typo in dashboard documentation

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 038ef6291d5f5728385683c693046f03184309fa)

doc: Improved the dashboard proxy config section

Added paragraph that explains how standby dashboard instances perform
HTTP redirections to the currently active ceph-mgr node.
Added note about current limitations (see Bug#24662 for details).

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

doc: dashboard: refined object gateway configuration

As discussed in BUG#39252, the dashboard currently does not
support all possible RGW configuration possibilities when trying
to obtain hostname and port number. Update the docs to better
reflect this.

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

doc: Updated dashboard iSCSI configuration, added labels

Added note about the requirement for the latest ceph-iscsi version
3 to the dashboard documentation. Added some doc references
and replaced some URLs in the iSCSI docs with reST labels instead.

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

librbd: re-add support for nautilus clients talking to jewel clusters

We want to support N - 3 client backward compatibility (special case
to support Jewel since it was a LTS release). The "get_snapshot_timestamp"
cls method does not exist in Jewel clusters so librbd should fallback
to excluding the op if it fails.

Note: this is a direct backport to Nautilus since Octopus (master) does not
need to support Jewel-backed clusters

Fixes: http://tracker.ceph.com/issues/39450
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #27923 from Vicente-Cheng/wip-39046-nautilus

nautilus: rgw: update resharding documentation

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #27922 from Vicente-Cheng/wip-38874-nautilus

nautilus: doc: cleanup HTTP Frontends documentation

Reviewed-by: Nathan Cutler <ncutler@suse.com>

mgr/dashboard: auth: fix user lastUpdate timestamp generation

Fixes: http://tracker.ceph.com/issues/39300
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 90f6142d6f9ecd712c6c1e7a801a87c346e17855)

mgr/ActivePyModules: handle_command - fix broken lock

by unlocking properly when module is not available.

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

Merge pull request #27791 from mogeb/wip-lvmcache-nautilus

nautilus: ceph-volume: add utility functions

Reviewed-by: Alfredo Deza <adeza@redhat.com>

Merge pull request #27687 from dzafman/wip-39389

nautilus: osd: Increase log level of messages which unnecessarily fill up logs

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed By: Xie Xingguo <xie.xingguo@zte.com.cn>

rgw: updates to resharding documentation

Some minor updates to the resharding documentation with the aim of
clarifying the language and using terms consistently.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 54b6b650eeeeac0e754bd5860cd53109ba7865bd)

doc/rgw: update civetweb rgw_frontends config example

all of these civetweb options have to be on the same line as rgw_frontends

Fixes: https://tracker.ceph.com/issues/37770
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2f16fcb2fdb8dbd917e804dec97d1be056dc1749)

Merge pull request #27899 from Vicente-Cheng/wip-39051-nautilus

nautilus: doc: add LAZYIO

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #27900 from Vicente-Cheng/wip-39176-nautilus

nautilus: doc: add documentation for "fs set min_compat_client"

Reviewed-by: Nathan Cutler <ncutler@suse.com>

doc: add doc for blacklisting older CephFS clients

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

doc: add doc for cephfs lazyio

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

Merge PR #27623 into nautilus

* refs/pull/27623/head:
qa: add crush-node-flags test
mon/OSDMonitor: remove crush node flags too on "crush rm"
mon/OSDMonitor: make per-OSD no{out,down,in,out} flags prior to CRUSH nodes
mon/OSDMonitor: osd add-no{up,down,in,out} - remove state checker
mon/OSDMonitor: respect crush node flags for can_mark_*()
osd/OSDMap: add get_crush_node_flags(int osd)
mon/OSDMonitor: make 'osd {add,rm}-{noin,noout,...}' support crush nodes
osd/OSDMap: raise OSD_FLAGS health alert for crush node flags, too
osd/OSDMap: add flags for crush nodes

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

test: osd-recovery-scrub.sh ignore error from kill_daemons()

Another work around for http://tracker.ceph.com/issues/38195

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

test: Add tests for pool recovery priority conversion

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

mgr: If the requested OSD is down don't trust osd_stat info

If we have a down AND out OSD it may contains osd_stat with num_pgs == 0.
When all PGs aren't active+clean we need an accurate value or we consider
the osd missing stat info.

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

mon, mgr: Improve PG count by changing up to up_no_acting in pg_count

By not adding a field to pg_count, we don't have to worry about
versioning or backwards compatibility.  A mixed cluster won't
be any worse than before.

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

osd: Add new object_location_counts to pg_stat_t

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

Conflicts:
src/osd/osd_types.h
- nautilus does not have 75014ceb1437c5bb48293574ec6f991e4bec64bb

mgr: Improve ok-to-stop by using the avail_no_missing for recovery

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

osd: Prevent priority from overflowing in the next base level

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

osd, mon: New pool recovery priority range -10 to 10

Use OSD_POOL_PRIORITY_MAX and OSD_POOL_PRIORITY_MIN constants
Scale legacy priorities if exceeds maximum

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

osd: For recovery track OSDs that have 0 missing to know how degraded we are

Add backfill priority log message and remove redundanacy to recovery priority

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

Conflicts:
src/osd/osd_types.h
- nautilus does not have 75014ceb1437c5bb48293574ec6f991e4bec64bb

mgr/dashboard: Make all columns sortable

Fixes: https://tracker.ceph.com/issues/39483
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit ba6d0f96dbdd2ccb4824a6377e741a9534d46287)

mgr/prometheus: replace whitespaces in metrics' names

Fixes: https://tracker.ceph.com/issues/39434
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 843802f43eaa8d0117dd2585b19ac71add3f1024)

msg: output peer address when detecting bad CRCs

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

osd: shutdown recovery_request_timer earlier

recovery_request_timer may hold some QueuePeeringEvts which PGRef,
if we dont shutdown it earlier, it potentially cause the PGRef leak
when kicking pg.

Fixes: https://tracker.ceph.com/issues/38945
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit bb41bdfdb14768b5d46b7b1334bba1a3909e2618)

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

14.2.1

ceph-volume: add test for create_lv using a PV

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 90d296b302e74b59fc67c395b4d08537e2d37a1e)

ceph-volume: update volume's tags structure when setting tags

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 4a1198deffb0baf647a6a31e03cbfe98f011ff14)

ceph-volume: add tests for tags

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit c88a6a8ad38410c60ea4945b46da6b3d458c0ff6)

ceph-volume: add tests for reduce_vg()

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 1f07776615b7bba5eacf34a8c9fa62c06a57eb4b)

ceph-volume: add tests for size_from_human_readable()

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 6e3b5306140a433667d1be95df2eba0b57d95ae9)

ceph-volume: add function to convert from a readable string to Size

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 50428062175623d561be01a8124e010a61221845)

ceph-volume: add clear_tag function for LVs

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 776d485af8b6225fd4059952df36e40ef0ad12b4)

ceph-volume: add option to specify a pv for lvcreate

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 38b2d7a66c76d9c5b1d2e00ada9503f22a7d8fb6)

ceph-volume: add reduce_vg function

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit ce0184b5d7f24f2b3b6a9491e0f3c1c847b8c0e7)

ceph-volume: look for hidden partitions when populating lvs

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
(cherry picked from commit 463091e46ba4032f1b8d90a6770fd7e2d3277a74)

Merge PR #27778 into nautilus

* refs/pull/27778/head:
tools: pin the version of breathe that works with Python2

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

tools: pin the version of breathe that works with Python2

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

mgr/dashboard: Fix iSCSI Discovery user permissions

Fixes: http://tracker.ceph.com/issues/39328
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit cf3e5bb8641a77f7dde27abf690143b79bf390c9)

mgr/dashboard: Fix iSCSI target form warning

Chrome was throwing an warning because we had multiple inputs with the same id.

Fixes: http://tracker.ceph.com/issues/39324
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit 65654c9bd17a417ecc012a5a034307cf7443ea80)

Merge PR #27709 into nautilus

* refs/pull/27709/head:
mgr/telemetry: default to reports every 24h; lower minimum
mgr/telemetry: exclude hostname field in crash reports
mgr/telemetry: change crash dict to a list

Reviewed-by: Dan Mick <dmick@redhat.com>

os/bluestore: fix out-of-bound access in bmap allocator.

Fixes: https://tracker.ceph.com/issues/39334
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit b0d2411c9c48b49fff827841c5ec6b66533d9c58)

 Conflicts:
src/os/bluestore/fastbmap_allocator_impl.h

qa: add crush-node-flags test

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

mon/OSDMonitor: remove crush node flags too on "crush rm"

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

mon/OSDMonitor: make per-OSD no{out,down,in,out} flags prior to CRUSH nodes

This way we 'll be more compatible with older versions, and can effectively
reduce the map size for large clusters.

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

mon/OSDMonitor: osd add-no{up,down,in,out} - remove state checker

The existing sanity checkers are total unnecessary, e.g, noup indicates
we should not allow the corresponding osd to boot (marked as up)
later on, which has nothing to do with the current existing osd states.

By removing these checkers, we can:
$ ceph osd add-noup osd.nnn
$ ceph osd down osd.nnn

this way we can manually mark a specific osd as down and then ensure it
will not be automatically marked as up until the specific restrictions
has been resolved.

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

mgr/telemetry: default to reports every 24h; lower minimum

Allow more frequent telemetry reports.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 712987d53337e39ad871ee7abb38c2e2755fc75d)

mgr/telemetry: exclude hostname field in crash reports

On some systems the hostname is a fully-qualified domain name and
(even when not a fqdn) may inadvertantly allow the cluster to be
identified.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4510f336562ede84a1e6e135bb3a152ab9b34543)

mgr/telemetry: change crash dict to a list

For ease of indexing.  There's no value in timestamp keys.

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

Merge PR #27701 into nautilus

* refs/pull/27701/head:
mgr/telemetry: add report_timestamp to sent reports

mgr/telemetry: add report_timestamp to sent reports

Received time may differ from report time, and correlating
to local cluster state events might be useful.

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

osd: Increase log level of messages which unnecessarily fill up logs

Caused by: 834d3c19a774f1cc93903447d91d182776e12d18

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

mgr/dashboard: Localization for date picker module

Fixes: https://tracker.ceph.com/issues/39037
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 1e4ccc4e7dcb9dc9d37d49a93174cc42a3dbcf98)

mgr/dashboard: Removes distracting search behavior

The behavior was to not search anything if the search included a
subset of a column name, with the thought in mind that the user would
like to search a specific column for a value.

Now the column name is only ignored after you typed in ':' in order to see
the data in the table again before specifying a more concrete value to
search for.

Fixes: https://tracker.ceph.com/issues/37701
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 791fa3708bdc3a1da45b6c395fde8a2b7619786e)

Merge pull request #27586 from pdvian/wip-38980-nautilus

nautilus: rgw: fix RGWDeleteMultiObj::verify_permission()

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

Merge pull request #27589 from pdvian/wip-38981-nautilus

nautilus: mgr/dashboard: Added breadcrumb tests to NFS menu

Reviewed-by: Ricardo Marques <rimarques@suse.com>

Merge pull request #27601 from pdvian/wip-38993-nautilus

nautilus: cmake/FindRocksDB: fix IMPORTED_LOCATION for ROCKSDB_LIBRARIES

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

Merge pull request #27611 from Devp00l/wip-39240-nautilus

 nautilus: mgr/dashboard: readonly user can't see any pages

Reviewed-by: Ricardo Marques <rimarques@suse.com>

Merge pull request #27602 from pdvian/wip-39015-nautilus

nautilus: rgw admin: disable stale instance deletion in multisite

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

Merge pull request #27582 from liewegas/wip-mon-subtree-runtime-nautilus

nautilus: mon: make mon_osd_down_out_subtree_limit update at runtime

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #27610 from smithfarm/wip-39325-nautilus

nautilus: ceph-objectstore-tool: rename dump-import to dump-export

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #27620 from neha-ojha/wip-39310-nautilus

nautilus: crush/CrushCompiler: Fix __replacement_assert

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge PR #27502 into nautilus

* refs/pull/27502/head:
doc/releases/nautilus: fix config update step

osd/PG: !transaction_applied is true for async_recovery_targets as well

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 71996da6be171cd310f8cae48c95bedb02f000b8)

osd/PG: change error to dout in _scan_rollback_obs()

This message is now expected during scrubbing, since we do not delete
objects during a rollforward when !transaction_applied.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit b8e62e6ee235e43e9930faf486ca8bea985c25b9)

osd/PG: skip rollforward when !transaction_applied during append_log()

Earlier, we did pg_log.roll_forward(&handler), when
!transaction_applied, which advanced the crt and trimmed the entries
in rollforward(). Due to this, during _merge_object_divergent_entries(),
when we tried to rollback entries, those objects were not found in the
backend, and thus we hit this bug http://tracker.ceph.com/issues/36739.

With this change, we are advancing the crt value, without deleting the
objects, so that _merge_object_divergent_entries() does not fail
because of deleted objects.

Fixes: http://tracker.ceph.com/issues/36739
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 17419ee39342257f5a6f41c792e8e45a8e243720)

Merge pull request #27497 from smithfarm/wip-39187-nautilus

nautilus: fs: we lack a feature bit for nautilus

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

mon/OSDMonitor: respect crush node flags for can_mark_*()

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 79f0043208f9ba2d4cf02877e6f349b8d0ce55dc)