RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,504 Commits 219 Branches 396 Tags 1.4 GiB
aed3434dc7
Commit Graph

40504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Farnum
e7e0ea626e Merge pull request #4170 from ceph/hammer-11205 
qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-24 21:35:29 -07:00
Yan, Zheng
6f218b1603 qa/workunits/fs/misc: fix filelock_interrupt.py 
Handle the case that kernel does not support fcntl.F_OFD_SETLK.
Also fix the code that checks if fnctl fails with errno == EINTR.

Fixes: 11205
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 4ececa3dc4)
 2015-03-25 11:10:56 +08:00
Yan, Zheng
2d6277683b mds: drop replayed requests when seesion is closed 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-03-25 10:47:22 +08:00
Yan, Zheng
8f91547654 mds: fix crash when killing busy session 
journal_close_session() has already freed pending_prealloc_inos

Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-03-25 10:38:28 +08:00
Sage Weil
4dbb9c872e Merge pull request #4162 from athanatos/wip-11156 
ReplicatedPG::promote_object: check scrubber and block if necessary

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-24 12:15:21 -07:00
Sage Weil
2c181c2ae8 Merge pull request #4164 from athanatos/wip-revert-degraded-writes-release-notes 
release-notes.rst: update for degraded writes revert
 2015-03-24 09:43:38 -07:00
Samuel Just
0f92f346a3 release-notes.rst: update for degraded writes revert 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-03-24 09:39:42 -07:00
Samuel Just
836fdc512d Merge pull request #4163 from athanatos/wip-revert-degraded-writes 
Wip revert degraded writes

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-24 09:31:13 -07:00
Sage Weil
40147d8c5e Merge pull request #4161 from trhoden/cephdeploy_not_new 
doc: no longer call out ceph-deploy as new
 2015-03-24 09:23:38 -07:00
Travis Rhoden
e1ca446c78 doc: no longer call out ceph-deploy as new 
The tip declaring ceph-deploy as new doesn't really apply anymore.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
 2015-03-24 12:05:07 -04:00
Loic Dachary
257ba2b2db Merge pull request #4154 from XinzeChi/wip-test-lfn-index 
bug fix: test case for lfn index

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-24 14:05:23 +01:00
Kefu Chai
9da1d1f52e Merge pull request #4150 from javierguerragiraldez/master 
libradosstriper: declare libradosstriper library dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-24 20:48:00 +08:00
Kefu Chai
0fdcbb863e Merge pull request #4157 from majianpeng/cleanup 
librados: remove the unused flags.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-24 20:19:57 +08:00
Jianpeng Ma
4bd2bd6bb8 librados: remove the unused flags. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-03-24 19:04:35 +08:00
Xinze Chi
791c3879d6 bug fix: test case for lfn index 
tests: TestFlatIndex.cc races with TestLFNIndex.cc
Both use the same PATH and when run in parallel they sometime conflict.

Fixes: #11217
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
 2015-03-24 18:42:04 +08:00
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 c632fecb87.
 2015-03-23 11:54:57 -07:00
Samuel Just
6ed86b4827 Revert "append_log: use remove_snap_mapped_object" 
This reverts commit 964d17756f.
 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 eb13f2d4b6)
 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