]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agoqa/workunits/fs: add test for subvolume 36472/head
Yan, Zheng [Wed, 5 Aug 2020 15:31:03 +0000 (23:31 +0800)]
qa/workunits/fs: add test for subvolume

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agomds: don't move inode with nlink > 1 to global snaprealm if it's in subvolume
Yan, Zheng [Wed, 5 Aug 2020 09:31:57 +0000 (17:31 +0800)]
mds: don't move inode with nlink > 1 to global snaprealm if it's in subvolume

Fixes: https://tracker.ceph.com/issues/46074
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agomds: disallow hardlink across subvolume
Yan, Zheng [Wed, 5 Aug 2020 08:04:30 +0000 (16:04 +0800)]
mds: disallow hardlink across subvolume

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agomds: disallow across subvolume rename
Yan, Zheng [Wed, 5 Aug 2020 07:37:20 +0000 (15:37 +0800)]
mds: disallow across subvolume rename

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agomds: disallow creating snapshot on descendent directory of subvolume
Yan, Zheng [Wed, 5 Aug 2020 07:33:10 +0000 (15:33 +0800)]
mds: disallow creating snapshot on descendent directory of subvolume

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agomds: add vxattr that marks/clears subvolume flag
Yan, Zheng [Tue, 4 Aug 2020 13:26:26 +0000 (21:26 +0800)]
mds: add vxattr that marks/clears subvolume flag

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
4 years agoMerge pull request #36407 from tchaikov/wip-mgr-autopep8
Kefu Chai [Mon, 3 Aug 2020 01:33:21 +0000 (09:33 +0800)]
Merge pull request #36407 from tchaikov/wip-mgr-autopep8

mgr/cephadm: track dependency in tox.ini

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36378 from orozery/librados_test_stub_assert_version
Jason Dillaman [Sun, 2 Aug 2020 20:58:07 +0000 (16:58 -0400)]
Merge pull request #36378 from orozery/librados_test_stub_assert_version

test/librados_test_stub: handle assert_version

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #36406 from tchaikov/wip-pg-stat-seq
Kefu Chai [Sun, 2 Aug 2020 02:19:47 +0000 (10:19 +0800)]
Merge pull request #36406 from tchaikov/wip-pg-stat-seq

crimson/osd: send pg_stat with correct seq

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agomgr/cephadm: track dependency in tox.ini 36407/head
Kefu Chai [Sun, 2 Aug 2020 01:31:01 +0000 (09:31 +0800)]
mgr/cephadm: track dependency in tox.ini

* track dependency for running tox tests with tox.ini. the fix
  test is not performed by "make check", so `install-deps.sh`
  is not responsible for preparing the autopep8 wheels. hence
  we can just put it in tox.ini
* remove "python_version >= '3'" as we do not support python2

this change addresses a regression introduced by
7d8a3b60321da10af6f4557a9d69eda09ca2c620, which fails the rpmbuild like:

RPM build errors:
    Installed (but unpackaged) file(s) found:
   /usr/share/ceph/mgr/requirements-fix.txt

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36348 from votdev/cephadm_tox_pylint
Sebastian Wagner [Sat, 1 Aug 2020 20:36:16 +0000 (22:36 +0200)]
Merge pull request #36348 from votdev/cephadm_tox_pylint

mgr/cephadm: Introduce tox and autopep8

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agocrimson/osd: send pg_stat with correct seq 36406/head
Kefu Chai [Sat, 1 Aug 2020 16:28:36 +0000 (00:28 +0800)]
crimson/osd: send pg_stat with correct seq

* set the osd_stat in pg_stat message sent to mgr, otherwise the seq id
  in the message would be always 0.
* return the seq id composed of up_epoch and osd_stat_seq when serving
  "flush_pg_stats" tell command.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/osd: remove unused #include
Kefu Chai [Thu, 30 Jul 2020 07:07:32 +0000 (15:07 +0800)]
crimson/osd: remove unused #include

these messages are handled by osd/PeeringState

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36395 from dillaman/wip-46679
Mykola Golub [Sat, 1 Aug 2020 07:16:59 +0000 (10:16 +0300)]
Merge pull request #36395 from dillaman/wip-46679

test/librbd: unquiesce notifications are handled lazily

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #36309 from dillaman/wip-46694
Mykola Golub [Sat, 1 Aug 2020 07:15:56 +0000 (10:15 +0300)]
Merge pull request #36309 from dillaman/wip-46694

