Commit Graph

84003 Commits

Author SHA1 Message Date
Yuri Weinstein
ee9a903cbd
Merge pull request #20649 from tianshan/rgw_datalog_list
rgw: datalog list support --shard-id and --marker

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-03-08 07:29:54 -08:00
Yuri Weinstein
fffd50596f
Merge pull request #20686 from fangyuxiangGL/mcc
rgw: fix 'copy part' without 'x-amz-copy-source-range' when compression enabled

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-03-08 07:29:32 -08:00
Yuri Weinstein
d8e00adc69
Merge pull request #20707 from Liuchang0812/rgw-es-plugin-urlencode
rgw: url_encode key name and instance in es sync module

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2018-03-08 07:28:59 -08:00
Yuri Weinstein
8b95c3a775
Merge pull request #20756 from cbodley/wip-qa-rgw-verify-combine
qa/rgw: combine swift, s3tests, ragweed into single verify task

Reviewed-by: Vasu Kulkarni <vasu@redhat.com>
2018-03-08 07:28:20 -08:00
Kefu Chai
da1ae37b34
Merge pull request #20767 from xiexingguo/wip-pg-delete
osd/OSD: batch-list objects to reduce memory consumption

Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-08 23:20:34 +08:00
Kefu Chai
d6dbf9c732
Merge pull request #20764 from chenyupeng360/master
msg/async: size of EventCenter::file_events should be greater than fd

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-08 23:19:50 +08:00
Kefu Chai
6e0e5b5939
Merge pull request #20740 from Songweibin/wip-skip-logical-devices
osd: skip dumping logical devices

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-08 23:19:11 +08:00
Kefu Chai
cd7ece464a
Merge pull request #20743 from rjfd/wip-dashboard-settings
mgr/dashboard_v2: Configuration settings support

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
2018-03-08 23:18:16 +08:00
Kefu Chai
0d5a33c6ce
Merge pull request #20727 from linuxbox2/wip-clang-5
bluestore: define default value of LoglevelV only once (3 templates)

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-08 23:15:53 +08:00
Kefu Chai
c1ba9ac544
Merge pull request #20711 from guzhongyan/mgr-nodels
mon: 'node ls' mgr support

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-08 23:14:50 +08:00
Kefu Chai
ecc64b034d
Merge pull request #20706 from xiexingguo/wip-balancer-03
pybind/mgr/balancer: fix pool-deletion vs auto-optimization race

Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-08 23:13:37 +08:00
Kefu Chai
34516b80ae
Merge pull request #20704 from xiexingguo/wip-balancer-02
mon/OSDMonitor: kill pending upmap changes too if pool is gone

Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-08 23:13:01 +08:00
Kefu Chai
a6c271e2be
Merge pull request #20703 from xiexingguo/wip-balancer-01
osd/OSDMap: ignore PGs from pools of failure-domain OSD

Reviewed-by: Sage Weil <sage@redhat.com>
2018-03-08 23:12:27 +08:00
Kefu Chai
6e420093b0
Merge pull request #20644 from jcsp/wip-23166
mgr/prometheus: skip OSD output if missing from CRUSH devices

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-03-08 23:11:47 +08:00
Jason Dillaman
26df7ff329
Merge pull request #20773 from idryomov/wip-krbd-include-sysmacros
krbd: include sys/sysmacros.h for major, minor and makedev

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-03-08 08:48:55 -05:00
Ilya Dryomov
a048b5e612
Merge pull request #20750 from idryomov/wip-krbd-whole-object-discard-test
qa: krbd whole-object-discard test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-03-08 12:52:56 +01:00
John Spray
a0a001a8df
Merge pull request #20755 from LenzGr/mgr-dashboard-documentation
doc: Updated dashboard v2 feature list

Reviewed-by: John Spray <john.spray@redhat.com>
2018-03-08 10:56:51 +00:00
Ilya Dryomov
070ce41f0b
Merge pull request #20792 from yangdongsheng/krbd_osd_request_timeout
rbd: support osd_request_timeout in rbd map command

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2018-03-08 11:31:49 +01:00
Dongsheng Yang
f37ae96fa7 rbd: support osd_request_timeout in rbd map command
Default of osd_request_timeout in krbd is 0 means no timeout,
but we sometimes need to set this value by rbd command. then
pass osd_request_timeout to kernel rbd in rbd mapping.

