RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,155 Commits 212 Branches 394 Tags 1.6 GiB
9e35e73743
Commit Graph

84155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ilya Dryomov
9d6ee9a649 test/librbd: expect_object_may_exist(..., false) in DiscardRemoveTruncate 
This is !is_no_op_for_nonexistent_object() test -- NONEXISTENT case is
the interesting one.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2018-03-08 18:06:06 +01:00
Ilya Dryomov
513baf92ef test/librbd: clone with parent features in DiscardRemoveTruncate 
... otherwise object map expectations aren't actually set.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2018-03-08 18:06:01 +01:00
Volker Theile
48fba11668 mgr/dashboard v2: Add CSS class for required form fields 
Signed-off-by: Volker Theile <vtheile@suse.com>
 2018-03-08 17:44:54 +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
Stephan Müller
83ea3413f7 mgr/dashboard_v2: Rotate the refresh icon on load 
The refresh icon of the data table will now rotate on loading events.

Signed-off-by: Stephan Müller <smueller@suse.com>
 2018-03-08 16:26:28 +01: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
xie xingguo
1e3498ad91 pybind/mgr/balancer: sanity check against empty roots 
To avoid crashes as below:
```
File "/usr/lib/ceph/mgr/balancer/module.py", line 181, in calc_stats
    score += target[k] * (math.erf(((adjusted - avg)/avg) / math.sqrt(2.0)))
ZeroDivisionError: float division by zero
```

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-03-08 09:05:58 +08:00
xie xingguo
193c3af4fb pybind/mgr/balancer: s/iteritems/iterkeys/ 
We don't care about the values here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-03-08 09:05:43 +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
Willem Jan Withagen
1cfb220224 test: only test dashboard_v2 when it is enabled 
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2018-03-07 19:09:05 +01:00
Jason Dillaman
4e59ea9568 librbd: discard from cache after committed to disk 
This prevents a possible race condition with readahead racing with a
discard and re-populating the cache with non-zeroed data.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
475f0fd9ef librbd: moved skip partial discard logic to object request 
This allows the journal object dispatch layer to properly complete
skipped extents and commit the associated event.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
59802c5255 librbd: avoid potential for lock inversion in journal IO replay 
If an IO replay immediately fails due to a image shrink applied after
the IO, the lock order will be incorrect.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
e980bd74d4 librbd: reduce lock scope on copy-on-read IO path 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
1ea789c247 librbd: removed legacy object cacher hooks 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
c9e35cfaad rbd-mirror: corrected implicitly included dout header 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
898223eea6 librbd: removed legacy journal event tracking hooks from IO path 
The new journal object dispatch layer handles delaying writes to the
OSD until the journal event is safe. This avoid the need for two
different code paths for cache and non-cache case.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
1231e33d25 librbd: removed object cacher hooks from IO image request 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
9440e5a1da librbd: removed object cacher hooks from IO object request 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
4f866c6f7f librbd: integrate object cacher writeback handler with dispatcher 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
dcdc224144 librbd: switch to new object dispatcher-based cache hooks 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
9aed97c043 librbd: pass image flush requests to object dispatcher 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
b000324a08 librbd: include flush source in image dispatch spec 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:42 -05:00
Jason Dillaman
425e579a3d librbd: wrap a object dispatcher facade around object cacher 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-03-07 12:45:41 -05:00