RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-16 07:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
109,387 Commits 216 Branches 0 Tags 1.2 GiB
b7857818f8
Commit Graph

109387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
b7857818f8 cephadm: relabel /etc/ganesha mount 
Fixes: https://tracker.ceph.com/issues/44701
Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-20 15:30:11 -05:00
Sage Weil
f64de8f475 Merge PR #34034 into octopus 
* refs/pull/34034/head:
	cephadm: make add-repo --release and --version independent

Reviewed-by: Sebastian Wagner <swagner@suse.com>
 2020-03-20 08:12:50 -05:00
Sage Weil
06ecd31e39 Merge PR #33540 into octopus 
* refs/pull/33540/head:
	doc/orchestrator: update rgw creation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
 2020-03-19 14:56:27 -05:00
Sage Weil
eab56bf5ef Merge PR #34023 into octopus 
* refs/pull/34023/head:
	mgr/test_orchestrator: fix service filtering when using dummy data
	mgr/dashboard: fix adding/removing host errors

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
 2020-03-19 14:33:35 -05:00
Sage Weil
d75c7e79bf Merge PR #34044 into octopus 
* refs/pull/34044/head:
	remove ceph_test_rados_watch_notify

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2020-03-19 13:47:29 -05:00
Sage Weil
5f8450f091 Merge PR #34030 into octopus 
* refs/pull/34030/head:
	cephadm: env over last used
	cephadm: fall back to default for infer_image
	cephadm: remove outdated check
	cephadm: consolidate default image logic
	cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
 2020-03-19 12:21:52 -05:00
Yehuda Sadeh
1833797488 doc/orchestrator: update rgw creation 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2020-03-19 08:11:50 -07:00
Sage Weil
3ed3f34b98 Merge PR #34027 into octopus 
* refs/pull/34027/head:
	qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
	mgr/cephadm: do not reconfig unmanaged services
	qa/workunits/cephadm/test_cephadm: output file for pub key

Reviewed-by: Sebastian Wagner <swagner@suse.com>
 2020-03-19 08:22:40 -05:00
Sage Weil
e1c39fbfec cephadm: make add-repo --release and --version independent 
Specify either --release name (to get the latest) or --version x.y.z to
get a specific version.

Adapt to updated locations on download.ceph.com so that we don't need to
know the release name for a specific x.y.z release.

Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-19 08:09:21 -05:00
Sage Weil
74fd8e7aa3 Merge PR #34045 into octopus 
* refs/pull/34045/head:
	mgr/progress: fix duration strings

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2020-03-19 08:07:05 -05:00
Sage Weil
bad788d584 cephadm: env over last used 
Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-19 07:54:34 -05:00
Mykola Golub
bff92cab55
Merge pull request #34035 from dillaman/wip-rbd-permissions 
qa/workunits/rbd: use context managers to control Rados lifespan

Reviewed-by: Mykola Golub <mgolub@suse.com>
 2020-03-19 10:43:57 +02:00