librbd:  global and pool-level config overrides require image refresh to apply

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #32410 from zdover23/wip-doc-pg-repair
zdover23 [Sat, 1 Aug 2020 02:07:12 +0000 (12:07 +1000)]
Merge pull request #32410 from zdover23/wip-doc-pg-repair

doc/rados/operations: document pg repairing practices

4 years agoMerge PR #36364 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:19:46 +0000 (14:19 -0700)]
Merge PR #36364 into master

* refs/pull/36364/head:
client: clean up the unnecessary client_lock for _conf->client_trace

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36359 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:18:52 +0000 (14:18 -0700)]
Merge PR #36359 into master

* refs/pull/36359/head:
mds: place MDSGatherBuilder on the stack

Reviewed-by: Zheng Yan <zyan@redhat.com>
4 years agoMerge PR #36358 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:18:09 +0000 (14:18 -0700)]
Merge PR #36358 into master

* refs/pull/36358/head:
mds: resolve SIGSEGV in waiting for uncommitted fragments

Reviewed-by: Zheng Yan <zyan@redhat.com>
4 years agoMerge PR #36257 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:16:59 +0000 (14:16 -0700)]
Merge PR #36257 into master

* refs/pull/36257/head:
client: move client_lock to _unmount()
client: add timer_lock support

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36155 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:15:22 +0000 (14:15 -0700)]
Merge PR #36155 into master

* refs/pull/36155/head:
qa: Fix traceback during fs cleanup between tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge PR #35944 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:12:53 +0000 (14:12 -0700)]
Merge PR #35944 into master

* refs/pull/35944/head:
qa: defer cleaning the mountpoint's netnses and the bridge
qa/tasks/cephfs/mount.py: remove the stale netnses and bridge
qa/tasks/cephfs/mount.py: try to flush the stale ceph-brx dev info
qa/tasks/cephfs/mount.py: switch to run_shell_payload() helper
qa/tasks/cephfs/mount.py: clean up the none used code

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge PR #35647 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:11:27 +0000 (14:11 -0700)]
Merge PR #35647 into master

* refs/pull/35647/head:
mgr/volumes: Add documentation regarding --retain-snapshots option
mgr/volumes: Avoid trashing retained subvolume on create errors
mgr/volumes: Add subvolume v2 test cases
mgr/volumes: Derive v2 from v1 to leverage common methods
mgr/volumes: Introduce v2 subvolumes
mgr/volumes: Use operation type during subvolume open

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
4 years agoMerge PR #35096 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:10:08 +0000 (14:10 -0700)]
Merge PR #35096 into master

* refs/pull/35096/head:
cephfs-journal-tool: fix wrong read_offset when get missing objects

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
4 years agoMerge PR #32120 into master
Patrick Donnelly [Fri, 31 Jul 2020 21:08:41 +0000 (14:08 -0700)]
Merge PR #32120 into master

* refs/pull/32120/head:
client: periodically forward metrics to session MDSs
client: track cap hits and misses globally
client: minor cleanup to MetaSession class

Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agotest/librbd: unquiesce notifications are handled lazily 36395/head
Jason Dillaman [Fri, 31 Jul 2020 14:31:07 +0000 (10:31 -0400)]
test/librbd: unquiesce notifications are handled lazily

The quiesce unit tests were expecting that the unquiesce notification
would be processed by the time the snapshot create command completed.
Since the RPC is immediately ACKed, there is a potential for a race
if the test doesn't wait for the unquiesce to process.

Fixes: https://tracker.ceph.com/issues/46679
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #32780 from petrutlucian94/windows.5
Kefu Chai [Fri, 31 Jul 2020 12:36:59 +0000 (20:36 +0800)]
Merge pull request #32780 from petrutlucian94/windows.5

Windows support [part 5]

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36065 from trociny/wip-46445
Kefu Chai [Fri, 31 Jul 2020 12:36:25 +0000 (20:36 +0800)]
Merge pull request #36065 from trociny/wip-46445

monclient: schedule first tick using mon_client_hunt_interval

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/cephadm: Introduce tox and autopep8 36348/head
Volker Theile [Wed, 29 Jul 2020 10:13:01 +0000 (12:13 +0200)]
mgr/cephadm: Introduce tox and autopep8

This PR introduces tox and autopep8 to format the Python code according to PEP8. It does NOT include any lint related things.

