Commit Graph

96698 Commits

Author SHA1 Message Date
Patrick Donnelly
91c2317a04
Merge PR #27202 into master
* refs/pull/27202/head:
	doc: Miscellaneous spelling fixes

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-03-28 09:39:07 -07:00
Sage Weil
ad3c4b45a3 Merge PR #27154 into master
* refs/pull/27154/head:
	mgr/pg_autoscaler: apply bias to pg_num selection
	mgr/pg_autoscaler: include pg_autoscale_bias in autoscale-status table
	osd/osd_types,mon: add pg_autoscale_bias pool property

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-28 11:21:23 -05:00
Sage Weil
3326f0bae5 Merge PR #27012 into master
* refs/pull/27012/head:
	common/options: allow (but to not prefer or require) secure mode
	common/options: make clients prefer to connect to mons via secure mode
	common/options: allow connections to mons in secure mode
	common/options: prefer secure mode between monitors
	auth/AuthRegistry: remove experimental flag for 'secure' mode

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-03-28 11:21:01 -05:00
Casey Bodley
9de36ffdf0
Merge pull request #26887 from theanalyst/reshard-tenant
rgw admin: add tenant argument to reshard cancel

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-03-28 09:42:11 -04:00
Lenz Grimmer
4099cb0c85
Merge pull request #27222 from ceph/wip-doc-dahsboard
mgr/dashboard: fix hacking.rst

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-03-28 13:07:05 +01:00
Kefu Chai
539026c140
Merge pull request #27233 from tchaikov/script/ceph-backport.sh
script/ceph-backport.sh: allow user to specify remote repo

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2019-03-28 19:35:18 +08:00
Lenz Grimmer
344c254bde
Merge pull request #27135 from ricardoasmarques/iscsi-filter-images-based-on-features
mgr/dashboard: Validate iSCSI images features

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-03-28 12:24:18 +01:00
Kefu Chai
694d159b46 script/ceph-backport.sh: allow user to specify remote repo
before this change, the script always push to "origin", in my case,
"origin" points to "ceph/ceph", while we need to create the branch in
private repo. and the name of private repo might vary. so would be great
if we can customize this setting.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-28 18:32:45 +08:00
Lenz Grimmer
96a65fbfb7
Merge pull request #26914 from votdev/issue_38331
mgr/dashboard: Add separate option to config SSL port

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
2019-03-28 10:55:27 +01:00
Lenz Grimmer
584a52330a
Merge pull request #27166 from rhcs-dashboard/add-protractor-screenshoter-plugin
mgr/dashboard: Add protractor-screenshoter-plugin

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
2019-03-28 10:52:52 +01:00
Ricardo Dias
c1e1d6ed0c
Merge pull request #24678 from rouming/master
test/fio: introduce fio ioengine: fio_ceph_messenger

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-03-28 09:20:55 +00:00
Kefu Chai
5696085611 script/ceph-backport.sh: fix sanity test of issue number
* no need for checking negative numbers
* use regex for matching the number instead of using bash's pattern
  matching, otherwise i have
