RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,696 Commits 216 Branches 395 Tags 1.4 GiB
1c381b3ca8
Commit Graph

40696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
8dd9f6a4ed Merge pull request #4099 from rajukv/xio-bugfix 
XIO: Handle queued incoming XIO messages during retry

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-24 11:31:53 +08:00
Sage Weil
ed5ee16747 Merge pull request #4152 from ceph/wip-11145 
rgw: shut down timer before erroring out

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-23 18:11:08 -07:00
Sage Weil
c50255fc24 doc/release-notes: draft hammer release notes 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-23 16:59:55 -07:00
Alexandre Marangone
7f03c8891a be gender neutral 
Signed-off-by: Alexandre Marangone <amarango@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-23 16:59:55 -07:00
Yehuda Sadeh
924ace882e rgw: shut down timer before erroring out 
Fixes: #11145
Backport: hammer

Clean up initialization timer, otherwise if we error out, we'll assert.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-03-23 16:21:14 -07:00
Javier Guerra
7413cd7f40 Declare libradosstriper library dependencies 
When omitted, trying to dynamically load libradosstriper results in "undefined symbol" errors.

Signed-off-by: Javier Guerra <javier@guerrag.com>
 2015-03-23 17:44:31 -05:00
Loic Dachary
cb47998213 Merge pull request #4081 from ian-kelling/master 
doc: consistent alternate cluster name arguments

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 23:42:46 +01:00
Samuel Just
65bb4df599 ReplicatedPG::promote_object: check scrubber and block if necessary 
Otherwise, we might attempt to promote into an in-progress scrub
interval causing 11156.  I would have added a return value to
promote_object(), but could not find an existing user which
cared to distinguish the cases, even with a null op passed.
All existing users are in maybe_handle_cache.  The ones which
pass a null op are for promoting the object in parallel
with a proxy -- a case where not actually performing the promote
does not really matter.

Fixes: #11156
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-03-23 14:40:59 -07:00
Loic Dachary
0a3e47d778 Merge pull request #4148 from dobbler123/master 
doc: Fixes spelling and grammatical errors

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 22:30:59 +01:00
Vartika Rai
8471f927c8 doc: Fixes spelling and grammatical errors 
Signed-off-by: Vartika Rai <vartikarai17@gmail.com>
 2015-03-24 02:11:34 +05:30
Loic Dachary
5927a9f093 Merge pull request #4146 from rlrevell/wip-doc-rlrevell-clarify-nova-instructions 
doc: Clarify the requirement that the cinder user's key must be present ...

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 21:17:03 +01:00
Loic Dachary
0adb36c286 Merge pull request #4147 from rlrevell/wip-doc-rlrevell-correct-git-instructions 
doc: Correct git push instructions adding branch name

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 21:15:26 +01:00
Loic Dachary
5964590ac5 Merge pull request #4009 from objoo/for-hammer 
mailmap: v.0.94 updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 21:13:29 +01:00
Lee Revell
005d1f8a5c doc: Correct git push instructions adding branch name 
Signed-off-by: Lee Revell <rlrevell@gmail.com>
 2015-03-23 16:03:48 -04:00
Loic Dachary
059674a686 Merge pull request #4056 from dmitryya/issue_11140 
rgw: init script in stop action waits until the radosgw stops

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 20:48:02 +01:00
Sage Weil
0bee27461d Merge remote-tracking branch 'gh/hammer' 
Conflicts:
	src/gmock
 2015-03-23 12:45:16 -07:00
Dmitry Yatsushkevich
1cca0c1e91 rgw: init script waits until the radosgw stops 
Fixes: #11140
Init script waits in stop action until the radowgw daemons stop.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
 2015-03-23 12:40:23 -07:00
Lee Revell
39d0d53ef6 doc: Clarify the requirement that the cinder user's key must be present on the compute nodes 
Signed-off-by: Lee Revell <rlrevell@gmail.com>
 2015-03-23 15:37:29 -04:00
Loic Dachary
3216a584e0 Merge pull request #4125 from dzafman/wip-11176-hammer 
ceph-objectstore-tool: Output only unsupported features when incomatible

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 20:37:14 +01:00
Loic Dachary
306719ce5b Merge pull request #4086 from tchaikov/fix-doxygen-warnings 
doc: fix doxygen warnings

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 20:35:52 +01:00
Sage Weil
df35a91023 Merge pull request #4145 from ceph/wip-hammer-rgw 
Wip hammer rgw

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-23 12:30:47 -07:00
Samuel Just
78c5de77a2 osd/: s/is_degraded_object/is_degraded_or_backfilling_object 
Currently, this method also returns true if the object is backfilling.
This commit was reverted earlier in the branch in order to make the
other reverts clean.  It's actually a nice rename though, so I'm
re-cherry-picking it.

Signed-off-by: Samuel Just <sjust@redhat.com>

Conflicts:
	src/osd/ReplicatedPG.cc
 2015-03-23 12:11:32 -07:00
Samuel Just
4a5bd0561a Revert "osd/: update peer_missing and local missing if we write a degraded object" 
This reverts commit c632fecb87e292eb73161f36d4e6df6f077fae77.
 2015-03-23 11:54:57 -07:00
Samuel Just
6ed86b4827 Revert "append_log: use remove_snap_mapped_object" 
This reverts commit 964d17756f9e49002eb96c4f27a3f41da0880f71.
 2015-03-23 11:54:44 -07:00