Signed-off-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #36002 from david-z/wip-fix-slow-req
Kefu Chai [Fri, 31 Jul 2020 12:34:33 +0000 (20:34 +0800)]
Merge pull request #36002 from david-z/wip-fix-slow-req

mgr: don't update osd stat which is already out

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36101 from ifed01/wip-ifed-fix-store-test-with-db
Kefu Chai [Fri, 31 Jul 2020 12:33:24 +0000 (20:33 +0800)]
Merge pull request #36101 from ifed01/wip-ifed-fix-store-test-with-db

test/objectstore_store_test: fix test cases broken due to additional …

Reviewed-by: Adam Kupczyk <akucpzyk@redhat.com>
4 years agoMerge pull request #36337 from tchaikov/wip-qa-ceph-waiting
Kefu Chai [Fri, 31 Jul 2020 12:32:13 +0000 (20:32 +0800)]
Merge pull request #36337 from tchaikov/wip-qa-ceph-waiting

qa/tasks/ceph: do not print out empty list of pg

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #36360 from matthewoliver/cephadm_add_ipv6_unwrap
Sebastian Wagner [Fri, 31 Jul 2020 11:31:41 +0000 (13:31 +0200)]
Merge pull request #36360 from matthewoliver/cephadm_add_ipv6_unwrap

cephadm: add unwrap_ipv6 helper method

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36151 from jschmid1/osd_support_reweight_impl
Sebastian Wagner [Fri, 31 Jul 2020 11:28:18 +0000 (13:28 +0200)]
Merge pull request #36151 from jschmid1/osd_support_reweight_impl

mgr/cephadm: rework osd removals/replacements

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36338 from pcuzner/fix-daemon-actions
Sebastian Wagner [Fri, 31 Jul 2020 11:05:18 +0000 (13:05 +0200)]
Merge pull request #36338 from pcuzner/fix-daemon-actions

mgr/cephadm: fix call to cephadm for daemon restarts etc

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #36284 from sebastian-philipp/cephadm_service_id_migration
Sebastian Wagner [Fri, 31 Jul 2020 10:54:51 +0000 (12:54 +0200)]
Merge pull request #36284 from sebastian-philipp/cephadm_service_id_migration

mgr/cephadm: Add migration to keep the service names consistent

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #36374 from varshar16/wip-doc-orchestrator-update-create-osd
Sebastian Wagner [Fri, 31 Jul 2020 10:41:33 +0000 (12:41 +0200)]
Merge pull request #36374 from varshar16/wip-doc-orchestrator-update-create-osd

doc/mgr/orchestrator: Fix formatting and examples in create OSD

Reviewed-by: Joshua Schmid <jschmid@suse.de>
4 years agoMerge pull request #36376 from tchaikov/wip-crimson-log
Kefu Chai [Fri, 31 Jul 2020 09:45:35 +0000 (17:45 +0800)]
Merge pull request #36376 from tchaikov/wip-crimson-log

qa/tasks/ceph: redirect stderr to log file

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agobuild/debian: remove osd_support 36151/head
Joshua Schmid [Tue, 28 Jul 2020 11:43:11 +0000 (13:43 +0200)]
build/debian: remove osd_support

Signed-off-by: Joshua Schmid <jschmid@suse.de>
4 years agodoc/cephadm: adjust osd removal docs
Joshua Schmid [Tue, 28 Jul 2020 07:35:56 +0000 (09:35 +0200)]
doc/cephadm: adjust osd removal docs

Signed-off-by: Joshua Schmid <jschmid@suse.de>
4 years agomgr/cephadm: add tests for new remove/replace logic
Joshua Schmid [Fri, 24 Jul 2020 13:25:31 +0000 (15:25 +0200)]
mgr/cephadm: add tests for new remove/replace logic

Signed-off-by: Joshua Schmid <jschmid@suse.de>
4 years agomgr/cephadm: implement osd remove/replace logic in cephadm
Joshua Schmid [Fri, 24 Jul 2020 13:24:38 +0000 (15:24 +0200)]
mgr/cephadm: implement osd remove/replace logic in cephadm

Fixes: https://tracker.ceph.com/issues/44548
Fixes: https://tracker.ceph.com/issues/45594
Signed-off-by: Joshua Schmid <jschmid@suse.de>
4 years agomgr/osd_support: remove module and all traces
Joshua Schmid [Fri, 24 Jul 2020 13:23:52 +0000 (15:23 +0200)]
mgr/osd_support: remove module and all traces

