Merge pull request #20765 from sebastian-philipp/dashboard_v2-no-detail_route

mgr/dashboard_v2: Removed unused `tools.detail_route()`

Reviewed-by: Ricardo Dias <rdias@suse.com>

Merge pull request #20772 from votdev/fix_osd_details

mgr/dashboard v2: Don't show details if multiple OSDs are selected

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge pull request #20809 from idryomov/wip-librbd-discard-create-truncate

librbd: create+truncate for whole-object layered discards

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

Merge pull request #20243 from ceph/wip-cd-volume-entry

qa/tests: add openstack volume info + lvs for ceph-volume

Merge pull request #20826 from liewegas/wip-fix-mstart-config

vstart.sh: fix mstart variables

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

Merge pull request #20819 from ygtzf/wip-install-deps

install-deps.sh: fix an error condition expression

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

Merge pull request #20419 from tchaikov/wip-22748

common/config: add units to options

Reviewed-by: John Spray <john.spray@redhat.com>

vstart.sh: use proper variables for ceph.conf and dev dir

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

Merge pull request #20805 from Devp00l/refresh-rotate

mgr/dashboard_v2: Rotate the refresh icon on load

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

Merge pull request #20788 from xiexingguo/wip-balancer-04

pybind/mgr/balancer: two more fixes

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

Merge pull request #20791 from guzhongyan/fix-pycmd

pybind/ceph_argparse: accept flexible req

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

Merge pull request #20787 from ceph/wip-rm23260

ceph-volume fix filestore OSD creation after mon-config changes

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

Merge pull request #20813 from smithfarm/wip-make-dist-suse

Revert "make-dist: add OBS-specific release suffix on SUSE"

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

Merge pull request #20682 from dillaman/wip-22960

librbd: abstract hard-coded journal and cache hooks on IO path

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

Merge pull request #20815 from capri1989/get-packages-luminous-update

doc: Updated the get-packages.rst to luminous

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

mgr/dashboard v2: Don't show details if multiple OSDs are selected

Signed-off-by: Volker Theile <vtheile@suse.com>

Merge pull request #20747 from votdev/add_required_directive

mgr/dashboard v2: Add CSS class for required form fields

Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

install-deps.sh: fix an error condition expression

Signed-off-by: Yao Guotao <yaoguot@gmail.com>

librbd: create+truncate for whole-object layered discards

A whole-object layered discard is implemented as a truncate rather
than a delete: a dummy object is needed to prevent the CoW machinery
from kicking in.  However, a truncate on a non-existent object is
a no-op.  If the object doesn't exist in HEAD, a discard request is
effectively ignored -- parent blocks are still seen afterwards.

A non-exclusive create on an existing object is also a no-op, so the
fix is to do a compound create+truncate instead.

Fixes: http://tracker.ceph.com/issues/23285
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

mgr/dashboard_v2: Refactored `RESTControllerTest`:

* Made `RESTControllerTest` inherent from `ControllerTestCase`
* Refactored `ControllerTestCase`
* Simplified all tests that inherent from  `ControllerTestCase`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

mgr/dashboard_v2: Removed unused `tools.detail_route()`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

Updated the get-packages.rst to luminous

Signed-off-by: Kai Wagner <kwagner@suse.com>

common/options: consolidate Option::to_str() with operator<<

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

test: add a simple test for conf_get() and conf_set()

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

common/options,mon: switch some option to TYPE_SECS

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

common/config: specialize the settings for time duration

because of the ADL, boost::detail::variant::printer is not able to find
operator<<(ostream&, chrono::seconds) even the latter is defined. so we
need to define our own printer. and print_value() function, so it can be
used out of the compilation unit.

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

common/options: switch some cephfs settings to TYPE_SIZE

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

common/options: switch some rbd settings to TYPE_SIZE

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

common/options: switch some rgw options to TYPE_SIZE

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

common/options: switch some osd settings to TYPE_SIZE

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

common/options: switch some mon options to TYPE_SIZE

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

common/config: specialize the settings for size

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

Merge pull request #20745 from Liuchang0812/jsonify-pool-get

mon: invalid JSON returned when querying pool parameters

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

Merge pull request #20775 from tspmelo/fix-iscsi-unit-test