./ceph-backport.sh: line 79: syntax error in conditional expression:
unexpected token `('
  the pattern matching works fine if i use it in command line, but
  it fails to work in shell script.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-28 12:14:07 +08:00
Xie Xingguo
e6ef3cd836
Merge pull request #27200 from neha-ojha/wip-21174-2
osd/PGLog: preserve original_crt to check rollbackability

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-03-28 08:12:26 +08:00
Yuri Weinstein
a955b4f459
Merge pull request #27218 from yuriw/wip-yuriw-crontab
qa/tests: added nautilus-p2p to cron
2019-03-27 13:14:05 -07:00
Ernesto Puerta
0db3ce98d1
mgr/dashboard: fix hacking.rst
Add missing dash to `-prod` and specify full command.

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
2019-03-27 19:53:32 +01:00
Yuri Weinstein
47d69860bf qa/tests: added nautilus-p2p to cron
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2019-03-27 09:26:10 -07:00
Yuri Weinstein
f71b36e28a
Merge pull request #27165 from yuriw/wip-yuriw-crontab-master_2
qa/tests: reduced number of jobs for `kcephfs`
2019-03-27 09:19:56 -07:00
Sage Weil
420edba243 Merge PR #27169 into master
* refs/pull/27169/head:
	common/config: parse --default-$option as a default value

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-27 09:48:33 -05:00
Sage Weil
cf68bc2296 Merge PR #27022 into master
* refs/pull/27022/head:
	msg/async v2: make v2 work on rdma.

Reviewed-by: Ricardo Dias <rdias@suse.com>
2019-03-27 09:46:10 -05:00
Sage Weil
255845eac3 Merge PR #27184 into master
* refs/pull/27184/head:
	mgr/DaemonServer: handle_conf_change - fix broken locking

Reviewed-by: Mykola Golub <mgolub@suse.com>
2019-03-27 09:44:17 -05:00
Sage Weil
64addc597a Merge PR #27187 into master
* refs/pull/27187/head:
	mgr/dashboard/qa: Increase timeout for test_disable (tasks.mgr.dashboard.test_mgr_module.MgrModuleTelemetryTest)

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
2019-03-27 09:43:21 -05:00
Sage Weil
1cbb12062b Merge PR #27196 into master
* refs/pull/27196/head:
	mon/MonClient: do not dereference auth_supported.end()

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-27 09:35:38 -05:00
alfonsomthd
e456508619 mgr/dashboard: Add protractor-screenshoter-plugin
A plugin to save screenshots on E2E tests failures as well as
console logs, raw HTML, ...
All info visualized in an HTML report (screenshots are clickable to see full image).
Useful for debugging/fixing E2E tests.

Signed-off-by: Alfonso Martínez <almartin@redhat.com>
2019-03-27 15:21:11 +01:00
Kefu Chai
4a6093c363
Merge pull request #27211 from tchaikov/wip-crimson-partition-args
crimson/osd: partition args the right way

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-03-27 21:53:56 +08:00
Lenz Grimmer
51ec61fdb2
Merge pull request #27153 from Devp00l/issue-38932
mgr/dashboard: Fixes tooltip behavior

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-03-27 12:49:39 +01:00
Nathan Cutler
0e63fed768
Merge pull request #27159 from smithfarm/wip-38934
doc: move Developer Guide to its own subdirectory

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-03-27 12:17:37 +01:00
Lenz Grimmer
6daddcb159
Merge pull request #26561 from Devp00l/issue-38418
mgr/dashboard: Make preventDefault work with 400 errors

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2019-03-27 11:57:34 +01:00
Kefu Chai
9801576b8e crimson/osd: partition args the right way
before this change, all "unknown" args are considered `ceph_args`, but
there is chance we have command line like

crimson-osd -i 1 -c ceph.conf --smp 1 --cpuset 00000001

in this case, "1" is listed in `unknown_args`, but it is also in
`parsed.options`. so we will put the second "1" into `ceph_args` even it
should be appended to `app_args`.

so, in this change, `std::partition_copy()` is replaced with a
hand-written loop which advances through the `argv` and `unknown_args`,
try to match as many consecutive options are possible. it assumes that
the order of args in `unknown_args` is the same as their order in
`argv[]`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-27 18:47:43 +08:00
Kefu Chai
cdba92a1e3
Merge pull request #27190 from tchaikov/wip-ceph.in-asan-only-for-debug
ceph.in: only preload asan library for Debug build

Reviewed-by: Samuel Just <sjust@redhat.com>
2019-03-27 14:04:10 +08:00
Kefu Chai
f9e0168e56
Merge pull request #26813 from DengkeDu/master
cmake/FindRocksDB: fix IMPORTED_LOCATION for ROCKSDB_LIBRARIES

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-27 14:03:21 +08:00
Kefu Chai
496ffbab22
Merge pull request #27204 from xiexingguo/wip-clean-weird-brace
osd/PG: move '}' to the proper place

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
2019-03-27 12:57:16 +08:00
dudengke
7b6e05a030 cmake/FindRocksDB: fix IMPORTED_LOCATION for ROCKSDB_LIBRARIES
Signed-off-by: dudengke <pinganddu90@gmail.com>
2019-03-27 10:18:26 +08:00
Kefu Chai
62a4019b2e ceph.in: only preload asan library if it is enabled
my ceph cli hung when i build ceph using `CMAKE_BUILD_TYPE=RelWithDebInfo` and
`WITH_SEASTAR=ON`. because in that case, seastar detects for Sanitize flags
support of the compiler, but it does not pull in the build flags to enable
sanitizers. while `ceph` cli still preloaded the `asan_lib_path` because
`ASAN_LIBRARY` was set. this is not right, as we should enable ASAN at
runtime only if we enable it at compile-time.

so, in this change, we preload the ASAN library when `CMAKE_BUILD_TYPE`
is `Debug` and `WITH_SEASTAR=ON`, or `WITH_ASAN=ON`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-27 09:55:43 +08:00
Kefu Chai
44cb44425c ceph.in: normalize BOOL values found by get_cmake_variables()
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-27 09:55:43 +08:00
xie xingguo
0fb951963f osd/PG: move '}' to the proper place
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-03-27 09:28:56 +08:00
David Zafman
33357740f5
Merge pull request #26942 from dzafman/wip-38616
Feature: Improvements to auto repair

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-03-26 16:48:09 -07:00
Bryan Stillwell
8d87df48f2 doc: Miscellaneous spelling fixes
While looking over the documentation I found a few words being misspelled.

Signed-off-by: Bryan Stillwell <bstillwell@godaddy.com>
2019-03-26 14:52:12 -06:00
Sage Weil
0247d565d5 Merge PR #27162 into master
* refs/pull/27162/head:
	os/bluestore: nice used space report for bluefs-bdev-sizes command.
	tools/ceph-kvstore-tool: command to show RocksDB compaction stats.

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-26 15:06:30 -05:00
Neha Ojha
47215a5c0e osd/PGLog: preserve original_crt in merge_log()
Fixes: https://tracker.ceph.com/issues/21174
Signed-off-by: Neha Ojha <nojha@redhat.com>
2019-03-26 10:34:24 -07:00
Casey Bodley
bf414c3f74
Merge pull request #26852 from theanalyst/wip-stale-instance-multisite
rgw admin: disable stale instance delete in a multiste env

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-03-26 13:33:40 -04:00
Igor Fedotov
b088e4d1b3 os/bluestore: nice used space report for bluefs-bdev-sizes command.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
2019-03-26 20:07:41 +03:00
Igor Fedotov
2ab28aa329 tools/ceph-kvstore-tool: command to show RocksDB compaction stats.
In fact this command will provide zeros for most of compaction stuff as
completed compactions are required to provide most of numbers.
But one can use it to learn per-level DB statistics: (amount of files,
occupied space, etc).

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
2019-03-26 20:07:39 +03:00
Sage Weil
bc5cf86294 Merge PR #26936 into master
* refs/pull/26936/head:
	msg: default to debug_ms=0

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2019-03-26 11:43:19 -05:00
Sage Weil
cbe78646d2 Merge PR #27069 into master
* refs/pull/27069/head:
	mgr: Configure Py root logger for Mgr modules

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-03-26 11:37:48 -05:00
Sage Weil
71c8eb1b9e Merge PR #27084 into master
* refs/pull/27084/head:
	osd: process_copy_chunk remove obc ref before pg unlock

Reviewed-by: Myoungwon Oh <omwmw@sk.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-03-26 11:36:16 -05:00
Sage Weil
c51a3f0c92 Merge PR #27142 into master
* refs/pull/27142/head:
	osd/OSDMap: add log for better debugging
	osd/OSDMap: calc_pg_upmaps - restrict optimization to origin pools only

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-26 11:35:59 -05:00
Sage Weil
1dad9d2fe1 Merge PR #27155 into master
* refs/pull/27155/head:
	mon/ConfigMonitor: make 'config reset' idempotent

Reviewed-by: Sage Weil <sage@redhat.com>
2019-03-26 11:35:45 -05:00
Kefu Chai
998b1925bd mon/MonClient: do not dereference auth_supported.end()
if we are unable to find a supported method in allowed_methods, we will
dereference `auth_supported.end()` for searching it in desperation.

Reported-by: xie xingguo <xie.xingguo@zte.com.cn>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-03-27 00:08:01 +08:00
Sage Weil
39c84fa52c Merge PR #27172 into master
* refs/pull/27172/head:
	mgr/devicehealth: Fix python 3 incompatiblity

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-03-26 11:07:17 -05:00
Sage Weil
fdd2000631 common/config: parse --default-$option as a default value
Sometimes it is useful to specify an alternative default value for an
option via the command line such that it has a lower priority than the
mon config database, config file, the rest of the command line, or the
environment.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-03-26 11:00:27 -05:00