Commit Graph

103863 Commits

Author SHA1 Message Date
Yingxin Cheng
bf958abc0f crimson: build seastar dpdk from src/seastar/dpdk
src/spdk/dpdk and src/seastar/dpdk are both at their private branches
with project-specific modifications, so select proper dpdk source
directory according to flags WITH_SPDK and Seastar_DPDK.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-13 15:53:43 +08:00
Yingxin Cheng
ab84158fc0 crimson: link required dpdk components for seastar
see https://github.com/scylladb/seastar/blob/
809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-13 15:53:31 +08:00
Yingxin Cheng
2cb2cd33dd test/crimson: move msgr perf tool to src/tools/crimson
Do not disable targets perf_crimson_msgr and perf_async_msgr when
WITH_TESTS=OFF

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 10:38:32 +08:00
Patrick Donnelly
eb209019b9
Merge PR #31401 into master
* refs/pull/31401/head:
	mds: clarify comment

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
2019-11-05 16:54:03 -08:00
Sage Weil
9ba87385bc Merge PR #31420 into master
* refs/pull/31420/head:
	ceph-daemon: do not screw up line splitting
	mgr/ssh: raise RuntimeError when ceph-daemon invocation fails

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-05 12:36:45 -06:00
Sage Weil
83b072f3cc ceph-daemon: do not screw up line splitting
When we log stdout and stderr, we were artificially adding line splits
due to reading 1024 bytes at a time and assuming it was aligned with a
newline.

