]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agorbd/status: get image cache state 36466/head
lixiaoy1 [Fri, 7 Aug 2020 09:11:20 +0000 (05:11 -0400)]
rbd/status: get image cache state

Signed-off-by: Peterson, Scott <scott.d.peterson@intel.com>
Signed-off-by: Li, Xiaoyan <xiaoyan.li@intel.com>
Signed-off-by: Lu, Yuan <yuan.y.lu@intel.com>
Signed-off-by: Chamarthy, Mahati <mahati.chamarthy@intel.com>
4 years agoMerge pull request #36538 from zdover23/wip-docs-45678-fix
Sebastian Wagner [Mon, 10 Aug 2020 23:15:54 +0000 (01:15 +0200)]
Merge pull request #36538 from zdover23/wip-docs-45678-fix

doc/cephadm: Remove shell alias

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge PR #36221 into master
Patrick Donnelly [Mon, 10 Aug 2020 20:40:36 +0000 (13:40 -0700)]
Merge PR #36221 into master

* refs/pull/36221/head:
client: switch lock_guard to scoped_lock
client: remove useless unsafe_sync_write
client: make the root member under the client_lock
client: add mount/initialize states support and convert to RWRef
client: add RWRef support

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36487 into master
Patrick Donnelly [Mon, 10 Aug 2020 19:55:56 +0000 (12:55 -0700)]
Merge PR #36487 into master

* refs/pull/36487/head:
mds: avoid calling g_conf().get_val() in MDSRank::heartbeat_reset()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36522 from kalebskeithley/rgw_rados_h
kalebskeithley [Mon, 10 Aug 2020 19:52:05 +0000 (15:52 -0400)]
Merge pull request #36522 from kalebskeithley/rgw_rados_h

rgw: remove unnecessary #include "rgw_rados.h"

4 years agoMerge PR #32731 into master
Patrick Donnelly [Mon, 10 Aug 2020 19:47:47 +0000 (12:47 -0700)]
Merge PR #32731 into master

* refs/pull/32731/head:
mgr/mds_autoscaler: plugin to configure mds instances

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #35161 into master
Patrick Donnelly [Mon, 10 Aug 2020 19:46:38 +0000 (12:46 -0700)]
Merge PR #35161 into master

* refs/pull/35161/head:
mgr/mgr_module: metadata is fetched async
mgr/status: metadata is fetched async

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36548 from votdev/fix_colors
Yuri Weinstein [Mon, 10 Aug 2020 19:46:05 +0000 (12:46 -0700)]
Merge pull request #36548 from votdev/fix_colors

mgr/dashboard: correct color names which are not defined

Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agomgr/dashboard: correct color names which are not defined 36548/head
Volker Theile [Mon, 10 Aug 2020 16:25:02 +0000 (18:25 +0200)]
mgr/dashboard: correct color names which are not defined

Fix regression introduced by https://github.com/ceph/ceph/pull/35954.
Rename some color names that have been changed by the mentioned PR.

Signed-off-by: Volker Theile <vtheile@suse.com>
4 years agoMerge PR #36547 into master
Patrick Donnelly [Mon, 10 Aug 2020 16:48:00 +0000 (09:48 -0700)]
Merge PR #36547 into master

* refs/pull/36547/head:
client: add on space before the inode info

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #34869 from linuxbox2/wip-reset-stats2
J. Eric Ivancich [Mon, 10 Aug 2020 15:46:28 +0000 (11:46 -0400)]
Merge pull request #34869 from linuxbox2/wip-reset-stats2

rgw: introduce safe user-reset-stats

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #35316 from cbodley/wip-45771
J. Eric Ivancich [Mon, 10 Aug 2020 15:43:19 +0000 (11:43 -0400)]
Merge pull request #35316 from cbodley/wip-45771

rgw: fix shutdown crash in RGWAsyncReadMDLogEntries

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>
4 years agoMerge pull request #35597 from soumyakoduri/http_client_fix
J. Eric Ivancich [Mon, 10 Aug 2020 15:41:24 +0000 (11:41 -0400)]
Merge pull request #35597 from soumyakoduri/http_client_fix

rgw: Empty reqs_change_state queue before unregistered_reqs

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #36015 from cbodley/wip-46456
J. Eric Ivancich [Mon, 10 Aug 2020 15:40:28 +0000 (11:40 -0400)]
Merge pull request #36015 from cbodley/wip-46456

cls/rgw: preserve olh entry's name on last unlink

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #36516 from tchaikov/wip-crimson-parse-conffile
Kefu Chai [Mon, 10 Aug 2020 15:37:28 +0000 (23:37 +0800)]
Merge pull request #36516 from tchaikov/wip-crimson-parse-conffile