Sage Weil
7bd3424bd7 cephadm: fall back to default for infer_image 
Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 19:10:20 -05:00
Sage Weil
a0a51c0874 cephadm: remove outdated check 
Either the user passed their own image or we filled in the (monitoring)
default--no need for this check.

Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 19:10:20 -05:00
Sage Weil
a8d7f871b1 cephadm: consolidate default image logic 
Merge the _parse_args() logic into @default_image.

Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 19:10:20 -05:00
Sage Weil
555926714c mgr/progress: fix duration strings 
- simplify the code to just calculate the durations when we need them
(I'm not sure why we had those temporary strings!)
- use a nicer time delta format

Fixes: https://tracker.ceph.com/issues/44672
Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 19:04:14 -05:00
Sage Weil
282932867a remove ceph_test_rados_watch_notify 
This is an old test, we have good watch/notify coverage in the newer
tests, and it is buggy.

Fixes: https://tracker.ceph.com/issues/43861
Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 17:45:17 -05:00
Sage Weil
2e7f7efc85 Merge PR #34014 into octopus 
* refs/pull/34014/head:
	mgr/balancer: tolerate pgs outside of target weight map

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2020-03-18 17:42:48 -05:00
Sage Weil
08571b790b Merge PR #34001 into octopus 
* refs/pull/34001/head:
	mgr/cephadm: pytest: Enable SpecStore
	mgr/orchestrator: add test for default implementation for apply()
	python-common: validate ServiceSpec.service_type
	fixup mgr/cephadm: Fix ceph orch apply -i
	mgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion
	mgr/orchestrator: `orch daemon add` accepts a yaml
	mgr/cephadm: apply_drivegroups() returns a single Completion
	mgr/cephadm: remove `trivial_result()`
	mgr/cephadm: Fix `ceph orch apply -i`

Reviewed-by: Sage Weil <sage@redhat.com>
 2020-03-18 17:42:10 -05:00
Sage Weil
8d8e09a5f1 cephadm: only infer image for shell, run, inspect-image, pull, ceph-volume 
Use a decorators for infer, require, and default.

Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 15:03:04 -05:00
Sage Weil
11d607d0b7 Merge PR #34011 into octopus 
* refs/pull/34011/head:
	qa/suites/rados/verify/validater/valgrind: tolerate SLOW_OPS
	qa/suites/rados/verify/validater/valgrind: less bluestore logging
	qa/suites/rados/verify/validater: increase heartbeat grace
	Revert "qa/suites/rados/verify: debug_ms = 1, osd_heartbeat_grace = 60"
	Revert "qa/suites/rados/verify/validator/valgrind: debug refs = 5"
	ceph_test_watch_notify: try notify 10x if ALLOW_TIMEOUTS is set
	ceph_test_rados_api_misc: ShutdownRace timeout if ALLOW_TIMEOUTS is set
	qa/suites/rados/verify: set ALLOW_TIMEOUTS for workunits

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
 2020-03-18 12:12:54 -05:00
Jason Dillaman
477570a974 qa/workunits/rbd: use context managers to control Rados lifespan 
There is a potential race between the expected exceptions being
thrown and Python shutting down racing with librados background
threads. Ensure that librados is properly shut down prior to
exiting Python.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2020-03-18 12:56:14 -04:00
Mykola Golub
e2a3842a6d
Merge pull request #34032 from dillaman/wip-rbd-octopus-docs 
doc/releases/octopus: add additional RBD improvements

Reviewed-by: Mykola Golub <mgolub@suse.com>
 2020-03-18 18:45:43 +02:00
Jason Dillaman
965c300434 doc/releases/octopus: add additional RBD improvements 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2020-03-18 12:16:28 -04:00
Sage Weil
acbda9d19d qa/workunits/cephadm/test_cephadm: mark services unmanaged for test 
We are deploying containers manually.  Mark them unmanaged so that we
do not fight against mgr/cephadm cleaning up orphan daemons.

Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 10:44:42 -05:00
Sage Weil
ba82677408 mgr/cephadm: do not reconfig unmanaged services 
Fixes: https://tracker.ceph.com/issues/44615
Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 10:09:00 -05:00
Sage Weil
9ea587142a Merge PR #33981 into octopus 
* refs/pull/33981/head:
	doc/install: edits
	doc/cephadm: more edits
	doc/cephadm/install: edits
	doc/cephadm/adoption: improvements
	doc/cephadm/install: a few edits
	doc/cephadm/install: do not install ceph-common on host (by default)
	doc/cephadm: drop os recs link
	doc/cephadm/upgrade: improvements
	doc/cephadm/upgrade: document upgrade
	doc/cephadm/install: revamp install docs
	doc: reorganize cephadm docs
	doc/cephadm/administration: update docs on customizing SSH config
	doc/cephadm/administration: add a note about the 'removed' dir

Reviewed-by: Sebastian Wagner <swagner@suse.com>
 2020-03-18 09:45:16 -05:00
Ramana Raja
e3bf5e7c7b
Merge pull request #34018 from ajarr/octopus-subvolume-clone-cancel 
mgr/volumes: add FS subvolume clone cancel

 Reviewed-by: Ramana Raja <rraja@redhat.com>
 2020-03-18 19:22:06 +05:30
Sage Weil
ee108d4395 qa/workunits/cephadm/test_cephadm: output file for pub key 
Signed-off-by: Sage Weil <sage@redhat.com>
 2020-03-18 08:44:10 -05:00
Sage Weil
610ec12ac2 Merge PR #33866 into octopus 
* refs/pull/33866/head:
	mgr/cephadm: limit number of times check host is performed in the serve loop

Reviewed-by: Sebastian Wagner <swagner@suse.com>
 2020-03-18 08:14:19 -05:00
Sage Weil
a12b90da5d Merge PR #34005 into octopus 
* refs/pull/34005/head:
	python-common: reduce output of ServiceSpec.to_json()
	python-common,mgr/cephadm: move assert_valid_host to service_spec
	mgr/cephadm: add HostAssignment.validate()

Reviewed-by: Sage Weil <sage@redhat.com>
 2020-03-18 08:14:06 -05:00
Sage Weil
1e25680552 Merge PR #34013 into octopus 
* refs/pull/34013/head:
	qa/workunits/cephadm/test_cephadm: --skip-monitoring-stack

Reviewed-by: Michael Fritch <mfritch@suse.com>
 2020-03-18 08:13:56 -05:00
Sebastian Wagner
d7a5edc521 mgr/cephadm: pytest: Enable SpecStore 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 13:44:49 +01:00
Sebastian Wagner
096542e1c0 mgr/orchestrator: add test for default implementation for apply() 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 13:44:49 +01:00
Sebastian Wagner
8fd7087042 python-common: validate ServiceSpec.service_type 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 13:44:49 +01:00
Sebastian Wagner
1a75c46df7 fixup mgr/cephadm: Fix ceph orch apply -i 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 13:44:49 +01:00
Kiefer Chang
31ad70d8f1 mgr/test_orchestrator: fix service filtering when using dummy data 
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
 2020-03-18 20:10:36 +08:00
Kiefer Chang
4f2db7e60e mgr/dashboard: fix adding/removing host errors 
Send a HostSpec instance to the Orchestrator when adding a host.

Also, to be consistent with other components:
- Reword from Add/Remove hosts to Create/Delete hosts
- Display a modal when there is no Orchestrator backend enabled

Fixes: https://tracker.ceph.com/issues/44664
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
 2020-03-18 20:10:28 +08:00
Sebastian Wagner
37f21075f8 mgr/dashbaord: orchestrator service: Revert wait_api_result to a single completion 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 11:03:20 +01:00
Sebastian Wagner
9c12b1b8d3 mgr/orchestrator: orch daemon add accepts a yaml 
Fixes: https://tracker.ceph.com/issues/44622
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 11:03:20 +01:00
Sebastian Wagner
a66793034d mgr/cephadm: apply_drivegroups() returns a single Completion 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 11:03:20 +01:00
Sebastian Wagner
a44abb4b8a mgr/cephadm: remove trivial_result() 
Replaced with `@trivial_completion`, otherwise
`self._apply()` would have needed to accept a list
of specs.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 11:03:19 +01:00
Sebastian Wagner
0127282201 mgr/cephadm: Fix ceph orch apply -i 
* We had two implementations for `ceph orcha apply`
* Remove yaml pasing in `mgr/cephadm`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2020-03-18 11:02:55 +01:00
Mykola Golub
7f16137997
Merge pull request #33994 from dillaman/wip-librbd-poll-event-race 
librbd: defer event socket completion until after callback issued

Reviewed-by: Dehao Shang <dehao.shang@intel.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
 2020-03-18 10:08:25 +02:00
Venky Shankar
60105f6101 doc: document clone cancel command 
Fixes: http://tracker.ceph.com/issues/44208
Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2020-03-18 11:03:21 +05:30
Venky Shankar
ba4b9358e1 test: add clone cancel tests 
Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2020-03-18 11:03:17 +05:30
Venky Shankar
a427c7074c mgr/volumes: introduce "clone cancel" volume command 
Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2020-03-18 11:03:11 +05:30
Venky Shankar
89a16c7867 mgr/volumes: allow canceling a single asynchronous job for a volume 
Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2020-03-18 11:03:06 +05:30
Venky Shankar
2dc41ea2db mgr/volumes: helper for looking up a clone entry index 
... this would be used when canceling a clone operation to
find the clone index for a given clone.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2020-03-18 11:02:56 +05:30
Venky Shankar
2f93b3beb4 mgr/volumes: periodically check if clone operations should be canceled 
Signed-off-by: Venky Shankar <vshankar@redhat.com>
 2020-03-18 11:02:52 +05:30