Samuel Just
b84943cb45 Revert "osd/: don't block writes on degraded objects" 
This reverts commit f9abffbb24.
 2015-03-23 11:50:10 -07:00
Samuel Just
9cefc59118 Revert "ReplicatedPG: block writes on degraded objects for ec pools" 
This reverts commit 1f165d2547.
 2015-03-23 11:48:38 -07:00
Samuel Just
45bff593de Revert "Merge pull request #3641 from athanatos/wip-10731" 
This reverts commit 54a22236a0, reversing
changes made to 7eca03e290.

Conflicts:
	src/include/ceph_features.h
 2015-03-23 11:46:35 -07:00
Samuel Just
6f23d3420f Revert "osd/: s/is_degraded_object/is_degraded_or_backfilling_object" 
This reverts commit 25f9363b90.
 2015-03-23 11:43:52 -07:00
Yehuda Sadeh
fc3ce48daf rgw: update makefile to enable civetweb config 
Fixes: #10965
Backport: hammer, firefly

Civetweb compilation now includes conf header to enable ipv6.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit caa90225ba)
 2015-03-23 11:37:04 -07:00
Yehuda Sadeh
2f1342e965 civetweb: update submodule 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 0f8be6f086)
 2015-03-23 11:36:47 -07:00
Yehuda Sadeh
e5f3282101 rgw: pass civetweb configurables to civetweb 
Fixes: #10907
Backport: firefly

Pass any configurables in the rgw frontends config line to civetweb.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 986d755442)
 2015-03-23 11:34:57 -07:00
Yehuda Sadeh
a8ced2c6ce rgw: don't overwrite bucket / object owner when setting acls 
Fixes: #10978
Backport: hammer, firefly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit eb13f2d4b60c031f16139f7cc4237c012644dd78)
 2015-03-23 11:34:04 -07:00
Gregory Farnum
dd0f46fa67 Merge pull request #4011 from ceph/wip-mds-damaged 
mds: Add 'damaged' state and handle errors during rank startup

Reviewed-by: Greg Farnum <gfarnum@rehdat.com>
 2015-03-23 11:21:23 -07:00
John Spray
ece49d1021 mds: handle read/replay errors in MDLog with damaged() 
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-23 18:20:11 +00:00
John Spray
73b591ad90 mds: call damaged() on what were assertions in replay 
i.e. categorize an unreplayable journal as a damaged rank.

NB there will be other cases where replay can assert out
while calling into other classes, but that's for another day.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-23 18:20:11 +00:00
John Spray
6bf1ce76eb osdc/Journaler: improved error handling 
Exceptions from ::decode are caught and turned
into return codes that we can handle via
the contexts used for completions.

The assertion that entry_size != 0 is removed in
JournalStream::read so that if it is zero that
just becomes a normal deserialization error
later when someone tries to decode the
zerolength journal event.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-23 18:20:10 +00:00
John Spray
2b4d96bbbb mds: catch exceptions in ::decode 
...and translate them into more readily handlable -EINVALs

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-23 18:20:10 +00:00
Gregory Farnum
ccaf1acdc6 Merge pull request #4102 from larkly/patch-docerror-usermgmt 
Minor fix: bootstrap-mds in user-management.rst

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 11:20:01 -07:00
John Spray
989736968b mds: handle encoding errors on MDSTable load 
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-23 18:19:17 +00:00
Gregory Farnum
d684da0699 Merge pull request #3893 from ceph/wip-10390 
#10390: Refactor stray handling code and add throttling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-23 11:17:42 -07:00
Samuel Just
3edfa672fd Revert "ReplicatedPG: only allow a degraded write if we have at least min_size copies" 
This reverts commit 48466f8d7ce2b6762077f3fc686ada5648021517.
 2015-03-23 11:16:27 -07:00
Samuel Just
5e4b7b0df4 Revert "Merge pull request #3911 from athanatos/wip-11057" 
This reverts commit 05bb9c9870, reversing
changes made to b780048c48.
 2015-03-23 11:16:06 -07:00
Loic Dachary
c5e9a214e4 Merge pull request #3371 from nilamdyuti/wip-doc-ceph-object-gateway 
Updates radosgw man page with configuration for mod_proxy_fcgi

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
 2015-03-23 18:25:41 +01:00
Sage Weil
ca17738475 Merge pull request #4137 from majianpeng/assert-version 
osd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-23 09:21:43 -07:00
Loic Dachary
630e9802db Merge pull request #4141 from tchaikov/sync-rst-with-manpages 
doc: update .rst file with their .8 counterparts

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-23 16:45:21 +01:00
Gregory Farnum
42e8c734f9 Merge pull request #4117 from ceph/wip-libcephfs-flock 
Fixes for libcephfs flock tests

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-23 07:14:36 -07:00
Nilamdyuti Goswami
3e3d954b8e doc: Adds updated radosgw-admin man page under man/ 
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2015-03-23 16:39:18 +05:30
Nilamdyuti Goswami
e62ff4dbf6 doc: Updates radosgw-admin man page. 
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2015-03-23 16:39:18 +05:30
Nilamdyuti Goswami
923ab6e7d1 doc: Adds updated radosgw man page under man/ 
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2015-03-23 16:35:27 +05:30
Nilamdyuti Goswami
e5bc64bfa6 doc: Updates radosgw man page. 
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2015-03-23 16:35:27 +05:30