crimson/common: read conf file in async

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #36069 from mkogan1/wip-fix-endpoint-not-connected-r1
J. Eric Ivancich [Mon, 10 Aug 2020 15:36:58 +0000 (11:36 -0400)]
Merge pull request #36069 from mkogan1/wip-fix-endpoint-not-connected-r1

rgw: improve scheduler log

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
4 years agoMerge pull request #35792 from thmour/theo_rgw_url_test
J. Eric Ivancich [Mon, 10 Aug 2020 15:34:43 +0000 (11:34 -0400)]
Merge pull request #35792 from thmour/theo_rgw_url_test

rgw: fix double slash (//) killing the gateway

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
4 years agoMerge pull request #36082 from winndows/superfluous_break3
J. Eric Ivancich [Mon, 10 Aug 2020 15:32:47 +0000 (11:32 -0400)]
Merge pull request #36082 from winndows/superfluous_break3

rgw: Remove superfluous breaks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36084 from winndows/superfluous_break9
J. Eric Ivancich [Mon, 10 Aug 2020 15:32:02 +0000 (11:32 -0400)]
Merge pull request #36084 from winndows/superfluous_break9

rgw: Remove superfluous breaks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36092 from Huber-ming/dump_RGWLifecycleConfiguration
J. Eric Ivancich [Mon, 10 Aug 2020 15:27:12 +0000 (11:27 -0400)]
Merge pull request #36092 from Huber-ming/dump_RGWLifecycleConfiguration

rgw: dump transitions in RGWLifecycleConfiguration::dump()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36264 from theanalyst/rgw/bucket-not-impl
J. Eric Ivancich [Mon, 10 Aug 2020 15:07:55 +0000 (11:07 -0400)]
Merge pull request #36264 from theanalyst/rgw/bucket-not-impl

rgw: s3: mark bucket encryption as not implemented

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #36303 from theanalyst/rgw/empty-princ-policy
J. Eric Ivancich [Mon, 10 Aug 2020 15:06:27 +0000 (11:06 -0400)]
Merge pull request #36303 from theanalyst/rgw/empty-princ-policy

rgw: policy: reuse eval_principal to evaluate the policy principal

Reviewed-by: Pritha Srivastava <prsivas@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
4 years agoMerge pull request #35954 from SchoolGuy/dashboard/bootrapify
Lenz Grimmer [Mon, 10 Aug 2020 14:55:20 +0000 (16:55 +0200)]
Merge pull request #35954 from SchoolGuy/dashboard/bootrapify

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agocrimson/common: read conf file in async 36516/head
Kefu Chai [Fri, 7 Aug 2020 08:54:04 +0000 (16:54 +0800)]
crimson/common: read conf file in async

otherwise seastar's stall detector could complain, if the task takes too
long to complete.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocommon/config: extract md_config_t::parse_buffer()
Kefu Chai [Fri, 7 Aug 2020 08:53:02 +0000 (16:53 +0800)]
common/config: extract md_config_t::parse_buffer()

so we can reuse it in crimson.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocommon/ConfUtils: expose parse_buffer()
Kefu Chai [Fri, 7 Aug 2020 08:49:58 +0000 (16:49 +0800)]
common/ConfUtils: expose parse_buffer()

so it can be used by crimson for reading settings from a conf file.
crimson reads file with async read. since we already have a specialized
ConfigProxy for crimson, it'd be simpler to expose the shared facility
from ConfUtils instead of specializing it in ConfUtils.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: use "ceph" for default cluster_name
Kefu Chai [Fri, 7 Aug 2020 08:28:30 +0000 (16:28 +0800)]
crimson/osd: use "ceph" for default cluster_name

for couple reasons:

* to avoid the pain to guess / update the cluster name when loading
  conf file. in the past, we use "ceph" as a fallback for the cluster
  name, which is in turn used as a meta name when expanding setting
  values containing "$cluster". so to ensure those settings continue
  working, we have to at least set cluster_name a safe value, and
  "ceph" is what we've been using.
* in
  http://lists.ceph.com/pipermail/ceph-users-ceph.com/2017-June/018519.html,
  we decided to drop the cluster_name support in deploy tools, and to
  keep this feature in code. so in the long run, we can assume
  new clusters will be all named "ceph".
* it's difficult to properly implement the feature to use "ceph",
  if no --conf option is specified, as, in Ceph, even the path pointing
  to conf file is allowed to contain "$cluster". so, to get it
  right, we need to update cluster name stored in options before
  reading the option files, this forces us to populate the setting
  twice when reading the settings from a conf file. or we could
  specialize the process, but i don't think it worthy of the
  efforts.

so i think we can just use "ceph" for the cluster name in crimson.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/common: move ConfigProxy::parse_config_files() into .cc
Kefu Chai [Thu, 6 Aug 2020 08:08:40 +0000 (16:08 +0800)]
crimson/common: move ConfigProxy::parse_config_files() into .cc

prepare for a proper async version, which will be a little bit more
complicated than the existing one, so better off moving it into .cc file.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoclient: add on space before the inode info 36547/head
Xiubo Li [Mon, 10 Aug 2020 13:47:00 +0000 (21:47 +0800)]
client: add on space before the inode info

Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge pull request #36150 from rhcs-dashboard/fix-45414-master
Lenz Grimmer [Mon, 10 Aug 2020 13:46:13 +0000 (15:46 +0200)]
Merge pull request #36150 from rhcs-dashboard/fix-45414-master

mgr/dashboard: Improve notification badge

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agomgr/dashboard: Add a paragraph for the future Bootstrap 4 35954/head
Enno Gotthold [Fri, 31 Jul 2020 15:20:56 +0000 (17:20 +0200)]
mgr/dashboard: Add a paragraph for the future Bootstrap 4

Fixes: https://tracker.ceph.com/issues/46382
Signed-off-by: Enno Gotthold <egotthold@suse.de>
4 years agomgr/dashboard: SCSS: Replaced usage of baseclass with specific
Enno Gotthold [Tue, 4 Aug 2020 14:58:38 +0000 (16:58 +0200)]
mgr/dashboard: SCSS: Replaced usage of baseclass with specific

The SCSS class cd-col-form-label is the specific and correct class to use. Previously sometimes the class col-form-label was used.

Fixes: https://tracker.ceph.com/issues/46382
Signed-off-by: Enno Gotthold <egotthold@suse.de>
4 years agomgr/dashboard: SCSS cleanup
Enno Gotthold [Mon, 29 Jun 2020 11:46:06 +0000 (13:46 +0200)]
mgr/dashboard: SCSS cleanup

Removes unnecessary variables and uses already existing bootstrap variables instead.

Also we removed uneffective SCSS, as well as moved the Navtabs SCSS code into a module Bootstrap style

Last but not least we cleaned up toast & tooltip SCSS.

Fixes: https://tracker.ceph.com/issues/46382
Signed-off-by: Sebastian Krah <skrah@suse.com>
Signed-off-by: Enno Gotthold <egotthold@suse.de>
4 years agorgw: remove unnecessary #include "rgw_rados.h" 36522/head
Kaleb S. KEITHLEY [Fri, 7 Aug 2020 21:27:55 +0000 (17:27 -0400)]
rgw: remove unnecessary #include "rgw_rados.h"

rgw_rados.h not needed for compile

see https://tracker.ceph.com/issues/46880

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
4 years agoMerge pull request #36399 from jhgorrell/harley/add-missing-laggy-state-1
Kefu Chai [Mon, 10 Aug 2020 09:58:36 +0000 (17:58 +0800)]
Merge pull request #36399 from jhgorrell/harley/add-missing-laggy-state-1

mgr: Add missing states to PG_STATES in mgr_module.py.

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36424 from ghyer/ghyer-MonOpRequest
Kefu Chai [Mon, 10 Aug 2020 09:56:25 +0000 (17:56 +0800)]
Merge pull request #36424 from ghyer/ghyer-MonOpRequest

mon: add "duration" field for monitors' operation log.

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
4 years agoMerge pull request #36499 from tchaikov/wip-redirect-stderr
Kefu Chai [Mon, 10 Aug 2020 09:34:44 +0000 (17:34 +0800)]
Merge pull request #36499 from tchaikov/wip-redirect-stderr

qa/tasks/ceph: redirect stderr for crimson flavor

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #34289 from Synesis-LLC/pool_stats_pg_merge
Kefu Chai [Mon, 10 Aug 2020 09:29:13 +0000 (17:29 +0800)]
Merge pull request #34289 from Synesis-LLC/pool_stats_pg_merge

mgr: decrease pool stats if pg was removed

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #33299 from joscollin/wip-fix-releases
Kefu Chai [Mon, 10 Aug 2020 09:25:45 +0000 (17:25 +0800)]
Merge pull request #33299 from joscollin/wip-fix-releases

src/: fixed error message

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agodoc/cephadm: Remove shell alias 36538/head
Sebastian Wagner [Mon, 27 Jul 2020 14:44:33 +0000 (16:44 +0200)]
doc/cephadm: Remove shell alias

Turns out, the alias doesn't work for files.

Fixes: https://tracker.ceph.com/issues/46701
Fixes:

```
$ ceph orch apply -i myfile.yaml
ERROR: no such file or directory: myfile.yaml
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #36520 from rzarzynski/wip-crimson-dissect-pgopsexecuter
Kefu Chai [Mon, 10 Aug 2020 05:43:35 +0000 (13:43 +0800)]
Merge pull request #36520 from rzarzynski/wip-crimson-dissect-pgopsexecuter

crimson/osd: dissect PgOpsExecuter from OpsExecuter

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36497 from sebastian-philipp/mgr-cephadm-entity-newtype
Sebastian Wagner [Mon, 10 Aug 2020 00:43:43 +0000 (02:43 +0200)]
Merge pull request #36497 from sebastian-philipp/mgr-cephadm-entity-newtype

mgr/cephadm: Some more typing

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agocrimson/osd: rename execute_{osd,pg}_op() in OpsExecuters. 36520/head
Radoslaw Zarzynski [Sun, 9 Aug 2020 22:46:25 +0000 (00:46 +0200)]
crimson/osd: rename execute_{osd,pg}_op() in OpsExecuters.

The reason for renaming is the duplicating the information
already present in the classes' names.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: simplify PgOpsExecuter and impove const-correctness.
Radoslaw Zarzynski [Fri, 7 Aug 2020 16:50:24 +0000 (18:50 +0200)]
crimson/osd: simplify PgOpsExecuter and impove const-correctness.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: reorder definitions in ops_executer.cc.
Radoslaw Zarzynski [Fri, 7 Aug 2020 16:27:54 +0000 (18:27 +0200)]
crimson/osd: reorder definitions in ops_executer.cc.

The idea here is to move `OpsExecuter::execute_osd_op()`
closer to other method definitions of this class

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: dissect PgOpsExecuter from OpsExecuter.
Radoslaw Zarzynski [Fri, 7 Aug 2020 15:55:32 +0000 (17:55 +0200)]
crimson/osd: dissect PgOpsExecuter from OpsExecuter.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #36500 from tchaikov/wip-crimson-checksum
Kefu Chai [Sat, 8 Aug 2020 01:51:46 +0000 (09:51 +0800)]
Merge pull request #36500 from tchaikov/wip-crimson-checksum

crimson/osd: support checksum op and chop off consumed chunk from indata.

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #36492 from ricardoasmarques/prevent-unnecessary-ssh-reconfiguration
Sebastian Wagner [Fri, 7 Aug 2020 19:42:45 +0000 (21:42 +0200)]
Merge pull request #36492 from ricardoasmarques/prevent-unnecessary-ssh-reconfiguration

mgr/cephadm: Prevent unnecessary SSH reconfiguration

4 years agoMerge pull request #36481 from tchaikov/wip-remove-BatchWorkQueue
Kefu Chai [Fri, 7 Aug 2020 16:57:58 +0000 (00:57 +0800)]
Merge pull request #36481 from tchaikov/wip-remove-BatchWorkQueue

common/WorkQueue: remove unused BatchWorkQueue

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
4 years agoMerge pull request #36488 from lxbsz/librados
Jason Dillaman [Fri, 7 Aug 2020 12:42:29 +0000 (08:42 -0400)]
Merge pull request #36488 from lxbsz/librados

librados: add LIBRADOS_SUPPORTS_GETADDRS support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #36480 from wjwithagen/wjw-fix-scope-ParentCacheObjectDispatch.cc
Jason Dillaman [Fri, 7 Aug 2020 12:40:08 +0000 (08:40 -0400)]
Merge pull request #36480 from wjwithagen/wjw-fix-scope-ParentCacheObjectDispatch.cc

librbd/cache: Fix scoping issue with lambda capture renaming

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #36423 from bk201/wip-46812
Lenz Grimmer [Fri, 7 Aug 2020 11:53:06 +0000 (13:53 +0200)]
Merge pull request #36423 from bk201/wip-46812

mgr/dashboard: fix tasks.mgr.dashboard.test_rbd.RbdTest.test_move_image_to_trash error

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
4 years agoMerge pull request #36427 from bk201/wip-46761
Lenz Grimmer [Fri, 7 Aug 2020 11:48:44 +0000 (13:48 +0200)]
Merge pull request #36427 from bk201/wip-46761

mgr/dashboard: Fix host attributes like labels are not returned

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agomgr/mds_autoscaler: plugin to configure mds instances 32731/head
Milind Changire [Fri, 7 Aug 2020 11:39:10 +0000 (17:09 +0530)]
mgr/mds_autoscaler: plugin to configure mds instances

mgr plugin to deploy and configure MDSs in response to degraded file system

MDS instance management as per changes to:
* 'max_mds' option
* 'standby_count_wanted' option
* mds liveness and transitions from standby to active

mds_autoscaler plugin test credit goes to Sebastian Wagner.

Fixes: https://tracker.ceph.com/issues/40929
Signed-off-by: Milind Changire <mchangir@redhat.com>
4 years agocrimson/osd: support sparse_read op 36500/head
Kefu Chai [Fri, 7 Aug 2020 10:47:52 +0000 (18:47 +0800)]
crimson/osd: support sparse_read op

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: support getxattrs op
Kefu Chai [Fri, 7 Aug 2020 05:02:11 +0000 (13:02 +0800)]
crimson/osd: support getxattrs op

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: consume indata
Kefu Chai [Thu, 6 Aug 2020 17:14:54 +0000 (01:14 +0800)]
crimson/osd: consume indata

we should chop off the consumed chunk from indata, otherwise the op
consuming data from indata will always read from the beginning of
indata.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: support checksum op
Kefu Chai [Thu, 6 Aug 2020 16:28:59 +0000 (00:28 +0800)]
crimson/osd: support checksum op

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36373 from varshar16/wip-update-orch-doc-str
Sebastian Wagner [Fri, 7 Aug 2020 09:30:49 +0000 (11:30 +0200)]
Merge pull request #36373 from varshar16/wip-update-orch-doc-str

mgr/orchestrator: Update docstring of service_action method

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #36447 from sebastian-philipp/mgr-cephadm-kill--refresh
Sebastian Wagner [Fri, 7 Aug 2020 09:29:23 +0000 (11:29 +0200)]
Merge pull request #36447 from sebastian-philipp/mgr-cephadm-kill--refresh

mgr/cephadm: Make `ceph orch * --refresh` asynchronous

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/cephadm: _get_config_and_keyring: `host` is required now 36497/head
Sebastian Wagner [Fri, 7 Aug 2020 09:24:52 +0000 (11:24 +0200)]
mgr/cephadm: _get_config_and_keyring: `host` is required now

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/orchestrator: Update service_action() docstring 36373/head
Varsha Rao [Thu, 30 Jul 2020 08:27:26 +0000 (13:57 +0530)]
mgr/orchestrator: Update service_action() docstring

Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agoMerge PR #36501 into master
Patrick Donnelly [Fri, 7 Aug 2020 05:12:42 +0000 (22:12 -0700)]
Merge PR #36501 into master

* refs/pull/36501/head:
qa: add tests for mds_min_caps_working_set
mds: add working set minimum for caps
qa: use config_set/config_get
qa: do not append file names to dirname
qa: add exception for test timeouts

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
4 years agoMerge PR #36504 into master
Patrick Donnelly [Fri, 7 Aug 2020 05:02:19 +0000 (22:02 -0700)]
Merge PR #36504 into master

* refs/pull/36504/head:
qa: log entrance/exit into the volumes plugin
qa: add debug client for volumes plugin qa

Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge PR #36503 into master
Patrick Donnelly [Fri, 7 Aug 2020 04:51:59 +0000 (21:51 -0700)]
Merge PR #36503 into master

* refs/pull/36503/head:
client: use non-static dirent for thread-safety

Reviewed-by: Venky Shankar <vshankar@redhat.com>
4 years agoMerge pull request #36361 from tchaikov/wip-common-config-refactor
Kefu Chai [Fri, 7 Aug 2020 02:32:51 +0000 (10:32 +0800)]
Merge pull request #36361 from tchaikov/wip-common-config-refactor

common/config: refactor md_config_t::parse_config_files()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoqa: add tests for mds_min_caps_working_set 36501/head
Patrick Donnelly [Thu, 6 Aug 2020 17:57:20 +0000 (10:57 -0700)]
qa: add tests for mds_min_caps_working_set

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomds: add working set minimum for caps
Patrick Donnelly [Thu, 6 Aug 2020 16:04:23 +0000 (09:04 -0700)]
mds: add working set minimum for caps

A client may hold many inodes pinned in its cache for open files. That
client may be unable to release those caps to respond to cache pressure
from the MDS (or quiescent client cap recall). We should not complain if
that number of capabilities is reasonable (< 10k by default).

Fixes: https://tracker.ceph.com/issues/46830
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: use config_set/config_get
Patrick Donnelly [Thu, 6 Aug 2020 17:56:57 +0000 (10:56 -0700)]
qa: use config_set/config_get

It's simpler and does not require MDS restarts.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: do not append file names to dirname
Patrick Donnelly [Thu, 6 Aug 2020 17:55:21 +0000 (10:55 -0700)]
qa: do not append file names to dirname

Otherwise the files generated are not actually under the sub-directory!
This is correcting a confusing aspect of the test infrastructure but
doesn't actually require any changes to the tests.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: log entrance/exit into the volumes plugin 36504/head
Patrick Donnelly [Wed, 5 Aug 2020 17:50:03 +0000 (10:50 -0700)]
qa: log entrance/exit into the volumes plugin

Fixes: https://tracker.ceph.com/issues/46851
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: add debug client for volumes plugin qa
Patrick Donnelly [Wed, 5 Aug 2020 16:03:54 +0000 (09:03 -0700)]
qa: add debug client for volumes plugin qa

Fixes: https://tracker.ceph.com/issues/46851
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoclient: use non-static dirent for thread-safety 36503/head
Patrick Donnelly [Thu, 6 Aug 2020 21:04:57 +0000 (14:04 -0700)]
client: use non-static dirent for thread-safety

Fixes: https://tracker.ceph.com/issues/46832
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: add exception for test timeouts
Patrick Donnelly [Thu, 6 Aug 2020 17:53:58 +0000 (10:53 -0700)]
qa: add exception for test timeouts

To make this easier to catch. It is still a RuntimeError so it should
not affect current tests by default.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa/tasks/ceph: redirect stderr for crimson flavor 36499/head
Kefu Chai [Thu, 6 Aug 2020 17:11:53 +0000 (01:11 +0800)]
qa/tasks/ceph: redirect stderr for crimson flavor

we should redirect stderr for crimson instead for default flavor. this
change addresses a regression introduced by
da76f4646157d518a325d5534c30f59aba8fc0e6

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agolibrbd/cache: Fix scoping issue with lambda capture renaming 36480/head
Willem Jan Withagen [Wed, 5 Aug 2020 19:04:11 +0000 (19:04 +0000)]
librbd/cache: Fix scoping issue with lambda capture renaming

Clang complains:
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:97:66: error: 'object_off' in capture list does not name a variable
   ([this, read_data, dispatch_result, on_dispatched, object_no, object_off,
                                                                 ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:98:6: error: 'object_len' in capture list does not name a variable
     object_len, snap_id, &parent_trace](ObjectCacheRequest* ack) {
     ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:99:41: error: reference to local binding 'object_off' declared in enclosing function 'librbd::cache::ParentCacheObjectDispatch::read'
      handle_read_cache(ack, object_no, object_off, object_len, snap_id,
                                        ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:81:9: note: 'object_off' declared here
  auto [object_off, object_len] = extents.front();
        ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:99:53: error: reference to local binding 'object_len' declared in enclosing function 'librbd::cache::ParentCacheObjectDispatch::read'
      handle_read_cache(ack, object_no, object_off, object_len, snap_id,
                                                    ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:81:21: note: 'object_len' declared here
  auto [object_off, object_len] = extents.front();
                    ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:99:41: error: reference to local binding 'object_off' declared in enclosing function 'librbd::cache::ParentCacheObjectDispatch<librbd::ImageCtx>::read'
      handle_read_cache(ack, object_no, object_off, object_len, snap_id,
                                        ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:242:31: note: in instantiation of member function 'librbd::cache::ParentCacheObjectDispatch<librbd::ImageCtx>::read' requested here
template class librbd::cache::ParentCacheObjectDispatch<librbd::ImageCtx>;
                              ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:81:9: note: 'object_off' declared here
  auto [object_off, object_len] = extents.front();
        ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:99:53: error: reference to local binding 'object_len' declared in enclosing function 'librbd::cache::ParentCacheObjectDispatch<librbd::ImageCtx>::read'
      handle_read_cache(ack, object_no, object_off, object_len, snap_id,
                                                    ^
/home/jenkins/workspace/ceph-master-compile/src/librbd/cache/ParentCacheObjectDispatch.cc:81:21: note: 'object_len' declared here
  auto [object_off, object_len] = extents.front();
                    ^
6 errors generated.

fixes: https://github.com/ceph/ceph/pull/36145
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
4 years agoMerge pull request #36426 from sebastian-philipp/cephadm-redeploy-image
Sebastian Wagner [Thu, 6 Aug 2020 16:00:35 +0000 (18:00 +0200)]
Merge pull request #36426 from sebastian-philipp/cephadm-redeploy-image

 mgr/cephadm, Add --image to `ceph orch redeploy <what>`

Reviewed-by: Joshua Schmid <jschmid@suse.de>
4 years agomgr/cephadm: Prevent unnecessary SSH reconfiguration 36492/head
Ricardo Marques [Thu, 6 Aug 2020 09:47:29 +0000 (10:47 +0100)]
mgr/cephadm: Prevent unnecessary SSH reconfiguration

When 'set-user', 'set-pub-key' or 'set-priv-key' are called two
times with the same value, we can ignore the second call.

Signed-off-by: Ricardo Marques <rimarques@suse.com>
4 years agomgr/cephadm: Some more typing
Sebastian Wagner [Thu, 6 Aug 2020 15:44:00 +0000 (17:44 +0200)]
mgr/cephadm: Some more typing

Make sure we don't mix daemon names, config entities and
auth entities. Cause all of them don't mix well together.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agolibrados: add LIBRADOS_SUPPORTS_GETADDRS support 36488/head
Xiubo Li [Thu, 6 Aug 2020 03:56:26 +0000 (11:56 +0800)]
librados: add LIBRADOS_SUPPORTS_GETADDRS support

This will be very helpful when release ceph package(like RPM) with
backporting rados_getaddrs() api to previous version.

In tcmu-runner we need to check whether the rados_getaddrs() is
support or not.

Fixes: https://tracker.ceph.com/issues/46842
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoMerge pull request #36445 from rhcs-dashboard/crushmap_fix
Lenz Grimmer [Thu, 6 Aug 2020 11:48:54 +0000 (13:48 +0200)]
Merge pull request #36445 from rhcs-dashboard/crushmap_fix

mgr/dashboard: Fix for CrushMap viewer items getting compressed vertically

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agomgr/cephadm: Refactor upgrade to call _daemon_action with new image 36426/head
Sebastian Wagner [Mon, 3 Aug 2020 09:35:41 +0000 (11:35 +0200)]
mgr/cephadm: Refactor upgrade to call _daemon_action with new image

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/cephadm, Add --image to `ceph orch daemon redeploy <what>`
Sebastian Wagner [Fri, 31 Jul 2020 16:02:34 +0000 (18:02 +0200)]
mgr/cephadm, Add --image to `ceph orch daemon redeploy <what>`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36490 from tchaikov/wip-crimson-zero-op
Kefu Chai [Thu, 6 Aug 2020 10:16:58 +0000 (18:16 +0800)]
Merge pull request #36490 from tchaikov/wip-crimson-zero-op

crimson/osd: support CEPH_OSD_OP_ZERO op and cls_cxx_write_zero()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: support cls_cxx_write_zero() 36490/head
Kefu Chai [Thu, 6 Aug 2020 06:31:42 +0000 (14:31 +0800)]
crimson/osd: support cls_cxx_write_zero()

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: support CEPH_OSD_OP_ZERO op
Kefu Chai [Thu, 6 Aug 2020 06:31:25 +0000 (14:31 +0800)]
crimson/osd: support CEPH_OSD_OP_ZERO op

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/admin: drop stale comment
Kefu Chai [Wed, 5 Aug 2020 03:36:14 +0000 (11:36 +0800)]
crimson/admin: drop stale comment

the UNIX domain socket file was removed in
71c08cb02eb6c0f8220c0cf4b82332398b25de2c

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36455 from rzarzynski/wip-crimson-ops_executer-cleanups
Kefu Chai [Thu, 6 Aug 2020 09:39:52 +0000 (17:39 +0800)]
Merge pull request #36455 from rzarzynski/wip-crimson-ops_executer-cleanups

crimson/osd: don't reset osd_op_params.clean_regions. Clean-up OpsExecuter

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoclient: switch lock_guard to scoped_lock 36221/head
Xiubo Li [Tue, 4 Aug 2020 00:00:10 +0000 (08:00 +0800)]
client: switch lock_guard to scoped_lock

Fixes: https://tracker.ceph.com/issues/46649
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoclient: remove useless unsafe_sync_write
Xiubo Li [Sat, 1 Aug 2020 13:06:25 +0000 (21:06 +0800)]
client: remove useless unsafe_sync_write

With the RWRef supporting, before _unmount() could continue all the
the sync write(the "readers") must have finished.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoclient: make the root member under the client_lock
Xiubo Li [Mon, 3 Aug 2020 04:01:14 +0000 (12:01 +0800)]
client: make the root member under the client_lock

Fixes: https://tracker.ceph.com/issues/46649
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoclient: add mount/initialize states support and convert to RWRef
Xiubo Li [Sun, 2 Aug 2020 00:35:24 +0000 (08:35 +0800)]
client: add mount/initialize states support and convert to RWRef

This will help us to break the big client_lock. Such as if we want
to add one separate lock for each inode, it will work like:

inode_lock.lock();
...
client_lock.lock();

client_lock.unlock();
...
inode_lock.unlock();

So we must get rid of the client_lock for all the "readers", which
must hold the client_lock from the beginning until the end.

Fixes: https://tracker.ceph.com/issues/46649
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoclient: add RWRef support
Xiubo Li [Sun, 2 Aug 2020 00:14:36 +0000 (08:14 +0800)]
client: add RWRef support

This is a common read/write reference framework, which will work
like a rw lock, for the readers/writers it won't hold the lock but
will increase the reference instead.

With this we can get rid of big locks in some use case, such as for
the Client.cc, in which such as for the file read()/write() it must
hold the client_lock at the begining until they finish, this will
make sure the _unmount() won't release the resources the read()/write()
are still using. With this it maks breaking the big client_lock to
be possible.

The usage: such as in Client.cc

Readers:

For the read()/writer(), etc, they will be work as "readers", in
the beginning they just need to check the state whether it satisfies
what the "readers" need to be, if not it will return directly, or
will increase the reference and continue.

Writers:

And for the _unmount(), as the "writer" in the beginning it will
just update the state to next stage first and when wait for all
the "readers" to finish. After the "writer" updating the state then
all the new comming "readers" will fail and return directly.

Fixes: https://tracker.ceph.com/issues/46649
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agocrimson/osd: spawn osd_op_params in do_write_op(). Fix overriding. 36455/head
Radoslaw Zarzynski [Tue, 4 Aug 2020 14:32:42 +0000 (16:32 +0200)]
crimson/osd: spawn osd_op_params in do_write_op(). Fix overriding.

This commit deduplicates the `OpsExexuter::do_osd_op()` by moving
`std::optional`-typed `osd_op_params` instantiation to `do_write_op()`.
It also fixes an issue where `clean_regions` of `osd_op_params` were
reset on every write, writefull or truncate.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: instantiate osd_op_params for every write.
Radoslaw Zarzynski [Tue, 4 Aug 2020 14:24:19 +0000 (16:24 +0200)]
crimson/osd: instantiate osd_op_params for every write.

This simplifies the logic of `OpsExecuter::flush_changes()` and
enables for moving the instantiation code to `do_write_op()` in
the future.

The performance impact seems negligible as the affected ops are
not the ones dominating in our expected workload (read/write, omap).

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agocrimson/osd: delegate the txn.empty() dispatch to OpsExecuter.
Radoslaw Zarzynski [Tue, 4 Aug 2020 13:59:55 +0000 (15:59 +0200)]
crimson/osd: delegate the txn.empty() dispatch to OpsExecuter.

The benefit is no need to instantiate `osd_op_params` when only
non-modifying operation had been handled.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agomds: avoid calling g_conf().get_val() in MDSRank::heartbeat_reset() 36487/head
Yan, Zheng [Wed, 5 Aug 2020 14:23:05 +0000 (22:23 +0800)]
mds: avoid calling g_conf().get_val() in MDSRank::heartbeat_reset()

g_conf().get_val() is expensive.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agomgr/dashboard: Improve notification badge 36150/head
Aashish Sharma [Fri, 17 Jul 2020 05:46:56 +0000 (11:16 +0530)]
mgr/dashboard: Improve notification badge

Added badge to the notification icon when there are pending notifications

Fixes: https://tracker.ceph.com/issues/45414
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
4 years agoMerge pull request #36478 from zdover23/wip-doc-removing-auth-disable-warning
zdover23 [Thu, 6 Aug 2020 00:10:48 +0000 (10:10 +1000)]
Merge pull request #36478 from zdover23/wip-doc-removing-auth-disable-warning

doc/rados: remove upgrade auth disable

This commit removes a recommendation to disable
authentication before performing an upgrade.

Reviewed-by: Joao Eduardo Luis
Signed-off-by: Zac Dover <zac.dover@gmail.com>
4 years agoMerge pull request #35947 from orozery/crypto_object_dispatch_layer
Jason Dillaman [Wed, 5 Aug 2020 18:48:41 +0000 (14:48 -0400)]
Merge pull request #35947 from orozery/crypto_object_dispatch_layer

librbd: add a crypto object dispatch layer

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