Signed-off-by: Joshua Schmid <jschmid@suse.de>
4 years agoMerge pull request #36367 from tchaikov/wip-46771
Kefu Chai [Fri, 31 Jul 2020 07:39:44 +0000 (15:39 +0800)]
Merge pull request #36367 from tchaikov/wip-46771

qa/tasks/ragweed: always set ragweed_repo

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoqa/tasks/ragweed: always set ragweed_repo 36367/head
Kefu Chai [Thu, 30 Jul 2020 08:45:40 +0000 (16:45 +0800)]
qa/tasks/ragweed: always set ragweed_repo

* extract get_ragweed_branch() out of download() task, for better
  readablity.
* use a loop for retry when the first clone fails
* drop the `raise ValueError()` clause as it never happens. we could use
  an assert() here, but i don't think it is necessary anyway.
* use sh() instead of run() for better readablity.
* always set ragweed_repo. before this change this variable is
  unbounded if `force-branch` is set.

Fixes: https://tracker.ceph.com/issues/46771
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agotest/librados_test_stub: handle assert_version 36378/head
Or Ozeri [Thu, 30 Jul 2020 17:15:53 +0000 (20:15 +0300)]
test/librados_test_stub: handle assert_version

This commits adds a proper handling of the assert_version API in RADOS.

Signed-off-by: Or Ozeri <oro@il.ibm.com>
4 years agoMerge pull request #36159 from trociny/wip-46581
Jason Dillaman [Thu, 30 Jul 2020 19:43:20 +0000 (15:43 -0400)]
Merge pull request #36159 from trociny/wip-46581

librbd: handle DNE from immutable-object-cache

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agomds: place MDSGatherBuilder on the stack 36359/head
Patrick Donnelly [Thu, 30 Jul 2020 02:42:44 +0000 (19:42 -0700)]
mds: place MDSGatherBuilder on the stack

This was not meant to be heap allocated; it's not freed via the Gather
machinery.

Fixes: https://tracker.ceph.com/issues/46766
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36319 from orozery/librados_test_stub_add_objver
Jason Dillaman [Thu, 30 Jul 2020 16:55:15 +0000 (12:55 -0400)]
Merge pull request #36319 from orozery/librados_test_stub_add_objver

test/librados_test_stub: add version tracking of objects

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #36317 from orozery/librados_test_stub_exclusive_create
Jason Dillaman [Thu, 30 Jul 2020 16:54:51 +0000 (12:54 -0400)]
Merge pull request #36317 from orozery/librados_test_stub_exclusive_create

test/librados_test_stub: handle exclusive create

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoqa/tasks/ceph: redirect stderr to log file 36376/head
Kefu Chai [Thu, 30 Jul 2020 15:20:35 +0000 (23:20 +0800)]
qa/tasks/ceph: redirect stderr to log file

crimson write log to stderr, let's redirect it to log file for a more
peaceful teuthology.log.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36363 from sebastian-philipp/p-common-pyyaml
Kefu Chai [Thu, 30 Jul 2020 16:20:43 +0000 (00:20 +0800)]
Merge pull request #36363 from sebastian-philipp/p-common-pyyaml

python-common, spec.in: Add missing pyyaml dependency

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36344 from wjwithagen/wjw-fix-_1
Kefu Chai [Thu, 30 Jul 2020 16:09:14 +0000 (00:09 +0800)]
Merge pull request #36344 from wjwithagen/wjw-fix-_1

test: fix ambiguous reference to _1

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomds: resolve SIGSEGV in waiting for uncommitted fragments 36358/head
Patrick Donnelly [Thu, 30 Jul 2020 02:36:28 +0000 (19:36 -0700)]
mds: resolve SIGSEGV in waiting for uncommitted fragments

The MDSGatherBuilder was not correctly used / wired up.

Fixes: https://tracker.ceph.com/issues/46765
Fixes: 77eb368d2d35f2418875227fff9a34b5ef15a290
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #36370 from tchaikov/wip-crimson-scrub2
Kefu Chai [Thu, 30 Jul 2020 15:24:11 +0000 (23:24 +0800)]
Merge pull request #36370 from tchaikov/wip-crimson-scrub2

crimson/osd: handle MOSDScrub2

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agoMerge pull request #36286 from sebastian-philipp/cephadm-notify_config-ceph-conf...
Sebastian Wagner [Thu, 30 Jul 2020 14:20:44 +0000 (16:20 +0200)]
Merge pull request #36286 from sebastian-philipp/cephadm-notify_config-ceph-conf-race

