RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-25 12:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,125 Commits 211 Branches 394 Tags 1.3 GiB
5230967dad
Commit Graph

52125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Casey Bodley
5230967dad rgw: RGWPeriod::reflect() sets master zonegroup as default 
if RGWPeriod::reflect() is called right after a 'realm pull', it will
create the zonegroup objects but not set any as default.  so the next
time RGWRados is initialized, create_defaults() will add a new 'default'
zonegroup and set it as the master.  this causes a 'period update' to
find multiple master zonegroups and fail with EINVAL

reflect() now calls set_as_default(exclusive=true) on the master
zonegroup to guarantee that a default is set

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-13 10:44:17 -04:00
Sage Weil
18a5fddb90 Merge pull request #8520 from yuyuyu101/wip-15440 
msg/async: AsyncConnection: avoid is_connected require connection's lock
 2016-04-12 16:23:57 -04:00
Sage Weil
77276aa709 Merge pull request #8559 from liewegas/wip-15643 
rgw: fix unsafe c_str() usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-04-12 14:03:56 -04:00
Sage Weil
2601e2fb7e rgw/rgw_rados: use to_str() instead of c_str() 
bufferlist::c_str() doesn't guarantee null termination.

Fixes: http://tracker.ceph.com/issues/15463
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 11:15:14 -04:00
Sage Weil
d56e43950c buffer: add list::to_str() 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 11:15:14 -04:00
Kefu Chai
0785c17a60 Merge pull request #8552 from tchaikov/wip-15426 
PG: set epoch_created and parent_split_bits for child pg

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-12 23:09:55 +08:00
Kefu Chai
b9157310ea Merge pull request #8521 from stiopaa1/checkgenerated 
check-generated.sh: can't source bash from sh

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-12 22:57:44 +08:00
Greg Farnum
507e7edbcf Merge branch 'jewel' 2016-04-12 07:32:48 -07:00
Greg Farnum
735f4be9e2 Merge remote-tracking branch 'origin/greg-fs-testing-411' into jewel 2016-04-12 07:32:34 -07:00
Kefu Chai
8b985561ba PG: set epoch_created and parent_split_bits for child pg 
if we have a wrong "created", OSD receiving an osd_pg_create message
could fail to project its history and crash. a bad split_bits could
mislead the monitor and osd, and hence cause problems.
* set child.info.history.epoch_created to osdmap.get_epoch() instead of
  using the parent's epoch_created
* set child.info.stats.parent_split_bits to the calculated split_bits
  instead using the parent's split_bits

Fixes: http://tracker.ceph.com/issues/15426
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-04-12 19:43:11 +08:00
Kefu Chai
5f9c77bd10 Merge pull request #8544 from xiexingguo/xxg-wip-15464 
test: fix ut test failure caused by lfn change

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-12 10:50:52 +08:00
xie xingguo
bd1c548afa test: fix ut test failure caused by lfn change 
"755c685f2d"
change the lfn_parse_object_name() return type from bool to int but does not
change the relevant test correspondingly.

Fixes: http://tracker.ceph.com/issues/15464
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-04-12 09:06:36 +08:00
Greg Farnum
b922788841 Merge branch 'jewel-15402' of git://github.com/ukernel/ceph into greg-fs-testing 
Do not ignore standby_for_fscid when selecting a standby.

https://github.com/ceph/ceph/pull/8536

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-04-11 14:13:07 -07:00
John Wilkins
45219e0e2a Fixed ceph-common install. 
Fixes: #15438

Signed-off-by: John Wilkins <jowilkin@redhat.com>
 2016-04-11 09:54:02 -07:00
Jason Dillaman
5e6783cce5 librbd: fixed bug in disabling non-primary image mirroring 
librbd: fixed bug in disabling non-primary image mirroring

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-11 12:33:25 -04:00
Sage Weil
210d5d82ab Merge pull request #8496 from athanatos/wip-15312 
os/filestore: force lfn attrs to be written atomically, restructure name length limits
 2016-04-11 11:49:58 -04:00
Yan, Zheng
fd2f4555f9 mds: take standby_for_fscid into account in FSMap::find_unused() 
Fixes: http://tracker.ceph.com/issues/15402
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-04-11 22:43:25 +08:00
Casey Bodley
f6820c0003 Merge pull request #8529 from oritwas/wip-rgw-fix-zone-set 
radosgw-admin: allow
 2016-04-11 09:56:47 -04:00
Ricardo Dias
b6d8c32ae8 librbd: Fixed bug in disabling non-primary image mirroring 
It is only possible to remove image from rbd_mirroring object if the
mirroring image state is set to DISABLING.

Signed-off-by: Ricardo Dias <rdias@suse.com>
 2016-04-11 14:50:30 +01:00
Loic Dachary
0913938d41 Merge pull request #8508 from JiYou/fix-ceph-disk 
ceph-disk: do not always fail when re-using a partition

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-04-11 14:44:18 +02:00
Sage Weil
4e2a29ad4e Merge remote-tracking branch 'gh/jewel' 2016-04-11 08:38:27 -04:00
youji
14a66f67db ceph-disk: fix PrepareData.set_type() args should be class member. 
Signed-off-by: You Ji <youji@ebay.com>
 2016-04-11 05:28:43 -07:00