Fix by keeping partial lines buffered and only log them once they are
complete (or the call finishes).

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 12:11:06 -06:00
Sage Weil
e38eeb62c5 mgr/ssh: raise RuntimeError when ceph-daemon invocation fails
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 10:27:45 -06:00
Lenz Grimmer
f4c0f580b9
mgr/dashboard: disable pg_autoscale for new pools in e2e tests (#31396)
mgr/dashboard: disable pg_autoscale for new pools in e2e tests

Reviewed-by: Laura Paduano <lpaduano@suse.com>
2019-11-05 15:59:57 +00:00
Sage Weil
f5762cc984 Merge PR #31365 into master
* refs/pull/31365/head:
	ceph-daemon: make rm-daemon reset-failed
	ceph-daemon: make rm-cluster handle failed unit cleanup

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-05 09:28:32 -06:00
Sage Weil
6cca11e80a Merge PR #31303 into master
* refs/pull/31303/head:
	ceph-daemon: make systemd unit descriptions Capitalized
	ceph-daemon: handle daemon names with multiple .'s
	mgr/ssh: rgw: ensure map rgws are mapped to the zone
	mgr/ssh: use . as delimiter between service group and id
	mgr/ssh: implement 'rgw update'
	mgr/orchestrator_cli: add 'rgw update' CLI command
	mgr/ssh: add 'rgw rm'
	mgr/ssh: implement 'rgw add'
	ceph-daemon: handle 'rgw' type daemons
	mgr/orchestrator_cli: rgw add: optionally take count and node names

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-05 08:55:59 -06:00
Sage Weil
d7fc56b72b ceph-daemon: make systemd unit descriptions Capitalized
Same style as other units.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:01 -06:00
Sage Weil
332432bdc1 ceph-daemon: handle daemon names with multiple .'s
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:01 -06:00
Sage Weil
b3097bf8b0 mgr/ssh: rgw: ensure map rgws are mapped to the zone
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:01 -06:00
Sage Weil
a2fabd86db mgr/ssh: use . as delimiter between service group and id
This aligns with . as an entity delimiter in the ceph config.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:01 -06:00
Sage Weil
f59a40186b mgr/ssh: implement 'rgw update'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:01 -06:00
Sage Weil
a8a05e2e29 mgr/orchestrator_cli: add 'rgw update' CLI command
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:00 -06:00
Sage Weil
5c09643823 mgr/ssh: add 'rgw rm'
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:00 -06:00
Sage Weil
06abbd518d mgr/ssh: implement 'rgw add'
Note that this doesn't correctly confine a daemon to a zone.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:00 -06:00
Sage Weil
1d61bfb3af ceph-daemon: handle 'rgw' type daemons
- weird data dir: /var/lib/ceph/radosgw/ceph-rgw.$id (not
  /var/lib/ceph/rgw/ceph-$id)
- weird auth name: client.rgw.$id (not rgw.$id)
- weird entrypoint: /usr/bin/radosgw (not /usr/bin/ceph-rgw)

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:00 -06:00
Sage Weil
47c5d3c8b6 mgr/orchestrator_cli: rgw add: optionally take count and node names
This avoids the need for JSON in the common case.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 08:46:00 -06:00
Sage Weil
35640cb201 Merge PR #31327 into master
* refs/pull/31327/head:
	mon/ConfigMap: search nested sections

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-11-05 08:39:09 -06:00
Sage Weil
8fc888e3c9 Merge PR #31412 into master
* refs/pull/31412/head:
	osd: send smart asok result to stdout, not stderr

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-05 08:38:47 -06:00
Casey Bodley
3e718d3f4f
Merge pull request #31363 from cbodley/wip-qa-rgw-ec-is-fast-again
qa/rgw: remove whitelist for SLOW_OPS against ec pools

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2019-11-05 08:52:10 -05:00
Sage Weil
6be3ef3f25 osd: send smart asok result to stdout, not stderr
Uncross the streams!

Reported-by: Patrick Seidensal <pseidensal@suse.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2019-11-05 07:34:07 -06:00
Sage Weil
aa010d47ef Merge PR #31321 into master
* refs/pull/31321/head:
	ceph-daemon: do not relabel system directories
2019-11-05 07:08:09 -06:00
Sage Weil
456417d3ba Merge PR #31342 into master
* refs/pull/31342/head:
	qa/standalone/test_ceph_daemon: fix multi-version python test

Reviewed-by: Michael Fritch <mfritch@suse.com>
2019-11-05 07:07:06 -06:00
Nathan Cutler
626daf4b20
Merge pull request #30598 from smithfarm/wip-doc-releases-toc
doc/releases: access main releases page from top-level TOC

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2019-11-05 13:18:25 +01:00
Kefu Chai
5830813f2e
Merge pull request #31291 from liewegas/bug-42578
mgr/ActivePyModules: behave if a module queries a devid that does not exist

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-05 04:17:17 -08:00
Kefu Chai
b1180766e5
Merge pull request #31230 from aclamk/fix-rados-put-truncate
tools/rados: prevent 'put' operation from recreating object when --offset=0

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-05 04:16:25 -08:00
Nathan Cutler
b205cf9973
Merge pull request #31366 from smithfarm/wip-cbs-4
ceph-backport.sh: implement interactive setup routine and new options

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-11-05 12:38:56 +01:00
Lenz Grimmer
0c978210ed
mgr/dashboard: Fix iSCSI Target's validation (#30894)
mgr/dashboard: Fix iSCSI Target's validation

Reviewed-by: Ricardo Marques <rimarques@suse.com>
2019-11-05 11:22:02 +00:00
Lenz Grimmer
03b07c5a57
mgr/dashboard: Fix OSD's safe_to_destroy method (#30499)
mgr/dashboard: Fix OSD's safe_to_destroy method

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
2019-11-05 11:21:16 +00:00
Kiefer Chang
83dffd3f85
mgr/dashboard: disable pg_autoscale for new pools in e2e tests
The pg_autoscaler might interfere the editing pool e2e test, disable the
global config to avoid this problem.

Fixes: https://tracker.ceph.com/issues/42608
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
2019-11-05 18:38:29 +08:00
Patrick Donnelly
fe35cb1b7e
mds: clarify comment
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-05 00:38:58 -08:00
Patrick Donnelly
cf2c39ec9d
Merge PR #30835 into master
* refs/pull/30835/head:
	mds: no assert on frozen dir when scrub path

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-04 22:29:29 -08:00
Patrick Donnelly
dcc2c1da86
Merge PR #30915 into master
* refs/pull/30915/head:
	mds: Reorganize class members in MDSAuthCaps header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-04 22:27:53 -08:00
Patrick Donnelly
2119809bb7
Merge PR #30745 into master
* refs/pull/30745/head:
	mds: Reorganize class members in MDCache header

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-11-04 22:23:07 -08:00
Patrick Donnelly
76493421d2
Merge PR #31330 into master
* refs/pull/31330/head:
	messages: protect CephFS messages get/put methods
	messages: protect MClientCapRelease cons
	messages: simplify MMDSCacheRejoin default cons
	mds: simplify type declarations

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-11-04 22:21:33 -08:00
Casey Bodley
5a15148b7b
Merge pull request #31374 from cbodley/wip-qa-rgw-multisite-sse
qa/rgw: use 'testing' kms backend for multisite tests

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2019-11-04 13:45:24 -05:00
Nathan Cutler
b33f788790 ceph-backport.sh: increment the version number
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-04 19:33:44 +01:00
Nathan Cutler
22b27c8c93 ceph-backport.sh: delete deprecated config file after setup complete
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-04 19:33:44 +01:00
Nathan Cutler
c250cf2589 ceph-backport.sh: implement interactive setup routine and new options
This commit implements several new features:

* a --cherry-pick-only option
* a --force option
* an --existing-pr option
* an interactive setup routine

The --cherry-pick-only option can be used to test whether a backport
cherry-picks cleanly, for example. This is the same as the --prepare
functionality that was provided by an earlier version of the script, and
--prepare is re-introduced as a synonym for --cherry-pick-only.

The --force option can be used to make the script less careful (less
"cowardly"). For example, if the script refuses to do a backport because the
backport tracker issue is assigned to someone else, the script will "cowardly"
refuse to continue. Use --force to override. Be aware that --force will also
blow away an existing wip branch - the script asks for user confirmation in this
case.

The new --existing-pr option can be used to specify the number (ID) of an
existing backport PR that addresses the backport tracker issue given via the
positional argument.

The new "interactive setup routine" should make the setup process much simpler
for the user. If there is a setup issue, the script produces a report and starts
the interactive setup routine, which prompts the user for the needed
information.

Also, the script no longer requires the user to explicitly provide values for
github_user and redmine_user_id. Instead, it divines the correct values from the
GitHub token and the Redmine key, respectively.

Finally, the existing ~/bin/backport_common.sh file is deprecated in favor of
two files:

    ~/.github_token
    ~/.redmine_key

(The latter is already used by Sage's build-integration-branch tool and it
didn't make sense to have two different configuration files for a single
purpose.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2019-11-04 19:33:40 +01:00
Casey Bodley
ad4ff5f948 qa/rgw: use 'testing' kms backend for multisite tests
a missing piece from https://github.com/ceph/ceph/pull/30940

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2019-11-04 12:49:07 -05:00
Sebastian Wagner
be6b09feb2
Merge pull request #31192 from sebastian-philipp/run_mypy-0.740
script/run_mypy: Support mypy 0.740

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2019-11-04 17:37:40 +01:00
Sage Weil
8afa48835e Merge PR #31341 into master
* refs/pull/31341/head:
	ceph-daemon: only set up /var/run/ceph/$fsid if it exists

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-04 10:34:57 -06:00
Sage Weil
abbe73c77b Merge PR #31331 into master
* refs/pull/31331/head:
	ceph-daemon: Use `shutil` to move/copy files

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-04 10:34:43 -06:00
Sage Weil
3507d74336 Merge PR #31353 into master
* refs/pull/31353/head:
	doc/orchestrator: Fix various issues in Orchestrator CLI documentation

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-11-04 10:33:04 -06:00
Sage Weil
ce729f4023 Merge PR #31329 into master
* refs/pull/31329/head:
	ceph-daemon: Fix `ls` cmd for legacy confs

Reviewed-by: Sage Weil <sage@redhat.com>
2019-11-04 10:27:04 -06:00
Michael Fritch
ddaa81e93e
ceph-daemon: Fix ls cmd for legacy confs
Signed-off-by: Michael Fritch <mfritch@suse.com>
2019-11-04 09:22:01 -07:00
Sage Weil
3a0edae654 Merge PR #31328 into master
* refs/pull/31328/head:
	ceph-daemon: raise RuntimeError when CephContainer.run() fails
2019-11-04 10:17:05 -06:00