mgr/cephadm: revamp ceph.conf distribution scheduling

Reviewed-by: Ricardo Marques <rimarques@suse.com>
4 years agoMerge pull request #36231 from tspmelo/wip-fix-overflow
Kiefer Chang [Thu, 30 Jul 2020 14:02:37 +0000 (22:02 +0800)]
Merge pull request #36231 from tspmelo/wip-fix-overflow

mgr/dashboard: Configure overflow of popover in health page

Reviewed-by: Ni-Feng Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agodoc/mgr/orchestrator: Fix formatting and examples in create OSDs 36374/head
Varsha Rao [Thu, 30 Jul 2020 13:28:47 +0000 (15:28 +0200)]
doc/mgr/orchestrator: Fix formatting and examples in create OSDs

Signed-off-by: Varsha Rao <varao@redhat.com>
4 years agoMerge pull request #36243 from Devp00l/wip-46660
Volker Theile [Thu, 30 Jul 2020 13:00:59 +0000 (15:00 +0200)]
Merge pull request #36243 from Devp00l/wip-46660

mgr/dashboard: Fix regression on table error handling

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agomgr/cephadm: Add migration to keep the service names consistent 36284/head
Sebastian Wagner [Fri, 24 Jul 2020 14:20:22 +0000 (16:20 +0200)]
mgr/cephadm: Add migration to keep the service names consistent

After 15.2.4, we unified some service IDs: MONs, MGRs etc no longer have a service id.
Which means, the service names changed:

mon.foo -> mon
mgr.foo -> mgr

This fixes the data structure consistency

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agomgr/cephadm: minor cleanup in test_migration
Sebastian Wagner [Fri, 24 Jul 2020 14:17:45 +0000 (16:17 +0200)]
mgr/cephadm: minor cleanup in test_migration

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36324 from dillaman/wip-46737
Mykola Golub [Thu, 30 Jul 2020 12:04:10 +0000 (15:04 +0300)]
Merge pull request #36324 from dillaman/wip-46737

librbd: ensure image cannot be closed until in-flight IO callbacks complete

Reviewed-by: Mykola Golub <mgolub@suse.com>
4 years agocrimson/osd: handle MOSDScrub2 36370/head
Kefu Chai [Thu, 30 Jul 2020 11:45:23 +0000 (19:45 +0800)]
crimson/osd: handle MOSDScrub2

MOSDScrub2 is sent from mgr for serving "ceph pg
{scrub|deep-scrub|repair}' commands when it's talking to a mimic and newer OSD.

ceph task checks if all pgs are scrubbed by looking at the `last_scrub_stamp` fields
in the `ceph pg dump` output. and it request the not-yet-scrubbed pgs a
deep scrub to ensure they are scrub before timeout.

in this change, crimson handles MOSDScrub2 by starting a remote peering
request, and the underlying peering_state will notify the corresponding
PG to start scrub. to get the test pass, a minimal implmentation is
added to update the scrub timestamp to `now` upon request of
peering_state.

we will need to add the correct scrubbing support later. but this is
enough for passing the thrasher test and for preparing for more tests
which uses the "ceph" task.

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #36281 from sebastian-philipp/mgr-tox-rm-cov
Sebastian Wagner [Thu, 30 Jul 2020 11:42:53 +0000 (13:42 +0200)]
Merge pull request #36281 from sebastian-philipp/mgr-tox-rm-cov

pybind/mgr: remove coverage from tox.ini

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
4 years agoMerge pull request #36335 from mgfritch/cephadm-vstart-mon-cidr
Sebastian Wagner [Thu, 30 Jul 2020 10:27:08 +0000 (12:27 +0200)]
Merge pull request #36335 from mgfritch/cephadm-vstart-mon-cidr

vstart: infer the mon public_network

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
4 years agoMerge pull request #36334 from mgfritch/cephadm-event-multiline
Sebastian Wagner [Thu, 30 Jul 2020 10:13:05 +0000 (12:13 +0200)]
Merge pull request #36334 from mgfritch/cephadm-event-multiline

mgr/orch: allow for multiline OrchestratorEvent message

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #36162 from Daniel-Pivonka/cephadm-43681
Sebastian Wagner [Thu, 30 Jul 2020 09:55:33 +0000 (11:55 +0200)]
Merge pull request #36162 from Daniel-Pivonka/cephadm-43681