Fixes: http://tracker.ceph.com/issues/23073
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2018-03-08 04:12:41 -05:00
Mykola Golub
9ffbac6fc5
Merge pull request #20729 from dillaman/wip-22738
qa/suites/rbd: segregated v1 image format tests

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-03-07 22:53:12 +02:00
Patrick Donnelly
a1c5a552b8
Merge PR #20705 into master
* refs/pull/20705/head:
	doc: Fix -d description in ceph-fuse

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-07 11:27:58 -08:00
Ricardo Dias
17cfac2b68
mgr/dashboard: Added instructions on how to add config settings to HACKING
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-03-07 16:29:55 +00:00
Ricardo Dias
f681b23280
mgr/dashboard: added settings module
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-03-07 16:29:54 +00:00
Casey Bodley
b497d9fdd3 qa/rgw: combine swift, s3tests, ragweed into single verify task
these tests don't need to be split across the job matrix the same way
that we split features like frontend, ssl, objectstore, etc. by
combining them, we can still test the whole matrix of features, but with
only 1/3 of the total jobs

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-03-07 09:21:55 -05:00
Casey Bodley
cf52fc5ab9
Merge pull request #20693 from cbodley/wip-rgw-s3website-redirect
rgw: s3website error handler uses original object name

Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-03-07 07:57:57 -05:00
Ilya Dryomov
8d8390ff95 qa: krbd whole-object-discard test
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-03-07 12:06:33 +01:00
Ilya Dryomov
fbc97f5565 krbd: include sys/sysmacros.h for major, minor and makedev
Previously we got these through sys/types.h, but that's now deprecated:

  warning: In the GNU C Library, "major" is defined
   by <sys/sysmacros.h>. For historical compatibility, it is
   currently defined by <sys/types.h> as well, but we plan to
   remove this soon. To use "major", include <sys/sysmacros.h>
   directly. If you did not intend to use a system-defined macro
   "major", you should undefine it after including <sys/types.h>.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2018-03-07 11:42:38 +01:00
Kefu Chai
480f078c14
Merge pull request #20768 from tchaikov/wip-cmake-dashboard
cmake,test/mgr: restructure dashboard tests and cmake related fixes

Reviewed-by: Ricardo Dias <rdias@suse.com>
2018-03-07 18:39:22 +08:00
Kefu Chai
59221274cb test/mgr: restructure dashboard tests
* restructure dashboard tests so they follow the model of other tests
  based on ceph-helpers.sh. i.e. extract the TEST_* out of run()
  function.
* expose mon-host using CEPH_ARGS env variable.
* mgr-dashboard_v2-smoke.sh: do not export CEPH_ARGS in a subshell, so
  the run_mgr() and ceph cli can also have access to the updated
  CEPH_ARGS, and hence they will be able to locate the mon. and because
  auth-supported=none is populated using CEPH_ARGS, this test won't fail
  because of missing keyring.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-03-07 17:27:36 +08:00
Kefu Chai
aedbbe791f test: run 'npm' command in a directory specified by absolute path
in case developer wants to run the test in "./build" or some random
directory.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-03-07 17:27:36 +08:00
Kefu Chai
ad0d7c89a1 cmake: check for "npm" before using it
and allows use to specify the path in which npm is installed. in my
case, if $HOME/.npmrc points "prefix" to ${HOME}/.npm-packages, i will
be able to run

NPM_ROOT=${HOME}/.npm-packages cmake ..

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-03-07 17:23:49 +08:00
xie xingguo
020a031b62 osd/OSD: batch-list objects to reduce memory consumption
For PG with a huge amount of objects, it wouldn't be an ideal
way to list all of them at a time. Split them into small batches
which we can handle individually efficiently should instead be
the preferred option.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-03-07 17:20:36 +08:00
Volker Theile
b96dfb5b84
Merge pull request #20742 from votdev/perf_counter_units
mgr/dashboard v2: Add units to performance counters
2018-03-07 08:41:27 +01:00
Volker Theile
1a23d0cf22
Merge pull request #20744 from votdev/fix_loading_indicator
mgr/dashboard v2: Display loading indicator in datatables during first load
2018-03-07 08:40:29 +01:00
Volker Theile
2e68d9bffa
Merge pull request #20746 from votdev/datatable_selection
mgr/dashboard v2: Introduce CdTableSelection model
2018-03-07 08:39:55 +01:00
Yupeng Chen
39023b5bfc msg/async: size of EventCenter::file_events should be greater than fd.
When trying to generate a file event from an FD greater than or equal to the size of file_events vector,
make sure that the resized vector can hold the FD safely.

