Commit Graph

92260 Commits

Author SHA1 Message Date
Kefu Chai
7267c433df
Merge pull request #25204 from cbodley/wip-cmake-without-rbd-cephfs
cmake: vstart target can build WITH_CEPHFS/RBD/MGR=OFF

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-22 11:32:15 +08:00
Jason Dillaman
1461c4dbc6
Merge pull request #25114 from trociny/wip-osd-perf-query-generic
mgr: generalize osd perf query and make counters accessible from modules

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-11-21 21:12:41 -05:00
Jason Dillaman
6be74b76c4
Merge pull request #25209 from runsisi/wip-fix-missing-prefix
test/librbd: metadata key for config should be prefixed with conf_

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-11-21 20:17:07 -05:00
Jason Dillaman
91bd5a3447
Merge pull request #24936 from mikechristie/igw-selinux
selinux: add support for ceph iscsi

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-11-21 19:14:48 -05:00
Jason Dillaman
006c68891c
Merge pull request #24965 from yangdongsheng/token_fix
common: complete all throttle blockers when we set average or max to 0

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-11-21 19:13:52 -05:00
Jason Dillaman
ec96e4e635
Merge pull request #25055 from runsisi/wip-fix-resize
librbd: fix missing unblock_writes if shrink is not allowed

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-11-21 19:13:19 -05:00
Jason Dillaman
4b3230b591
Merge pull request #25152 from Songweibin/wip-fix-get-key
rbd: fix error parse arg when getting key

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-11-21 19:13:02 -05:00
runsisi
ca98567d71 test/librbd: metadata key for config should be prefixed with conf_
Signed-off-by: runsisi <luo.runbing@zte.com.cn>
2018-11-22 07:42:14 +08:00
Neha Ojha
c87e657f4e
Merge pull request #24452 from noahdesu/doc-edit-report
doc: edit on github

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-11-21 11:48:07 -08:00
Lenz Grimmer
11c61fc974
Merge pull request #25157 from tspmelo/wip-e2e-stop
mgr/dashboard: Fix run-frontend-e2e-tests.sh

Reviewed-by: Laura Paduano <lpaduano@suse.com>
2018-11-21 15:44:50 +01:00
Casey Bodley
2ca0acbd60 cmake: vstart-base only depends on ceph-mgr if WITH_MGR
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-11-21 09:44:16 -05:00
Casey Bodley
96d73b8349 cmake: dont depend on cython_rbd if WITH_RBD=OFF
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-11-21 09:15:07 -05:00
Casey Bodley
035e872680 cmake: dont build ceph-mds if WITH_CEPHFS=OFF
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-11-21 09:15:07 -05:00
Lenz Grimmer
0b521bbdab
Merge pull request #25155 from rhcs-dashboard/37283-mgr-info-card-improvements
mgr/dashboard: Status info cards' improvements

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
2018-11-21 14:55:39 +01:00
alfonsomthd
fc07fb95df mgr/dashboard: Status info cards' improvements
- MGR info card:
  Show amount of daemons active instead of active mgr name.
  Daemons active text line: show mgr active name when 'on mouse over'.
- OSD/MDS info cards (for consistency):
  The same text appearance as MGR card.
- Hosts/Object Gateway/iSCSI cards: added 'total' after amount for clarification.
- Some CSS refactor.

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

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2018-11-21 13:46:56 +01:00
Sebastian Wagner
8fe92c3534
Merge pull request #24610 from SUSE/wip-orchestrator-deepsea-redux
mgr/deepsea: DeepSea orchestrator module

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2018-11-21 13:37:51 +01:00
Tim Serong
ec2567e289 mgr/deepsea: DeepSea orchestrator module
This module provides integration between Ceph's orchestrator framework
and DeepSea, a Ceph deployment and management system built upon Salt.

Included so far are implementations of get_inventory() and
describe_service().  This allows `ceph orchestrator device ls`, `ceph
orchestrator service ls` and `ceph orchestrator service status` to
operate correctly.

To test, try:

  # ceph mgr module enable orchestrator_cli
  # ceph mgr module enable deepsea
  # ceph orchestrator set backend deepsea
  # ceph deepsea config-set salt_api_url <salt api url>
  # ceph deepsea config-set salt_api_username <salt api username>
  # ceph deepsea config-set salt_api_password <salt api shared secret>
  # ceph orchestrator device ls
  # ceph orchestrator service ls

Signed-off-by: Tim Serong <tserong@suse.com>
2018-11-21 22:50:55 +11:00
Sage Weil
d0810de25b Merge PR #25167 into master
* refs/pull/25167/head:
	mgr: Diskprediction local activate when config changes

Reviewed-by: Sage Weil <sage@redhat.com>
2018-11-20 17:35:16 -06:00
Sage Weil
2ec2c5ef9e Merge PR #24795 into master
* refs/pull/24795/head:
	qa/tasks/ceph: gather crash dumps
2018-11-20 17:34:54 -06:00
Yuri Weinstein
1b9f62513b
Merge pull request #14369 from rzarzynski/wip-rgw-19514
rgw: fix wrong debug related to user ACLs in rgw_build_bucket_policies()

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-11-20 14:01:41 -08:00
Yuri Weinstein
9c873b2a2d
Merge pull request #16658 from rzarzynski/wip-rgw-20795
rgw: Swift's TempURL can handle temp_url_expires written in ISO8601.

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2018-11-20 14:00:57 -08:00
Yuri Weinstein
e682970f35
Merge pull request #19684 from taoCH/wip-librgw-symbolic-link
librgw: support symbolic link

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2018-11-20 14:00:41 -08:00
Mykola Golub
b5ebe10f5f mgr/osd_perf_query: improvements for testing module
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-11-20 20:59:01 +02:00
Robin H. Johnson
e63e210679
Merge pull request #22599 from anthonyeleven/patch-2
doc: Tidy up description wording and spelling
2018-11-20 09:44:04 -08:00
Sage Weil
f3c27670c0 Merge PR #24737 into master
* refs/pull/24737/head:
	doc/ceph-bluestore-tool: add help for migrate and new DB/WAL commands.