mgr/cephadm: streamline rgw deployment

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agotest: fix ambiguous reference to _1 36344/head
Willem Jan Withagen [Wed, 29 Jul 2020 12:01:10 +0000 (12:01 +0000)]
test: fix ambiguous reference to _1

FreeBSD/Clang/lib complains:
/home/jenkins/workspace/ceph-master/src/test/librados_test_stub/TestRadosClient.cc:295:55: error: reference to '_1' is ambiguous
    &TestRadosClient::finish_aio_completion, this, c, _1));
                                                      ^
/usr/local/include/boost/bind/placeholders.hpp:46:38: note: candidate found by name lookup is 'boost::placeholders::_1'
BOOST_STATIC_CONSTEXPR boost::arg<1> _1;
                                     ^
/usr/include/c++/v1/functional:2448:46: note: candidate found by name lookup is 'std::__1::placeholders::_1'
/* _LIBCPP_INLINE_VAR */ constexpr __ph<1>   _1{};

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
4 years agoMerge pull request #36362 from tchaikov/wip-crimson-read-write-file
Kefu Chai [Thu, 30 Jul 2020 09:16:14 +0000 (17:16 +0800)]
Merge pull request #36362 from tchaikov/wip-crimson-read-write-file

crimson: extract read_file()

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
4 years agopython-common, spec.in: Add missing pyyaml dependency 36363/head
Sebastian Wagner [Thu, 30 Jul 2020 07:55:08 +0000 (09:55 +0200)]
python-common, spec.in: Add missing pyyaml dependency

Fixes: cd6a488ab2ca036dd4fb36751b938f605e97e1c8
Fixes: https://tracker.ceph.com/issues/46759
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoclient: clean up the unnecessary client_lock for _conf->client_trace 36364/head
Xiubo Li [Wed, 29 Jul 2020 06:58:31 +0000 (14:58 +0800)]
client: clean up the unnecessary client_lock for _conf->client_trace

There is no need to make the "cct->_conf->client_trace" under the
client_lock, it is for the "ceph-syn" and it almost won't change,
even it will but it still won't cause any race.

For the "inode->ino" and "inode->snapid", since they won't change
once initialized when creating the inode, and the inode here will
be protected by the reference count, so no need the client_lock too.

Fixes: https://tracker.ceph.com/issues/46768
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agoqa: Fix traceback during fs cleanup between tests 36155/head
Kotresh HR [Tue, 21 Jul 2020 11:39:39 +0000 (17:09 +0530)]
qa: Fix traceback during fs cleanup between tests

The 'mon_allow_pool_delete' option is set to 'True'
in 'setUp' of 'TestVolumes' and is cleared of in
corresponding 'tearDown' function. Hence, any pool
deletion in parent classes such as 'CephFSTestCase'
would fail. This patch fixes the same by setting
the config 'mon_allow_pool_delete' option in the
'CephFSTestCase'.

Fixes: https://tracker.ceph.com/issues/46597
Signed-off-by: Kotresh HR <khiremat@redhat.com>
4 years agorbd: make libcurses optional 32780/head
Lucian Petrut [Tue, 29 Oct 2019 14:05:32 +0000 (14:05 +0000)]
rbd: make libcurses optional

libcurses may not be available on some platforms (e.g. Windows),
so we'll make it optional.

If libcurses is not available, we'll disable the rbd iotop
command.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agocommon: add Windows implementation for system info getter
Lucian Petrut [Mon, 28 Oct 2019 10:15:31 +0000 (10:15 +0000)]
common: add Windows implementation for system info getter

common/util.cc provides some system info retrievers. This patch
covers the Windows implemention.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
4 years agocrimson: move read_file() into common/buffer_io 36362/head
Kefu Chai [Wed, 29 Jul 2020 08:01:20 +0000 (16:01 +0800)]
crimson: move read_file() into common/buffer_io

so it can be reused by other components in crimson

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocrimson/common: move write_file into crimson namespace
Kefu Chai [Wed, 29 Jul 2020 07:52:00 +0000 (15:52 +0800)]
crimson/common: move write_file into crimson namespace

it simply does not belong to ceph::buffer

Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agocephfs-journal-tool: fix wrong read_offset when get missing objects 35096/head
jhonxue [Thu, 30 Jul 2020 06:40:16 +0000 (14:40 +0800)]
cephfs-journal-tool: fix wrong read_offset when get missing objects

