RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 16:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,918 Commits 219 Branches 396 Tags 1.3 GiB
4dd0d1bd01
Commit Graph

46918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
4dd0d1bd01 Merge pull request #6987 from H3C/wip-addr-bugfix 
common/address_help.cc: fix the leak in entity_addr_from_url()

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-28 16:40:38 +08:00
Josh Durgin
c485d29a53 Merge remote-tracking branch 'origin/jewel' 2015-12-23 16:32:00 -08:00
qiankunzheng
508deb9804 common/address_help.cc: fix the leak in entity_addr_from_url() 
Fixes: #14132
Signed-off-by: Qiankun Zheng <zheng.qiankun@h3c.com>
 2015-12-23 17:30:34 -05:00
Josh Durgin
f8c4d04ce4 Merge pull request #7026 from xdonghai/master 
rbd: must specify both of stripe-unit and stripe-count when specifying stripingv2 feature

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 14:28:24 -08:00
Josh Durgin
ea131fe815 Merge pull request #6998 from xiexingguo/xxg-wip-clsrbd 
stringify outputted error code and fix unmatched parentheses.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 14:15:32 -08:00
Josh Durgin
243146c67e Merge pull request #6983 from xiexingguo/xxg-wip-14126 
librbd: small fixes for error messages and readahead counter

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 14:12:43 -08:00
Sage Weil
459f2e8dd5 Merge pull request #6298 from guangyy/wip-13441 
osd: make list_missing query missing_loc.needs_recovery_map

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-12-23 17:05:54 -05:00
Sage Weil
44a3dbb96e Merge pull request #6572 from liewegas/wip-crush-chooseleaf-stable 
crush: add chooseleaf_stable tunable

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-23 17:05:23 -05:00
Josh Durgin
a297608196 Merge pull request #7043 from dillaman/wip-14170-jewel 
librbd: do not ignore self-managed snapshot release result

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 13:30:13 -08:00
Jason Dillaman
b4dbaa69ac librbd: do not ignore self-managed snapshot release result 
Fixes: #14170
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-23 13:57:44 -05:00
Josh Durgin
1e1df754b6 Merge pull request #7042 from dillaman/wip-14164-jewel 
librbd: properly handle replay of snap remove RPC message

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 10:52:16 -08:00
Josh Durgin
5657f5bfa2 Merge pull request #7041 from dillaman/wip-14165 
qa/workunits: merge_diff shouldn't attempt to use striping 

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 10:51:17 -08:00
Josh Durgin
c0c608b2bb Merge pull request #7040 from dillaman/wip-14092-jewel 
librbd: ensure librados callbacks are flushed prior to destroying 

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 10:48:43 -08:00
David Zafman
14933e7a9e Merge pull request #7036 from xiexingguo/xxg-wip-kvstore 
KeyValueStore: fix return code of mkfs

Reviewed-by: David Zafman <dzafman@redhat.com>
 2015-12-23 10:47:01 -08:00
Josh Durgin
9bb9b85411 Merge pull request #7020 from chenyehua11692/master 
doc:adding "--allow-shrink" in decreasing the size of the rbd block to distinguish from the increasing option

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 10:45:27 -08:00
Josh Durgin
f0767a7490 Merge pull request #7035 from dillaman/wip-14122-jewel 
librbd: clear error when older OSD doesn't support image flags

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-23 10:43:29 -08:00
Jason Dillaman
bc309d9d76 librbd: properly handle replay of snap remove RPC message 
Fixes: #14164
Backport: infernalis
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-23 13:26:39 -05:00
Jason Dillaman
8e095dedfa qa/workunits: merge_diff shouldn't attempt to use striping v2 
Fixes: #14165
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-23 12:54:47 -05:00
Jason Dillaman
98157ab327 librbd: ensure librados callbacks are flushed prior to destroying image 
Fixes: #14092
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-23 12:06:50 -05:00
xiexingguo
a069ea994d KeyValueStore: fix return code of mkfs 
It shall return a negative result code instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2015-12-23 22:49:59 +08:00
Jason Dillaman
b8d7aa2c2c librbd: clear error when older OSD doesn't support image flags 
Fixes: #14122
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-23 09:47:37 -05:00
John Spray
0c17b613f0 Merge pull request #6996 from H3C/wip-mds-f11322 
mds: we should wait messenger when MDSDaemon suicide

Reviewed-by: John Spray <john.spray@redhat.com>
 2015-12-23 13:49:14 +00:00
Kefu Chai
e0833f2cbc Merge pull request #7015 from chipitsine/master 
ceph-fuse: fix double free of args

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-23 21:39:36 +08:00
Sage Weil
d812e03b79 Merge pull request #7004 from jazeltq/master 
doc: fix typo

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-23 08:36:26 -05:00
Sage Weil
8ca07f44ad Merge pull request #6870 from mslovy/wip-pgmeta-object 
osd: os: skip checking pg_meta object existance in FileStore

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-23 08:28:50 -05:00
Sage Weil
0b675268a9 Merge pull request #6744 from majianpeng/scrub-fix 
osd: release related sources when scrub is interrupted

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-23 08:27:35 -05:00
Sage Weil
328a96f3e5 Merge pull request #6961 from liewegas/wip-lockdep-max 
common/lockdep: increase max lock names

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-23 08:26:43 -05:00
Wei Feng
fff49412c5 mds: we should wait messenger when MDSDaemon suicide 
Signed-off-by: Wei Feng <feng.wei@h3c.com>
 2015-12-23 07:48:04 -05:00
