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,146 Commits 211 Branches 394 Tags 1.3 GiB
1f62ec1393
Commit Graph

52146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Durgin
1f62ec1393 Merge pull request #8587 from emenguy/fix_dependencies_documentation 
doc: fix dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-13 17:06:08 -07:00
Josh Durgin
c05d7c9f92 Merge pull request #8584 from dillaman/wip-15479 
test: image replayer needs dummy remote mirror peer uuid

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-13 16:20:20 -07:00
Sage Weil
9bb4766f15 Merge pull request #8188 from ceph/wip-systemd-restart-defaults 
systemd: Use the same restart limits as upstart

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-04-13 16:50:46 -04:00
Etienne Menguy
0f8585c36c doc: fix dependencies 
Signed-off-by: Etienne Menguy <etienne.menguy@corp.ovh.com>
 2016-04-13 19:31:16 +00:00
Boris Ranto
62084375fa systemd: Use the same restart limits as upstart 
Currently, the systemd daemons are not restarted on failure. This patch
adds this functionality and sets the defaults to those defined in
upstart. This resolves to 3 fails per 30 minutes for osd, mon and mds
and 5 fails per 30 seconds for radosgw.

Signed-off-by: Boris Ranto <branto@redhat.com>
 2016-04-13 21:26:31 +02:00
Jason Dillaman
4b1d1698ba test: image replayer needs dummy remote mirror peer uuid 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-04-13 12:35:32 -04:00
Sage Weil
4943a55528 Merge pull request #8498 from liewegas/wip-bluestore 
os/bluestore: fix shortened bluefs paths in env mirror case
 2016-04-13 11:26:44 -04:00
Sage Weil
6651e51408 os/bluestore: fix shortened bluefs paths in env mirror case 
If we are mirroring the rocksdb env, don't shorten the
paths.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-13 09:29:16 -04:00
Sage Weil
6abc5d761a Merge pull request #8556 from liewegas/wip-ext4 
doc: recommend against ext4

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
 2016-04-13 09:19:19 -04:00
Kefu Chai
05968dbb61 Merge pull request #8574 from tchaikov/wip-readable-test-fix 
test/encoding/readable: use [ for "test" not ((

Reviewed-by: Erwan Velu <erwan@redhat.com>
 2016-04-13 20:32:50 +08:00
Orit Wasserman
1caef9807d Merge pull request #8567 from cbodley/wip-rgw-period-pull-url 
radosgw-admin: allow 'period pull --url' without full multisite config
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2016-04-13 13:30:05 +02:00
Kefu Chai
8d346acb4f test/encoding/readable: use [ for "test" not (( 
and use '&&' instead, easier to understand.

this also fixes following error in the ubuntu gitbuilder

error: Added files:
+ cat .git/added-files
src/0

where sh points to dash.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-04-13 16:21:09 +08:00
Casey Bodley
942504d22d radosgw-admin: 'realm pull' only accepts --url 
'realm pull' is defined as a 'raw storage op', so cannot use the
--remote argument to refer to endpoints from the period or local
zonegroup

refactored send_to_url() slightly to make it easier to call directly

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-12 17:14:50 -04:00
Casey Bodley
70ff086a50 radosgw-admin: allow 'period pull --url' without full multisite config 
to support 'period pull --remote', radosgw-admin needs a complete
multisite configuration to look up remote endpoints by name

however, 'period pull' will also accept a --url argument, which doesn't
require a working configuration. this patch splits the handling of these
two cases, so that 'period pull --url' can succeed when run on a cluster
that hasn't yet been fully configured

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2016-04-12 17:14:50 -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
489324f113 doc/configuration/filesystem-recommendations: recommend against ext4 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 13:24:56 -04:00
Sage Weil
a8e286915d doc/release-notes: mention ext4 in the release notes 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 13:07:50 -04:00
Sage Weil
112649fc02 doc/start/os-recommendations: drop ancient 'syncfs' note 
...and with it it's mention of ext4.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 13:07:49 -04:00
Sage Weil
638fd2ec2b doc/rados/configuration: minor cleanup of inline xattr description 
- whitespace
- it's not omap

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 11:19:13 -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
Sage Weil
bcfce592a2 doc: do not include ext4 as an example 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 08:49:55 -04:00
Sage Weil
2c72c9aa52 doc/8/ceph-deploy: do not include ext4 as an example value 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 08:48:46 -04:00
Sage Weil
61c4c1c99b doc: list ext4 last 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 08:48:25 -04:00
Sage Weil
ae97840fa1 doc/dev: remove ancient filestore-filesystem-compat doc 
This describes a problem we fixed years ago.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-04-12 08:39:00 -04: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