Fixes: https://tracker.ceph.com/issues/45575
Signed-off-by: Xue Yantao <jhonxue@tencent.com>
4 years agomonclient: use "is_connected" check when scheduling tick 36065/head
Mykola Golub [Thu, 30 Jul 2020 05:59:57 +0000 (06:59 +0100)]
monclient: use "is_connected" check when scheduling tick

When schedule_tick is called for the first time (in init) we are
still not in hunting mode so mon_client_ping_interval and
mon_client_log_interval were used to schedule the tick.

Fixes: https://tracker.ceph.com/issues/46445
Signed-off-by: Mykola Golub <mgolub@suse.com>
4 years agoMerge pull request #36355 from batrick/ptl-tool-paging
Kefu Chai [Thu, 30 Jul 2020 04:17:36 +0000 (12:17 +0800)]
Merge pull request #36355 from batrick/ptl-tool-paging

script/ptl-tool: page through github response

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocephadm: add unwrap_ipv6 helper method 36360/head
Matthew Oliver [Thu, 30 Jul 2020 03:18:48 +0000 (13:18 +1000)]
cephadm: add unwrap_ipv6 helper method

When we pass in a mon-ip that is ipv6 we want it wrapped, this is so it
can be properly inserted into the mon_addrv address.
But there are times we need to unwrap it to test it's a valid ipv6
address.

This patch adds a helper method `unwrap_ipv6` which takes a string and
returns it either unwrapped or as it is, so it's harmless to other types
of ips.

This allows us to check a wrapped ipv6 base_ip with the networks on the
host.

Signed-off-by: Matthew Oliver <moliver@suse.com>
4 years agoMerge pull request #36093 from sebastian-philipp/build-integration-branch-stable...
Kefu Chai [Thu, 30 Jul 2020 03:15:38 +0000 (11:15 +0800)]
Merge pull request #36093 from sebastian-philipp/build-integration-branch-stable-branch-name

build-integration-branch: Append stable branch name

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge PR #36288 into master
Patrick Donnelly [Thu, 30 Jul 2020 03:13:10 +0000 (20:13 -0700)]
Merge PR #36288 into master

* refs/pull/36288/head:
mds/CInode: Optimize only pinned by subtrees check

Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoscript/ptl-tool: page through github response 36355/head
Patrick Donnelly [Tue, 14 Jul 2020 02:50:00 +0000 (19:50 -0700)]
script/ptl-tool: page through github response

This fixes the script to go through the response pages from GitHub.
Previously it would only look at the first page and potentially miss
some reviews/comments.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36249 into master
Patrick Donnelly [Thu, 30 Jul 2020 03:06:14 +0000 (20:06 -0700)]
Merge PR #36249 into master

* refs/pull/36249/head:
client: expose ceph.quota.max_bytes xattr within snapshots

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #35977 into master
Patrick Donnelly [Thu, 30 Jul 2020 03:00:06 +0000 (20:00 -0700)]
Merge PR #35977 into master

* refs/pull/35977/head:
doc/cephfs: Update about cephfs-shell custom exit codes
cephfs-shell: Define cephfs-shell exit code

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36064 into master
Patrick Donnelly [Thu, 30 Jul 2020 02:58:16 +0000 (19:58 -0700)]
Merge PR #36064 into master

* refs/pull/36064/head:
mgr/volumes: Fix traceback of ops when volume doesn't exist

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge PR #36200 into master
Patrick Donnelly [Thu, 30 Jul 2020 02:56:57 +0000 (19:56 -0700)]
Merge PR #36200 into master

* refs/pull/36200/head:
mds: fix mds peer request 'no_available_op_found'

Reviewed-by: Zheng Yan <zyan@redhat.com>
4 years agoMerge PR #36233 into master
Patrick Donnelly [Thu, 30 Jul 2020 02:55:28 +0000 (19:55 -0700)]
Merge PR #36233 into master

* refs/pull/36233/head:
client: fix extra open ref decrease

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agomgr/volumes: Add documentation regarding --retain-snapshots option 35647/head
Shyamsundar Ranganathan [Tue, 21 Jul 2020 13:43:18 +0000 (09:43 -0400)]
mgr/volumes: Add documentation regarding --retain-snapshots option

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Avoid trashing retained subvolume on create errors
Shyamsundar Ranganathan [Thu, 16 Jul 2020 01:03:58 +0000 (21:03 -0400)]
mgr/volumes: Avoid trashing retained subvolume on create errors