Loic Dachary
bea2e10a00 Merge pull request #7025 from tchaikov/wip-ceph-detect-init-py3 
ceph-detect-init: fix py3 test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-23 11:59:58 +01:00
Kefu Chai
80c770e115 ceph-detect-init: fix py3 test 
* in python3, None can not be compared with a str. and
  we should always set codename with a non empty str, so update
  TestCephDetectInit.test_debian so it always set a code name.
  and assert(codename and distroname) in choose_init().

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-12-23 16:35:12 +08:00
Loic Dachary
03f930772c Merge pull request #7023 from tchaikov/wip-doc-cachemode 
doc: document "readforward" and "readproxy" cache mode

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-23 09:12:49 +01:00
xudonghai
54b12f535d rbd:must specify both of stripe-unit and stripe-count when specify striping features 
when create a rbd image with striping features, Be sure specify both of stirpe-unit and stripe-count too, If not, refuse to excute and give a message

Signed-off-by:Donghai Xu <xu.donghai@h3c.com>
 2015-12-23 15:59:09 +08:00
Kefu Chai
d821acada3 doc: document "readforward" and "readproxy" cache mode 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2015-12-23 13:43:36 +08:00
Yehua
777564c870 doc:adding "--allow-shrink" in decreasing the size of the rbd block to distinguish from the increasing option 
In the original file, the increasing and decreaing of the size of the rbd block shares the same option:
    "rbd resize --size 2048 foo".
However, it is not proper, as the "--allow-shrink" needs to be added while decreasing the size of the rbd block.
As a result, it is necessary to make a distinguish between these two options as follows:
    "rbd resize --size 2048 foo (to increase)"
    "rbd resize --size 2048 foo --allow-shrink (to decrease)"

Signed-off-by: Yehua <chen.yehua@h3c.com>
 2015-12-23 13:13:04 +08:00
litianqing
877f332f57 ceph doc fix slip of pen 
mon client hung interval -> mon client hunt interval

Signed-off-by: tianqing <tianqing@unitedstack.com>
 2015-12-23 10:56:19 +08:00
Ilya Shipitsin
eb8057c6f4 ceph-fuse: fix double free of args 
Checking src/ceph_fuse.cc...
[src/ceph_fuse.cc:55]: (error) Memory pointed to by 'argv' is freed twice.
[src/ceph_fuse.cc:55]: (error) Deallocating a deallocated pointer: argv

Signed-off-by: Ilya Shipitsin <chipitsine@gmail.com>
 2015-12-23 01:28:06 +05:00
David Zafman
f14fe56d0c Merge pull request #6988 from xiexingguo/xxg-wip-14134 
FileJournal: fix return code of create method

Reviewed-by: David Zafman <dzafman@redhat.com>
 2015-12-22 10:02:37 -08:00
Orit Wasserman
cacc38e9cc Merge pull request #7005 from YankunLi/patch-4 
delete default zone
 2015-12-22 16:26:13 +01:00
Orit Wasserman
cc1edf3af1 Merge pull request #7006 from YankunLi/patch-5 
correct radosgw-admin command
 2015-12-22 16:18:52 +01:00
Sage Weil
714c9e3e6e Merge pull request #6997 from zhouyuan/evict_check_range 
osd: cache tier: add config option for eviction check list size

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-22 09:01:17 -05:00
Kefu Chai
7b3e5bfe07 Merge pull request #6990 from linuxbox2/master-fixes 
Fixes some small issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-22 21:55:07 +08:00
YankunLi
4dd86ca93e correct radosgw-admin command 
the command to disable users quota should be 'radosgw-admin quota disable --quota-scope=<user | bucket> --uid=<uid>'
 2015-12-22 13:56:50 +08:00
YankunLi
b1df12c000 delete default zone 
if the default zone exist, delete the default zone from both the east and west pools.
 2015-12-22 13:46:13 +08:00
Josh Durgin
09a3f69e6f Merge remote-tracking branch 'origin/jewel' 2015-12-21 16:59:51 -08:00
Sage Weil
e8dccacacd Merge pull request #6926 from dachary/wip-14080-ceph-disk-udevadm 
ceph-disk: fix failures when preparing disks with udev > 214

On CentOS 7.1 and other operating systems with a version of udev greater or equal to 214, 
running ceph-disk prepare triggered unexpected removal and addition of partitions on
the disk being prepared. That created problems ranging from the OSD not being activated
to failures because /dev/sdb1 does not exist although it should.

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-21 12:58:32 -05:00
Josh Durgin
df9ff2522f Merge pull request #7002 from dillaman/wip-14092-jewel 
tests: flush op work queue prior to destroying MockImageCtx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-21 07:31:57 -08:00
Jason Dillaman
b87269728d Merge pull request #6986 from xiexingguo/xxg-wip-14129 
librbd: fix snap_exists API return code overflow

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-21 10:29:33 -05:00
xiexingguo
6a45bbc863 test: update test cases with the new snap_exists API 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2015-12-21 23:13:28 +08:00
Jason Dillaman
fbac8172fc Merge pull request #6938 from wuxiangwei/wip-wxw-rbdfuserename 
rbd-fuse: implement mv operation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2015-12-21 09:55:08 -05:00
xiexingguo
6850d47e33 ECBackend: fix unmatched parenttheses 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2015-12-21 22:18:48 +08:00