RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 14:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,037 Commits 211 Branches 0 Tags 1.4 GiB
b3a5949031
Commit Graph

84037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yao Guotao
b3a5949031 install-deps.sh: fix an error condition expression 
Signed-off-by: Yao Guotao <yaoguot@gmail.com>
 2018-03-09 04:46:27 -05:00
Kefu Chai
21146f9e4d
Merge pull request #20745 from Liuchang0812/jsonify-pool-get 
mon: invalid JSON returned when querying pool parameters

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-09 12:02:49 +08:00
Kefu Chai
baaaf4868f
Merge pull request #20775 from tspmelo/fix-iscsi-unit-test 
mgr/dashboard_v2: add mocked service provider for TcmuIscsiService

Reviewed-by: Volker Theile <vtheile@suse.com>
 2018-03-09 12:02:20 +08:00
Kefu Chai
a5123004ff
Merge pull request #20778 from p-na/wip-mgr-fix-dashboard-backend-tests 
mgr/dashboard: Fix backend tests for newer CherryPy versions

Reviewed-by: Ricardo Dias <rdias@suse.com>
 2018-03-09 10:24:00 +08:00
Kefu Chai
0f93d686f8
Merge pull request #20782 from sebastian-philipp/dashboard_v2_fix_config_options_endpoint 
mgr/dashboard_v2: Fix test_cluster_configuration test

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-09 10:20:58 +08:00
Josh Durgin
2067f7c679
Merge pull request #20786 from dzafman/wip-zafman-log-trim 
tools/ceph-objectstore-tool: command to trim the pg log

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2018-03-08 16:42:31 -08:00
Josh Durgin
b01e4ea5e2 tools: Add pg log trim command to ceph-objectstore-tool 
Add test script that verifies the command in qa/standalone/osd

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

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-08 15:58:55 -08:00
Yuri Weinstein
d71f70203f
Merge pull request #20769 from oritwas/wip-rgw-20448 
rgw: fix crash with rgw_run_sync_thread false

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2018-03-08 13:25:36 -08:00
Jason Dillaman
2be034e957
Merge pull request #20590 from hitoshikamei/rbd-bench 
rbd: fix thread_offsets calculation of rbd bench

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-08 14:01:57 -05:00
Jason Dillaman
3de78ccc23
Merge pull request #20689 from Songweibin/wip-23038 
rbd/test: add snap protection test for ex/import

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-08 14:00:59 -05:00
Jason Dillaman
38dba9a1bf
Merge pull request #20697 from Songweibin/wip-trash-rm 
rbd: allow trash rm/purge when pool quota is full used

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-08 14:00:27 -05:00
Jason Dillaman
fd81fa75e7
Merge pull request #20795 from Songweibin/wip-fix-trash 
rbd: pool_percent_used should not divided by 100

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-08 13:59:27 -05:00
David Zafman
317b3d3b36
Merge pull request #20759 from dzafman/wip-cleanup 
test: Make clearer by moving code out of loop

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2018-03-08 10:45:38 -08:00
Lenz Grimmer
4a2d8f9995
Merge pull request #20801 from theanalyst/dashboard-build-typo 
cmake: typo fix when npm is not found

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-08 18:27:38 +01:00
Abhishek Lekshmanan
ab8bcbe1d9 dashboard: cmake: typo fix when npm is not found 
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2018-03-08 16:59:51 +01:00
Yuri Weinstein
39f7377556
Merge pull request #20390 from theanalyst/rgw/openssl-init 
rgw: setup locks for libopenssl

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jesse Williamson <jwilliamson@suse.de>
Reviewed-by: Marcus Watts <mwatts@redhat.com>
 2018-03-08 07:34:29 -08:00
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
songweibin
e6bb0a9578 rbd: pool_percent_used should not divided by 100 
The value of 'percent_used' in `ceph df --format=json`
has already been divided by 100.

Signed-off-by: songweibin <song.weibin@zte.com.cn>
 2018-03-08 10:29:22 +08: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
Sebastian Wagner
f3d6067658 mgr/dashboard_v2: removed unused code that broke teuthology 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-07 18:18:31 +01: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
Sebastian Wagner
0ad029f2ea common/config: Fix dumping of md_config_t::config_options. 
Caused by 49a5e775aa

This fixes the dashboard_v2 `cluster_conf` endpoint.

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

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-07 16:27:36 +01: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
Patrick Nawracay
45b9174191 mgr/dashboard: Fix backend tests for newer CherryPy versions 
The backend test run by `run-backend-api-tests.sh` fails for CherryPy
versions 13.x and 14.x.

Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
 2018-03-07 13:45:52 +01:00
Tiago Melo
64a9e554a3 mgr/dashboard_v2: add mocked service provider for TcmuIscsiService 
This removes the warnings shown when running the tests with PhantomJS.

Signed-off-by: Tiago Melo <tmelo@suse.com>
 2018-03-07 12:25:36 +00: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
Orit Wasserman
f9395d63f8 rgw: fix crash with rgw_run_sync_thread false 
Fixes: http://tracker.ceph.com/issues/20448
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2018-03-07 12:01:21 +02:00