On any create or create_clone errors the entire subvolume was being
removed. This should be conditional and remove only the incarnation
if the subvolume was in the retained state.

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Add subvolume v2 test cases
Shyamsundar Ranganathan [Tue, 14 Jul 2020 21:41:54 +0000 (17:41 -0400)]
mgr/volumes: Add subvolume v2 test cases

Added test cases for v2 subvolumes

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Derive v2 from v1 to leverage common methods
Shyamsundar Ranganathan [Wed, 8 Jul 2020 12:15:57 +0000 (08:15 -0400)]
mgr/volumes: Derive v2 from v1 to leverage common methods

With v2 introduction in subvolumes, there is quite a bit of
common code and methods that both v1 and v2 share.

To reduce overall code bloat and improve maintainability, derive
SubvolumeV2 from SubvolumeV1.

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Introduce v2 subvolumes
Shyamsundar Ranganathan [Sun, 5 Jul 2020 23:17:02 +0000 (19:17 -0400)]
mgr/volumes: Introduce v2 subvolumes

Implements subvolume v2 version.

Following support is added,
- Ability to retain snapshots on subvolume deletion
- Modify directory where snapshot is created to the subvolume
- "features" supported to subvolume info output, specifically ability
for a subvolume to retain snashots
- Current state of subvolume in info output
- Auto upgrade to v2 from eligible v1 subvolumes
- Adjust other functions as needed to support the changes

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agomgr/volumes: Use operation type during subvolume open
Shyamsundar Ranganathan [Thu, 2 Jul 2020 01:08:34 +0000 (21:08 -0400)]
mgr/volumes: Use operation type during subvolume open

Subvolume open currently takes in 2 optional parameters to
denote desired state and type. This enables the open to
allow the operation to suceed based on the (type, state)
tuple.

Instead, pass an operation type to be performed on a subvolume
during open, and decide internal to a subvolume version if the
operation is allowed based on its state and type.

Also modifies the state machine code, to be more amenable to
modifications and improves redability.

Signed-off-by: Shyamsundar Ranganathan <srangana@redhat.com>
4 years agoqa: defer cleaning the mountpoint's netnses and the bridge 35944/head
Xiubo Li [Mon, 6 Jul 2020 12:27:34 +0000 (08:27 -0400)]
qa: defer cleaning the mountpoint's netnses and the bridge

The netnses maybe created/deleted many times in the whole test cases,
we can defer cleaning them untile the last mountpoint is unmounted
or when the test is exiting.

Fixes: https://tracker.ceph.com/issues/46282
Signed-off-by: Xiubo Li <xiubli@redhat.com>
4 years agomgr/cephadm: add qa tests for daemon restart 36338/head
Paul Cuzner [Wed, 29 Jul 2020 21:02:04 +0000 (09:02 +1200)]
mgr/cephadm: add qa tests for daemon restart

Added tests to cove daemon stop/start and restart

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
4 years agomgr/cephadm: streamline rgw deployment 36162/head
Daniel-Pivonka [Thu, 16 Jul 2020 12:24:47 +0000 (08:24 -0400)]
mgr/cephadm: streamline rgw deployment

cephadm will create realm, zonegroup, and zone if needed before creating rgw service

fixes: https://tracker.ceph.com/issues/43681
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
4 years agoMerge PR #24068 into master
Patrick Donnelly [Wed, 29 Jul 2020 18:05:02 +0000 (11:05 -0700)]
Merge PR #24068 into master

* refs/pull/24068/head:
mds: rename {CDir,Migrator}::cache to mdcache
mds: make MDSCacheObject::is_ambiguous_auth() virtual
mds: make sure rename old inode's parent dirfrag is projected.
mds: track projected inode/fnode in Mutation
mds: use smart pointer to manager CDir::fnode
mds: use smart pointer to manage CInode::{inode,xattrs,old_inodes}
osdc/Filer: make layout pointer const

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomgr/orch: allow for multiline OrchestratorEvent message 36334/head
Michael Fritch [Tue, 28 Jul 2020 19:57:17 +0000 (13:57 -0600)]
mgr/orch: allow for multiline OrchestratorEvent message

Signed-off-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #36053 from tchaikov/wip-mkdir
Kefu Chai [Wed, 29 Jul 2020 14:48:04 +0000 (22:48 +0800)]
Merge pull request #36053 from tchaikov/wip-mkdir

kv: replace compat_mkdir with fs::create_directory

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