mgr/dashboard_v2: add mocked service provider for TcmuIscsiService

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

pybind/ceph_argparse: accept flexible req
True and true both acceptable

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>

Merge pull request #20778 from p-na/wip-mgr-fix-dashboard-backend-tests

mgr/dashboard: Fix backend tests for newer CherryPy versions

Reviewed-by: Ricardo Dias <rdias@suse.com>

Merge pull request #20782 from sebastian-philipp/dashboard_v2_fix_config_options_endpoint

mgr/dashboard_v2: Fix test_cluster_configuration test

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #20786 from dzafman/wip-zafman-log-trim

tools/ceph-objectstore-tool: command to trim the pg log

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

Revert "make-dist: add OBS-specific release suffix on SUSE"

This reverts commit ca6c92b3ec2f715cf247e9c1009d315d9de9c55a.

The OBS-specific suffix potentially causes trouble when building outside of
OBS. Also, the OBS build process already includes a spec-file munging step
where this can be done.

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

tools: Add pg log trim command to ceph-objectstore-tool

Add test script that verifies the command in qa/standalone/osd

Fixes: http://tracker.ceph.com/issues/23242
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>

Merge pull request #20769 from oritwas/wip-rgw-20448

rgw: fix crash with rgw_run_sync_thread false

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

ceph-volume tests verify that mkfs filestore uses default flags

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

ceph-volume lvm.prepare pass the cephx_secret for mkfs in filestore

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

ceph-volume util.prepare use keyfile from stdin for mkfs in filestore

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

Merge pull request #20590 from hitoshikamei/rbd-bench

rbd: fix thread_offsets calculation of rbd bench

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

Merge pull request #20689 from Songweibin/wip-23038

rbd/test: add snap protection test for ex/import

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

Merge pull request #20697 from Songweibin/wip-trash-rm

rbd: allow trash rm/purge when pool quota is full used

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

Merge pull request #20795 from Songweibin/wip-fix-trash

rbd: pool_percent_used should not divided by 100

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

Merge pull request #20759 from dzafman/wip-cleanup

test: Make clearer by moving code out of loop

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

Merge pull request #20801 from theanalyst/dashboard-build-typo

cmake: typo fix when npm is not found

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

test/librbd: expect_object_may_exist(..., false) in DiscardRemoveTruncate

This is !is_no_op_for_nonexistent_object() test -- NONEXISTENT case is
the interesting one.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

test/librbd: clone with parent features in DiscardRemoveTruncate

... otherwise object map expectations aren't actually set.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

mgr/dashboard v2: Add CSS class for required form fields

Signed-off-by: Volker Theile <vtheile@suse.com>

dashboard: cmake: typo fix when npm is not found

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #20390 from theanalyst/rgw/openssl-init

rgw: setup locks for libopenssl

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jesse Williamson <jwilliamson@suse.de>
Reviewed-by: Marcus Watts <mwatts@redhat.com>

Merge pull request #20649 from tianshan/rgw_datalog_list

rgw: datalog list support --shard-id and --marker

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

Merge pull request #20686 from fangyuxiangGL/mcc

rgw: fix 'copy part' without 'x-amz-copy-source-range' when compression enabled

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

Merge pull request #20707 from Liuchang0812/rgw-es-plugin-urlencode

rgw: url_encode key name and instance in es sync module

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #20756 from cbodley/wip-qa-rgw-verify-combine

qa/rgw: combine swift, s3tests, ragweed into single verify task

Reviewed-by: Vasu Kulkarni <vasu@redhat.com>

mgr/dashboard_v2: Rotate the refresh icon on load

The refresh icon of the data table will now rotate on loading events.

Signed-off-by: Stephan Müller <smueller@suse.com>

Merge pull request #20767 from xiexingguo/wip-pg-delete

osd/OSD: batch-list objects to reduce memory consumption

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

Merge pull request #20764 from chenyupeng360/master

msg/async: size of EventCenter::file_events should be greater than fd

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

Merge pull request #20740 from Songweibin/wip-skip-logical-devices

osd: skip dumping logical devices

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #20743 from rjfd/wip-dashboard-settings

mgr/dashboard_v2: Configuration settings support

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #20727 from linuxbox2/wip-clang-5

