RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,252 Commits 211 Branches 394 Tags 2.1 GiB
221ea5e2fe
Commit Graph

53252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Dillaman
221ea5e2fe Merge pull request #9025 from trociny/fixup-rbd-mirror-status 
rbd-mirror: avoid potential deadlock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-05-11 17:00:39 -04:00
Jason Dillaman
6ba2195124 Merge pull request #9043 from fullerdj/wip-djf-fsx-fix 
test/rbd: document fsx option to keep data on success

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-05-11 16:36:17 -04:00
Jason Dillaman
490c5623e7 Merge pull request #9071 from runsisi/wip-rbd-mirror-minor-cleanup 
rbd-mirror: minor cleanup

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-05-11 16:28:48 -04:00
Yuri Weinstein
62ad33e567 Merge pull request #8924 from xiexingguo/xxg-wip-monitor 
mon/Monitor: fix memory leak; add leaked key to tracked_conf_key

Reviewed-by: Joao Eduardo Luis <joao@suse.de>	
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Marcel Lauhoff <lauhoff@uni-mainz.de>
 2016-05-11 11:47:36 -07:00
Yuri Weinstein
a3d84dae04 Merge pull request #8952 from badone/wip-i-am-osd-fix 
osd: Trivial grammatical fix 'i' to 'I'

Reviewed-by: songbaisen <song.baisen@zte.com.cn>
 2016-05-11 11:36:07 -07:00
Yuri Weinstein
a42a6d97eb Merge pull request #8993 from XinzeChi/wip-copy-get 
osd: fix ReplicatedPG::fill_in_copy_get logic

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-11 11:33:03 -07:00
Yuri Weinstein
3bad8c91fa Merge pull request #8995 from xiexingguo/xxg-wip-fixpingreply 
osd: fix potential access violation during handling PING_REPLY

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-11 11:31:03 -07:00
Sage Weil
305c2defd0 Merge pull request #8990 from tchaikov/wip-13990 
osd: remove all stale osdmaps in handle_osd_map()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-05-11 14:21:03 -04:00
Sage Weil
95b32b147a Merge pull request #8998 from kylinstorage/wip-fix-wrong-raw-pointer-conversion 
librados: fix wrong raw pointer conversion

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-05-11 14:17:52 -04:00
Josh Durgin
09319535c9 qa: rbd/map-snapshot-io.sh: don't chown sysfs files 
qa: rbd/map-snapshot-io.sh: don't chown sysfs files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-05-11 11:14:36 -07:00
Ilya Dryomov
38a572011d qa: rbd/map-snapshot-io.sh: don't chown sysfs files 
/sys/bus/rbd/add_single_major is used if present, so chown'ing
/sys/bus/rbd/add doesn't help.  Use sudo on rbd map instead.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2016-05-11 19:59:42 +02:00
Sage Weil
7bfe2be26c doc/release-notes: v0.94.7 hammer 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-05-11 13:44:53 -04:00
Sage Weil
93e77701ed Merge pull request #8377 from vshankar/bs-alloc-cleanup 
bluefs: use Allocator::create() to instantiate allocator

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-11 12:31:15 -04:00
Sage Weil
5168d912bf Merge pull request #8482 from majianpeng/bluestore-prefallocate 
os/bluestore/BlueStore: preallocate space when use file instead of blockdevice

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-05-11 10:52:42 -04:00
John Spray
3a570d7110 Merge pull request #8771 from xiaoxichen/configurable_prefix 
pybind: configurable cephfs_vol_client prefix.

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-05-11 09:08:12 -05:00
runsisi
25bfd4c786 rbd-mirror: fix typo 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-05-11 21:10:27 +08:00
runsisi
81ff422533 rbd-mirror: librbd::mirror_peer_list never returns -ENOENT 
no need to check -ENOENT specially

Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-05-11 21:10:27 +08:00
runsisi
e7fa159e7e rbd-mirror: use the already known pool name directly 
no need to try to get the pool name by pool id again

Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-05-11 21:10:22 +08:00
Jason Dillaman
24578f6d13 Merge pull request #9067 from trociny/fixup-mirror_image_status_list 
cls::rbd: mirror_image_status_list returned max 64 items

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-05-11 08:23:23 -04:00
John Spray
37e8bceb88 Merge pull request #8602 from ajarr/wip-15045 
ceph_volume_client: evict client also based on mount path

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-05-11 07:22:56 -05:00
Kefu Chai
ba5b40c0ce Merge pull request #8955 from xiexingguo/xxg-wip-docrgw 
doc/rgw: fix typo, abbreviation error etc.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-11 20:09:58 +08:00
Kefu Chai
e2fa841887 Merge pull request #9058 from dillaman/wip-cmake-test-rbd-mirror 
cmake: fix rbd compile errors

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-05-11 19:42:20 +08:00
Jason Dillaman
8d4c00d1be cmake: fix rbd compile errors 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-05-11 07:24:46 -04:00
Mykola Golub
e925ce8624 cls::rbd: mirror_image_status_list returned max 64 items 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-05-11 14:20:55 +03:00
Orit Wasserman
89d1601cf8 Merge pull request #8633 from dreamhost/wip-15531 
rgw/s3website: Fix x-amz-website-redirect-location support.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-05-11 11:05:23 +02:00
Orit Wasserman
7cf5d1d8c7 rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a ruleReviewed-by: Orit Wasserman <owasserm@redhat.com> 
rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a rule
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-05-11 11:02:30 +02:00
Yehuda Sadeh
b8172a5a64 Revert "rgw: RGWDataSyncStatusManager::finalize() cleanup" 
This reverts commit 365e8334b4.
 2016-05-10 16:24:30 -07:00
