Kefu Chai
40e755c36f
Merge pull request #32175 from rzarzynski/wip-crimson-errorator-do_with-friendship
...
crimson: make seastar::do_with() a friend of errorated futures.
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-12-12 17:00:47 +08:00
Kefu Chai
cb399a9b39
Merge pull request #32143 from tchaikov/wip-qa-rocksdb-test
...
qa/workunits/rados/test_envlibrados_for_rocksdb: accomodate rocksdb c…
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-12 13:51:03 +08:00
Xie Xingguo
c4d12bfef8
Merge pull request #32099 from hjwsm1989/wip-cancel-invalid-upmap-2
...
crush: remove invalid upmap items
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: David Zafman <dzafman@redhat.com>
2019-12-12 11:11:34 +08:00
Sage Weil
cdad3d2001
Merge PR #32193 into master
...
* refs/pull/32193/head:
qa/tasks/ceph2 -> cephadm
mgr/ssh -> mgr/cephadm
mgr/ssh,cephadm: ceph-daemon -> cephadm
doc/bootstrap: ceph-daemon -> cephadm
ceph-daemon-adoption-corpus -> cephadm-adoption-corpus
qa: rename ceph-daemon tests -> cephadm
qa/tasks: ceph-daemon -> cephadm throughput var names and comments
mgr/ssh,qa/tasks/ceph2: fix mode to be cephadm-package (vs root)
mgr/ssh: rename option ceph_daemon_path -> cephadm_path
files,rpm,deb: rename ceph-daemon -> cephadm
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-11 20:30:53 -06:00
Sage Weil
6c4541bb28
qa/tasks/ceph2 -> cephadm
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:24 -06:00
Sage Weil
cd1c05acbb
mgr/ssh -> mgr/cephadm
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:24 -06:00
Sage Weil
f466b3a149
mgr/ssh,cephadm: ceph-daemon -> cephadm
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:18 -06:00
Sage Weil
9fb2bfed0c
doc/bootstrap: ceph-daemon -> cephadm
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:18 -06:00
Sage Weil
d120ffcdff
ceph-daemon-adoption-corpus -> cephadm-adoption-corpus
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:17 -06:00
Sage Weil
137fa64e12
qa: rename ceph-daemon tests -> cephadm
...
Also move the workunit to a better location.
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
51ecc1b922
qa/tasks: ceph-daemon -> cephadm throughput var names and comments
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
7d63071d4e
mgr/ssh,qa/tasks/ceph2: fix mode to be cephadm-package (vs root)
...
At the same time align the option names with ceph2.py, yay.
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
caf95211c0
mgr/ssh: rename option ceph_daemon_path -> cephadm_path
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
c8750b7066
files,rpm,deb: rename ceph-daemon -> cephadm
...
This is just renaming the files and adjusting the packages. Lots of
cleanup to do still.
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 19:14:09 -06:00
Sage Weil
a5b3037050
Merge PR #32189 into master
...
* refs/pull/32189/head:
mgr/orchestrator_cli: set type for 'orchestrator' option
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-11 15:49:04 -06:00
Sage Weil
a2af551872
Merge PR #32157 into master
...
* refs/pull/32157/head:
ceph-daemon: fix pod stop
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-12-11 15:48:47 -06:00
Sage Weil
e6c5554759
mgr/orchestrator_cli: set type for 'orchestrator' option
...
If we don't specify the type, the mgr_module.py will str() the default
value, turning it into "None", breaking the self-test.
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 12:26:10 -06:00
Patrick Donnelly
2216c63ed5
Merge PR #31729 into master
...
* refs/pull/31729/head:
qa: reduce cache size further
mds: obsoleting 'mds_cache_size'
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:44:27 -08:00
Patrick Donnelly
70c6043fbc
Merge PR #31718 into master
...
* refs/pull/31718/head:
mds: Reorganize class members in ScrubStack header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:42:18 -08:00
Patrick Donnelly
390661b40e
Merge PR #31717 into master
...
* refs/pull/31717/head:
mds: Reorganize class members in ScrubHeader header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:41:27 -08:00
Patrick Donnelly
2399be4a70
Merge PR #31716 into master
...
* refs/pull/31716/head:
mds: Reorganize class members in ScatterLock header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:40:25 -08:00
Patrick Donnelly
e15e0ef871
Merge PR #31635 into master
...
* refs/pull/31635/head:
mds: Reorganize class members in RecoveryQueue header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:39:27 -08:00
Patrick Donnelly
e241f773e6
Merge PR #31597 into master
...
* refs/pull/31597/head:
mds: Reorganize class members in OpenFileTable header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:37:54 -08:00
Patrick Donnelly
a645994d75
Merge PR #30201 into master
...
* refs/pull/30201/head:
qa/tasks: remove subvolume, subvolumegroup and their snapshots with --force
qa/tasks: Fix the commands success
qa/tasks: Fix raises that doesn't re-raise
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-11 09:36:49 -08:00
Sage Weil
3398379af8
Merge PR #32178 into master
...
* refs/pull/32178/head:
qa/standalone/test_ceph_daemon.sh: disable adoption for the moment
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-11 11:10:42 -06:00
Jason Dillaman
64b9e69d2b
Merge pull request #32176 from idryomov/wip-doc-fancy-striping
...
doc: clarify support for rbd fancy striping
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-11 11:35:42 -05:00
Patrick Donnelly
be58eb0a8d
Merge PR #32163 into master
...
* refs/pull/32163/head:
qa: fix output check to not be sensitive to debugging
Reviewed-by: Rishabh Dave <ridave@redhat.com>
2019-12-11 06:24:13 -08:00
Nathan Cutler
7afafc060a
Merge pull request #32083 from smithfarm/wip-42612
...
rpm: add rpm-build to SUSE-specific make check deps
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-12-11 15:14:31 +01:00
Sage Weil
e5e41c443d
Merge PR #32160 into master
...
* refs/pull/32160/head:
doc/releases/nautilus,PendingReleaseNotes: consolidate telemetry note
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2019-12-11 08:06:40 -06:00
Sage Weil
80cbe97e7b
qa/standalone/test_ceph_daemon.sh: disable adoption for the moment
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-11 07:32:29 -06:00
Thomas Bechtold
2ad13f5d48
Merge pull request #32161 from mgfritch/wip-cd-tox-warn
...
ceph-daemon: `imp` module DeprecationWarning
2019-12-11 13:44:27 +01:00
Lenz Grimmer
d6e7f51070
mgr/dashboard: Disable cache for static files ( #31018 )
...
mgr/dashboard: Disable cache for static files
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-12-11 12:28:19 +00:00
Ilya Dryomov
abd20b5ca9
doc: clarify support for rbd fancy striping
...
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2019-12-11 12:41:09 +01:00
Radoslaw Zarzynski
b667e8629b
crimson: make seastar::do_with() a friend of errorated futures.
...
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-12-11 11:57:57 +01:00
Kefu Chai
8e00a36d53
Merge pull request #32025 from tchaikov/wip-pick-address-silence-warning
...
common/pick_address.cc: silence GCC warning
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-11 12:08:10 +08:00
Sage Weil
628af7f226
Merge PR #32091 into master
...
* refs/pull/32091/head:
common/config: update values when they are removed via mon
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-10 22:05:03 -06:00
Kefu Chai
b9225dfbc3
common/pick_address.cc: silence GCC warning
...
* use `string_view` instead of string
* use `auto` instead of `int` to silence the warning
* use `enum class` instead of plain `enum`
* do not specify the value of enum, as
we don't care about it
this change silences following warning
```
../src/common/pick_address.cc: In function ‘int get_iface_numa_node(const string&, int*)’:
../src/common/pick_address.cc:517:11: warning: comparison of integer expressions of different signedness: ‘int’ and ‘const size_type’ {aka ‘const long unsigned int’} [-Wsign-com\
pare]
517 | if (pos != string::npos ) {
| ~~~~^~~~~~~~~~~~~~~
```
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-12-11 10:04:16 +08:00
Kefu Chai
0e52da069b
Merge pull request #31839 from alimaredia/wip-s3-test-branch-refactor
...
qa: update s3-test download code for s3-test tasks
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
2019-12-11 09:28:58 +08:00
Patrick Donnelly
0448a31fcb
qa: fix output check to not be sensitive to debugging
...
The traceback would screw up the equality checks.
Also, use unittest asserts so we can easily see the assert values.
Fixes: https://tracker.ceph.com/issues/43247
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-10 16:45:09 -08:00
Sage Weil
79f7e6aeef
Merge PR #31772 into master
...
* refs/pull/31772/head:
qa/standalone/test_ceph_daemon.sh: clone corpus explicitly
ceph-daemon: re-enable the OSD standalone test
ceph-daemon: move standalone test tgz to corpus
ceph-daemon: add ceph-daemon-adoption-corpus.git submodule
Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-12-10 16:40:58 -06:00
Jason Dillaman
f6c18468ce
Merge pull request #30548 from trociny/wip-41557
...
rbd-mirror: snapshot mirror mode
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-12-10 16:41:28 -05:00
Patrick Donnelly
c4d9e8337d
Merge PR #31122 into master
...
* refs/pull/31122/head:
mds: Reorganize class members in MDSTable header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-10 13:33:54 -08:00
Patrick Donnelly
0da6402e12
Merge PR #31253 into master
...
* refs/pull/31253/head:
mds: Reorganize class members in Migrator header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-10 13:32:19 -08:00
Patrick Donnelly
39df21b940
Merge PR #31596 into master
...
* refs/pull/31596/head:
mds: Reorganize class members in PurgeQueue header
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-10 13:31:28 -08:00
Patrick Donnelly
59f641e295
qa: reduce cache size further
...
1M isn't low enough to trigger recall/trimming.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-12-10 13:24:50 -08:00
Michael Fritch
0504c3ed89
ceph-daemon: imp
module DeprecationWarning
...
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-12-10 14:09:08 -07:00
Sage Weil
c50c17e755
doc/releases/nautilus,PendingReleaseNotes: consolidate telemetry note
...
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-10 14:36:06 -06:00
Sage Weil
aa760fa501
Merge PR #32148 into master
...
* refs/pull/32148/head:
doc/releases/nautilus: fix release notes (crash->device)
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2019-12-10 14:33:02 -06:00
Sage Weil
f1de706076
ceph-daemon: fix pod stop
...
- rm -f, not stop, so we don't leave things lingering in 'podman ps -a'
output
- this also seems to fix/work around a problem where stopping the container
leaves the daemon running?
Signed-off-by: Sage Weil <sage@redhat.com>
2019-12-10 13:20:03 -06:00
David Zafman
47b5fd9383
Merge pull request #32041 from dzafman/wip-balancer3-pending
...
release note: Add pending release notes for already merged code
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-12-10 10:56:04 -08:00