bluestore: define default value of LoglevelV only once (3 templates)

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

Merge pull request #20711 from guzhongyan/mgr-nodels

mon: 'node ls' mgr support

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #20706 from xiexingguo/wip-balancer-03

pybind/mgr/balancer: fix pool-deletion vs auto-optimization race

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

Merge pull request #20704 from xiexingguo/wip-balancer-02

mon/OSDMonitor: kill pending upmap changes too if pool is gone

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

Merge pull request #20703 from xiexingguo/wip-balancer-01

osd/OSDMap: ignore PGs from pools of failure-domain OSD

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

Merge pull request #20644 from jcsp/wip-23166

mgr/prometheus: skip OSD output if missing from CRUSH devices

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #20773 from idryomov/wip-krbd-include-sysmacros

krbd: include sys/sysmacros.h for major, minor and makedev

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

Merge pull request #20750 from idryomov/wip-krbd-whole-object-discard-test

qa: krbd whole-object-discard test

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

Merge pull request #20755 from LenzGr/mgr-dashboard-documentation

doc: Updated dashboard v2 feature list

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #20792 from yangdongsheng/krbd_osd_request_timeout

rbd: support osd_request_timeout in rbd map command

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>

rbd: support osd_request_timeout in rbd map command

Default of osd_request_timeout in krbd is 0 means no timeout,
but we sometimes need to set this value by rbd command. then
pass osd_request_timeout to kernel rbd in rbd mapping.

Fixes: http://tracker.ceph.com/issues/23073
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

rbd: pool_percent_used should not divided by 100

The value of 'percent_used' in `ceph df --format=json`
has already been divided by 100.

Signed-off-by: songweibin <song.weibin@zte.com.cn>

pybind/mgr/balancer: sanity check against empty roots

To avoid crashes as below:
```
File "/usr/lib/ceph/mgr/balancer/module.py", line 181, in calc_stats
    score += target[k] * (math.erf(((adjusted - avg)/avg) / math.sqrt(2.0)))
ZeroDivisionError: float division by zero
```

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

pybind/mgr/balancer: s/iteritems/iterkeys/

We don't care about the values here.

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

Merge pull request #20729 from dillaman/wip-22738

qa/suites/rbd: segregated v1 image format tests

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

Merge PR #20705 into master

* refs/pull/20705/head:
doc: Fix -d description in ceph-fuse

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

librbd: discard from cache after committed to disk

This prevents a possible race condition with readahead racing with a
discard and re-populating the cache with non-zeroed data.

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

librbd: moved skip partial discard logic to object request

This allows the journal object dispatch layer to properly complete
skipped extents and commit the associated event.

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

librbd: avoid potential for lock inversion in journal IO replay

If an IO replay immediately fails due to a image shrink applied after
the IO, the lock order will be incorrect.

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

librbd: reduce lock scope on copy-on-read IO path

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

librbd: removed legacy object cacher hooks

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

rbd-mirror: corrected implicitly included dout header

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

librbd: removed legacy journal event tracking hooks from IO path

The new journal object dispatch layer handles delaying writes to the
OSD until the journal event is safe. This avoid the need for two
different code paths for cache and non-cache case.

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

librbd: removed object cacher hooks from IO image request

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

librbd: removed object cacher hooks from IO object request

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

librbd: integrate object cacher writeback handler with dispatcher

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

librbd: switch to new object dispatcher-based cache hooks

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

librbd: pass image flush requests to object dispatcher

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

librbd: include flush source in image dispatch spec

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

librbd: wrap a object dispatcher facade around object cacher

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

librbd: added object dispatch handler for journal IO

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

librbd: switch to object IO requests to dispatcher interface

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

mgr/dashboard_v2: removed unused code that broke teuthology

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

mgr/dashboard: Added instructions on how to add config settings to HACKING

Signed-off-by: Ricardo Dias <rdias@suse.com>

mgr/dashboard: added settings module

Signed-off-by: Ricardo Dias <rdias@suse.com>

common/config: Fix dumping of `md_config_t::config_options`.

Caused by 49a5e775aa92a8218bb659909de20637d5aa660a

This fixes the dashboard_v2 `cluster_conf` endpoint.

Fixes: http://tracker.ceph.com/issues/23265
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>