Casey Bodley
b89d793afc rgw: RGWDataSyncStatusManager::finalize() cleanup 
rgw: RGWDataSyncStatusManager::finalize() cleanup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-05-10 17:30:20 -04:00
Yehuda Sadeh
6feb8c4fa8 Merge pull request #9055 from cbodley/wip-rgw-period-commit-master 
rgw: 'period commit' sends to new master zone by default

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-05-10 14:15:50 -07:00
Casey Bodley
a1881bc636 Merge pull request #8605 from theanalyst/fix/15455 
rgw: return 503 for requests when master zone is down

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-05-10 17:14:32 -04:00
Casey Bodley
fbe1a05355 radosgw-admin: 'period commit' sends to new master zone by default 
if no --remote or --url is given, set --remote = master_zone_id to
override the rest_master_conn (which refers to the old master zone)

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-05-10 16:09:23 -04:00
Casey Bodley
9fcff89ee1 radosgw-admin: allow --remote to specify zone or zonegroup id 
--remote was only looking for zonegroup connections. extended to check
for zone connections as well

updated the usage to clarify that it expects zone/zonegroup ids

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-05-10 15:57:34 -04:00
Casey Bodley
3c210ff545 Merge pull request #8909 from theanalyst/rgw/zone-eexist-msg 
rgw: remove EEXIST error msg for ZoneCreate

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-05-10 15:54:59 -04:00
Casey Bodley
0d4f04a50a Merge pull request #9035 from tchaikov/wip-cmake-venv 
cmake: pass CEPH_BUILD_VIRTUALENV to test as an env variable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-05-10 15:06:18 -04:00
Yehuda Sadeh
a80ef267fe Merge pull request #8548 from weiqiaomiao/wq 
rgw:remove an unnecessary assignment of the variable 'marker'

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
 2016-05-10 11:50:29 -07:00
Kefu Chai
ed43214ca2 Merge pull request #8301 from tchaikov/wip-fortify 
cmake: enable FORTFY flags if supported

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-05-11 02:42:28 +08:00
Kefu Chai
e79c031dbe cmake: enable FORTFY flags if supported 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-05-11 02:41:12 +08:00
Yehuda Sadeh
143e3c3174 Merge pull request #8945 from cbodley/wip-rgw-admin-output 
radosgw-admin: added missing json output to some commands

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-05-10 11:36:08 -07:00
Yehuda Sadeh
88e10286b6 Merge pull request #8951 from ceph/wip-15745 
rgw: handle stripe transition when flushing final pending_data_bl

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-05-10 11:18:25 -07:00
Yehuda Sadeh
7dbd6360e8 rgw: 'period delete' cleans up all period objectsReviewed-by: Yehuda Sadeh 
rgw: 'period delete' cleans up all period objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-05-10 09:44:02 -07:00
Nathan Cutler
b3b3cc2631 Merge pull request #9045 from ceph/wip-selinux-noprio 
rpm: Drop SELinux priority setting

Reviewed by: Nathan Cutler <ncutler@suse.com>
 2016-05-10 18:36:57 +02:00
Douglas Fuller
4acca1ac43 test/rbd: document fsx option to keep data on success 
Add documentation line for the -k option to fsx to retain data
on success.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
 2016-05-10 09:21:55 -07:00
Boris Ranto
7e606f29f4 rpm: Drop SELinux priority setting 
Older versions of semodule binary that are in Centos/RHEL do not
support priority setting, dropping it.

Fixes: #15822
Signed-off-by: Boris Ranto <branto@redhat.com>
 2016-05-10 18:21:50 +02:00
Josh Durgin
7fcb52d0d3 Merge pull request #8921 from dillaman/wip-15110 
rbd-mirror: image sync needs to handle snapshot size and protection status

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Conflicts:
	src/test/librbd/test_mock_Journal.cc (moved and edited MockJournaler - trivial)
 2016-05-10 08:10:24 -07:00
Josh Durgin
43b66f9721 Merge pull request #8937 from dillaman/wip-15642 
librbd: client-side handling for incompatible object map sizes 

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-05-10 07:58:26 -07:00
Josh Durgin
f5d38f099b Merge pull request #8958 from dillaman/wip-15750 
librbd: constrain size of AioWriteEvent journal entries

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-05-10 07:57:20 -07:00
Josh Durgin
e0c57573a1 librbd: potential concurrent event processing during journal replayReviewed-by: Josh Durgin <jdurgin@redhat.com> 
librbd: potential concurrent event processing during journal replay
 2016-05-10 07:56:58 -07:00
Josh Durgin
9c43690c88 Merge pull request #8999 from dillaman/wip-15765 
journal: incorrectly computed object offset within set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-05-10 07:56:36 -07:00
Josh Durgin
7131b77919 Merge pull request #9034 from dillaman/wip-rbd-cli-integration-test 
test: update rbd integration cram test to remove format 1 warning

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-05-10 07:51:07 -07:00
Kefu Chai
25030b0436 cmake: pass CEPH_BUILD_VIRTUALENV to test as an env variable 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-05-10 21:50:17 +08:00