Commit Graph

40390 Commits

Author SHA1 Message Date
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
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
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
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
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
Nilamdyuti Goswami
db80e45df0 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
7a1984db41 doc: Updates radosgw man page with configuration for mod_proxy_fcgi .
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2015-03-23 16:35:27 +05:30
John Spray
777fd88b42 mds: call damaged() on errors loading SessionMap
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
573d94f424 mon/MDSMonitor: add "mds repaired"
For clearing an MDS rank out of `damaged`

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
658d9917eb mds: emit DAMAGED on MDSTable load error
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
c9ff8b4439 mds: add damaged() method
A hook to fire off one last DAMAGED beacon
to mon before respawning.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
45638cb81a mds: implement Beacon::send_and_wait
For callers that want to send a beacon, and then
wait up to some timeout for a response
from the mon.  Specifically, shutdown handlers.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
57e3429a8a mds: report damaged ranks in health
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
42f46b70d0 mon/MDSMonitor: handle DAMAGED in beacon
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
2b4f344a1b mds: report damaged in MDSMap::print_summary
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
d05fe08979 mds/MDSMap: update print() for DAMAGED
Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:08 +00:00
John Spray
9c5af9f9e3 mds: add damaged set to MDSMap
To track which ranks have been reported in state
DAMAGED by an MDS daemon.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:07 +00:00
John Spray
d8fa553db9 mds: introduce DAMAGED state
This state is for MDS daemons to report to
the monitor that they encountered an unfixable
error during startup/replay.  The implication
is that this rank should not be assigned to
another MDS daemon until offline repair is
performed, thus avoiding it flapping around
between failing daemons.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:07 +00:00
John Spray
699bf38e03 mds: remove unused Beacon::last_send
This was just a typo in the header, although someone
dutifully also added initialization of it to the constructor
at some stage too!

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:07 +00:00
John Spray
8a813bd089 mds: remove a spurious #if 1
This crept in in f93bf385.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:55:07 +00:00
John Spray
0cf1c7ad8a mds: be fairer in enqueuing purges
Don't let purges that require fewer ops skip ahead of those
that require more ops.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-03-23 10:19:15 +00:00