Fixes: http://tracker.ceph.com/issues/23253

Signed-off-by: Yupeng Chen <chenyupeng-it@360.cn>
2018-03-07 15:14:33 +08:00
Jos Collin
7a574be986 doc: Fix -d description in ceph-fuse
Fixes: http://tracker.ceph.com/issues/23214
Signed-off-by: Jos Collin <jcollin@redhat.com>
2018-03-07 08:47:15 +05:30
xie xingguo
bd828fc033 mon/OSDMonitor: kill pending upmap changes too if pool is gone
There are quite a lot mgr/balancer related tests that I can observe
the following logged errors:
```
2018-03-03 08:14:00.359946 7fdda18cc700 -1 maybe_remove_pg_upmaps unable to load crush-rule of pg 5.b
```
which turns out to be a *pool-deletion* vs *balancer-auto-injected-upmap-changes*
race issue.
The root cause is that we don't clean up those *pending*
pg_upmap/pg_upmap_items injected by the mgr/balancer properly simultaneously
when the corresponding pool is gone, and hence the above problem can be fixed by:
1. clean up any pending upmap changes too if the corresponding pool is gone
2. re-check pending pool removal queue before we can safely apply any new upmap changes

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-03-07 08:42:37 +08:00
songweibin
e0760210d0 osd: skip dumping logical devices
The code meant to do so but actually it does not ...

Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-03-07 08:25:27 +08:00
Patrick Donnelly
fd1e57c2de
Merge PR #20472 into master
* refs/pull/20472/head:
	mds: add DUMP_DIRFRAGS to CInode and DUMP_ITEMS to CDir
	mds: Enhance dump_tree performance by traversing the tree directly

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:29:09 -08:00
Patrick Donnelly
0ea9e05e58
Merge PR #20502 into master
* refs/pull/20502/head:
	test: cap waits in delegation tests at 60s
	tests: add a test for doing a getattr while caps are recalled but before returned
	client: allow getattr, lookup, fstatx, and readdir to use implemented caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-03-06 15:28:59 -08:00
Patrick Donnelly
eb7732b735
Merge PR #20541 into master
* refs/pull/20541/head:
	ceph-mds: exit if invalid id

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:28:50 -08:00
Patrick Donnelly
ed71e0e570
Merge PR #20575 into master
* refs/pull/20575/head:
	mds: set journaler iohint correctly when mds daemon going to active

Reviewed-by: dongdong tao <tdd21151186@gmail.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:28:43 -08:00
Patrick Donnelly
757c2f4cdb
githubmap: update contributors
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:28:42 -08:00
Patrick Donnelly
44e286362f
Merge PR #20583 into master
* refs/pull/20583/head:
	cephfs-journal-tool: add event time output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:24:11 -08:00
Patrick Donnelly
54e9ac6c7a
Merge PR #20615 into master
* refs/pull/20615/head:
	mds: modify help info of dump_historic_ops and dump_historic_ops_by_duration
	mds:fix typo in MDSRank

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-03-06 15:24:04 -08:00
Sage Weil
d7692a24c7
Merge pull request #20172 from liewegas/wip-config
mon: centralized config

Reviewed-by: John Spray <john.spray@redhat.com>
2018-03-06 15:24:23 -06:00
Sage Weil
a5597f0b2b common/config: normalize key name for get_val (external) variants
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
6eba775965 vstart.sh: -c to ceph cli
Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00
Sage Weil
6d13ab2d9a mon/ConfigMonitor: process subs from update_from_paxos
This is what OSDMonitor and MDSMonitor do.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-06 14:44:50 -06:00