Reviewed-by: Sage Weil <sage@redhat.com>
2018-11-20 09:50:04 -06:00
Lenz Grimmer
1334e194f9
Merge pull request #25010 from nathan-weinberg/breadcrumb-tests
mgr/dashboard: Added additional breadcrumb tests to Cluster

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2018-11-20 16:36:48 +01:00
Lenz Grimmer
7c5ce8b87b
Merge pull request #25141 from rhcs-dashboard/wip-37293-master
mgr/dashboard: Fix Forbidden Error with some roles

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
2018-11-20 16:34:59 +01:00
Kefu Chai
0a0e9f0179
Merge pull request #25176 from cyx1231st/wip-crimson-msgr-extract-states
crimson/net: encapsulate protocol implementations with states

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-11-20 21:58:37 +08:00
Yingxin
4da176a787 crimson/net: remove recursive call to handle_connect_reply()
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2018-11-20 22:18:01 +08:00
Yingxin
b4a83826ba crimson/net: fix minor issue and add TODO for error-handling
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2018-11-20 22:07:57 +08:00
Kefu Chai
e411f89ca6 crimson/net: extract state transition out of repeat_connect()
and extract state transition out of repeat_handle_connect()

in this change, the connect/handle-connect loop is restructured, to
avoid ad-hoc state changes in helper functions. this pave the road to
explicit state transtion using named states.

also, exception is thrown instead in handle_connect_reply(), we should
not proceed in case of failures. and we need do error handling in the
named state in future.

currentl, `state` is set to `state_t::open` in `start_connect()` and
`start_accept()`, the next step is to set it in a named state.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-11-20 22:00:08 +08:00
Lenz Grimmer
6e95664ead
Merge pull request #25149 from p-na/pna-fix-safe-to-destroy
mgr/dashboard: Fix failing QA test: test_safe_to_destroy

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
2018-11-20 14:33:42 +01:00
Kefu Chai
23c0524c96 crimson/net: define an alias of seastar::stop_iteration
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-11-20 21:08:29 +08:00
Yingxin
c014f702d9 crimson/net: check short reads in read_exactly()
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2018-11-20 20:58:34 +08:00
Sage Weil
75f17a222b Merge PR #24844 into master
* refs/pull/24844/head:
	osd: drop PGBackend::Listener::get_epoch().
	osd: massively switch to get_osdmap_epoch().
	osd: switch the return type of PG::get_osdmap().

Reviewed-by: Sage Weil <sage@redhat.com>
2018-11-20 06:51:29 -06:00
Sage Weil
b84730a921 Merge PR #24867 into master
* refs/pull/24867/head:
	mon: compensate for not having STDLIB_MAP_SPLICING

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
2018-11-20 06:50:50 -06:00
Sage Weil
c872e42657 Merge PR #24929 into master
* refs/pull/24929/head:
	osd: set lower bound+docs on osd_max_write_size

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-11-20 06:50:33 -06:00
Sage Weil
9b3d909046 Merge PR #25058 into master
* refs/pull/25058/head:
	mgr: Fixed devicehealth plugin resource leak

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-11-20 06:50:17 -06:00
Sage Weil
d7ed1ccf48 Merge PR #25125 into master
* refs/pull/25125/head:
	mon: require keyring even if cephx is optional

Reviewed-by: Sage Weil <sage@redhat.com>
2018-11-20 06:49:54 -06:00
Sage Weil
4c0632df91 qa/tasks/ceph: gather crash dumps
Gather crash dumps as part of the teuthology run.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-11-20 06:49:20 -06:00
Yingxin
9b7d8ffd5e crimson/net: connection closed during connecting
It is possible during `seastar::connect()`, the connection is marked
closed (when SocketConnection::socket is unavailable), then
`seastar::connect()` successfully returns a connected socket.

Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2018-11-20 20:48:35 +08:00
Lenz Grimmer
228cffa107
Merge pull request #25121 from zmc/wip-dashboard-test-runner
mgr/dashboard: Small improvements for running teuthology tests

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
2018-11-20 12:29:35 +01:00
Mykola Golub
b90c880281 mgr: parse OSDPerfMetricQuery spec that comes from python module
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-11-20 13:18:30 +02:00
Mykola Golub
b8362d904a mgr: make dynamic osd perf counters accessible from modules
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-11-20 13:18:30 +02:00
Mykola Golub
10dba8a6d6 osd: fixup to recently added dynamic perf stats
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-11-20 13:18:30 +02:00
Mykola Golub
ac8b016b72 mgr: fix PyFormatter's dump_unsigned
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-11-20 13:18:30 +02:00
Mykola Golub
438a3f7bc4 mgr: store osd perf counters received in osd reports
Make the counters accessible for the query owners.

Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-11-20 13:18:30 +02:00
Mykola Golub
073555e30f mgr: generalize OSDPerfMetricQuery to support different queries
Signed-off-by: Mykola Golub <mgolub@suse.com>
2018-11-20 13:18:30 +02:00
Lenz Grimmer
ac743f2a91
Merge pull request #24851 from rhcs-dashboard/grafana-roles
mgr/dashboard: Show/Hide Grafana tabs according to user role

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-11-20 10:21:04 +01:00
Abhishek L
0c7d5cbf46
Merge pull request #24762 from tspmelo/wip-credits
credits.sh: Ignore package-lock.json and .xlf files

Reviewed-By: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
2018-11-20 09:40:59 +01:00