youji
4c203b3a14 ceph-disk: fix spelling mistake geattr to getattr. 
Signed-off-by: You Ji <youji@ebay.com>
 2016-04-11 05:28:43 -07:00
youji
5b098ca0e7 ceph-disk: fix lockbox set_or_create_partition() 
Signed-off-by: You Ji <youji@ebay.com>
 2016-04-11 05:28:13 -07:00
Orit Wasserman
14cec52b26 Merge pull request #8507 from kmroz/wip-rgw-admin-cleanup 
rgw-admin: remove unused iterator and fix error message
 2016-04-11 12:47:12 +02:00
Orit Wasserman
b7708da905 radosgw-admin: fix name checking 
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2016-04-11 10:54:48 +02:00
Orit Wasserman
770846b2ee radosgw-admin: allow setting zone when there is no realm 
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2016-04-11 10:54:48 +02:00
Loic Dachary
b474652070 Merge pull request #8522 from swamireddy/10.1.1-mailmap 
mailmap update

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-04-10 17:14:01 +02:00
Haomai Wang
175b3798d5 AsyncConnection: avoid is_connected require connection's lock 
Fixes: http://tracker.ceph.com/issues/15440
Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-04-10 17:02:58 +08:00
Michal Jarzabek
49886d5d8a check-generated.sh: can't source bash from sh 
'source' is not sh command and executing bash commands in sh won't
work. We could try to replace it with:
'. ../qa/workunits/ceph-helpers.sh'
but the above file uses bash.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
 2016-04-10 09:51:26 +01:00
Loic Dachary
871cd5a9b9 Merge pull request #8519 from dachary/wip-xenial 
tests: add Ubuntu 16.04 xenial dockerfile

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-09 23:19:09 +02:00
Sage Weil
adcc44b7d9 Merge pull request #8517 from kjurka/rgw-admin-doc-region-list 
doc: rgw admin uses "region list" not "regions list"
 2016-04-09 14:21:43 -04:00
Sage Weil
4d954fef85 Merge pull request #8518 from wjin/fix 
crush: fix typo

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2016-04-09 14:21:10 -04:00
Sage Weil
55aeba24b3 Merge pull request #8462 from xiexingguo/xxg-wip-scrub 
osd: fix two scrub relevant issues

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-09 13:38:20 -04:00
Sage Weil
71b539c821 Merge pull request #8485 from liewegas/wip-fuse-log 
ceph-fuse: rotate log file

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-04-09 13:35:15 -04:00
Sage Weil
21c9a2406c Merge pull request #8487 from liewegas/wip-copy-from-fail-cleanup 
osd: clean up temp object if copy-from fails

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-04-09 13:34:39 -04:00
Sage Weil
c672c309ad Merge pull request #8486 from liewegas/wip-14695 
librados: Revert "rados: Add new field flags for ceph_osd_op.copy_get."

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-04-09 13:33:54 -04:00
Sage Weil
e4eab045b4 Merge pull request #7956 from xiexingguo/xxg-wip-fixfstat 
common: buffer: put a guard for stat() syscall during read_file

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-04-09 13:32:57 -04:00
Jason Dillaman
30e943a9a9 Merge pull request #8516 from runsisi/wip-fix-ret 
journal: fix final result for JournalTrimmer::C_RemoveSet

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-09 09:22:12 -04:00
Loic Dachary
8bc8085a00 tests: add Ubuntu 16.04 xenial dockerfile 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-04-09 10:18:53 +02:00
Wei Jin
0e4a92e5d0 crush: fix typo 
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
 2016-04-09 14:52:11 +08:00
Kris Jurka
0a622e6054 doc: rgw admin uses "region list" not "regions list" 2016-04-08 21:47:28 -07:00
runsisi
3c772925ca journal: fix final result for JournalTrimmer::C_RemoveSet 
if the first journal object got removed successfully while later objects
failed then the final result should be set to fail

Signed-off-by: runsisi <runsisi@zte.com.cn>
 2016-04-09 11:33:06 +08:00
Samuel Just
3b54d5df28 test/rados/misc.cc: add long locator key and namespace tests 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-08 15:39:13 -07:00
Samuel Just
cb03d4d3c2 LFNIndex: use chain_getxattr_buf 
LFN attrs can be longer than these hard coded limits, let's just do
buffer doubling everywhere.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-08 15:39:13 -07:00
Samuel Just
c7db303028 chain_xattr: add chain_getxattr_buf 
Otherwise callers need to implement buffer doubling in a lot of cases,
which is error prone.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-08 15:39:13 -07:00
Samuel Just
755c685f2d LFNIndex::lfn_parse_object_name: return int rather than bool 
All current callers (except list_objects) already expect
ret < 0 for error.  Adjust list_objects to skip on EINVAL
instead of 0.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-08 15:38:17 -07:00
Samuel Just
e4916f68dd LFNIndex::list_objects: lfn_translate does not set errno 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-08 14:57:16 -07:00
Samuel Just
25f937e364 FileStore::set_xattr_limits_via_conf: add warning if max xattr size smaller than max name 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-08 14:57:16 -07:00
Samuel Just
18b9f95a4a test/objectstore/chain_xattr.cc: add test for ensure_single_attr 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-04-08 14:57:13 -07:00