]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agomark kinetic experimental 4160/head
Sage Weil [Mon, 30 Mar 2015 16:33:16 +0000 (09:33 -0700)]
mark kinetic experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomark rocksdb experimental
Sage Weil [Mon, 30 Mar 2015 16:33:00 +0000 (09:33 -0700)]
mark rocksdb experimental

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agorocksdb: fix 32-bit build
Sage Weil [Thu, 26 Mar 2015 18:04:18 +0000 (11:04 -0700)]
rocksdb: fix 32-bit build

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMakefile-rocksdb.am: update for latest rocks
Sage Weil [Thu, 26 Mar 2015 18:01:35 +0000 (11:01 -0700)]
Makefile-rocksdb.am: update for latest rocks

Lots of files changed here; rebuilt the list from scratch.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agorocksdb: update to newer version
Sage Weil [Tue, 24 Mar 2015 15:38:16 +0000 (08:38 -0700)]
rocksdb: update to newer version

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoUpdate RocksDBStore to match new RockDB config API
Xiaoxi Chen [Tue, 24 Mar 2015 02:04:17 +0000 (10:04 +0800)]
Update RocksDBStore to match new RockDB config API

RockDB configuration api was changed, updated RockDBStore
to use it.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoMerge pull request #4154 from XinzeChi/wip-test-lfn-index
Loic Dachary [Tue, 24 Mar 2015 13:05:23 +0000 (14:05 +0100)]
Merge pull request #4154 from XinzeChi/wip-test-lfn-index

bug fix: test case for lfn index

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4150 from javierguerragiraldez/master
Kefu Chai [Tue, 24 Mar 2015 12:48:00 +0000 (20:48 +0800)]
Merge pull request #4150 from javierguerragiraldez/master

libradosstriper: declare libradosstriper library dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #4157 from majianpeng/cleanup
Kefu Chai [Tue, 24 Mar 2015 12:19:57 +0000 (20:19 +0800)]
Merge pull request #4157 from majianpeng/cleanup

librados: remove the unused flags.

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agolibrados: remove the unused flags. 4157/head
Jianpeng Ma [Tue, 24 Mar 2015 11:04:35 +0000 (19:04 +0800)]
librados: remove the unused flags.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agobug fix: test case for lfn index 4154/head
Xinze Chi [Tue, 24 Mar 2015 10:42:04 +0000 (18:42 +0800)]
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>
10 years agoMerge pull request #4099 from rajukv/xio-bugfix
Kefu Chai [Tue, 24 Mar 2015 03:31:53 +0000 (11:31 +0800)]
Merge pull request #4099 from rajukv/xio-bugfix

XIO: Handle queued incoming XIO messages during retry

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agodoc/release-notes: draft hammer release notes
Sage Weil [Mon, 23 Mar 2015 23:13:44 +0000 (16:13 -0700)]
doc/release-notes: draft hammer release notes

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agobe gender neutral
Alexandre Marangone [Mon, 23 Mar 2015 23:36:08 +0000 (16:36 -0700)]
be gender neutral

Signed-off-by: Alexandre Marangone <amarango@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoDeclare libradosstriper library dependencies 4150/head
Javier Guerra [Mon, 23 Mar 2015 22:44:31 +0000 (17:44 -0500)]
Declare libradosstriper library dependencies

When omitted, trying to dynamically load libradosstriper results in "undefined symbol" errors.

Signed-off-by: Javier Guerra <javier@guerrag.com>
10 years agoMerge pull request #4081 from ian-kelling/master
Loic Dachary [Mon, 23 Mar 2015 22:42:46 +0000 (23:42 +0100)]
Merge pull request #4081 from ian-kelling/master

doc: consistent alternate cluster name arguments

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4148 from dobbler123/master
Loic Dachary [Mon, 23 Mar 2015 21:30:59 +0000 (22:30 +0100)]
Merge pull request #4148 from dobbler123/master

doc: Fixes spelling and grammatical errors

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Fixes spelling and grammatical errors 4148/head
Vartika Rai [Mon, 23 Mar 2015 20:41:34 +0000 (02:11 +0530)]
doc: Fixes spelling and grammatical errors

Signed-off-by: Vartika Rai <vartikarai17@gmail.com>
10 years agoMerge pull request #4146 from rlrevell/wip-doc-rlrevell-clarify-nova-instructions
Loic Dachary [Mon, 23 Mar 2015 20:17:03 +0000 (21:17 +0100)]
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>
10 years agoMerge pull request #4147 from rlrevell/wip-doc-rlrevell-correct-git-instructions
Loic Dachary [Mon, 23 Mar 2015 20:15:26 +0000 (21:15 +0100)]
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>
10 years agoMerge pull request #4009 from objoo/for-hammer
Loic Dachary [Mon, 23 Mar 2015 20:13:29 +0000 (21:13 +0100)]
Merge pull request #4009 from objoo/for-hammer

mailmap: v.0.94 updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Correct git push instructions adding branch name 4147/head
Lee Revell [Mon, 23 Mar 2015 20:03:48 +0000 (16:03 -0400)]
doc: Correct git push instructions adding branch name

Signed-off-by: Lee Revell <rlrevell@gmail.com>
10 years agoMerge pull request #4056 from dmitryya/issue_11140
Loic Dachary [Mon, 23 Mar 2015 19:48:02 +0000 (20:48 +0100)]
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>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Mon, 23 Mar 2015 19:45:16 +0000 (12:45 -0700)]
Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

10 years agorgw: init script waits until the radosgw stops 4056/head
Dmitry Yatsushkevich [Tue, 17 Mar 2015 22:44:52 +0000 (15:44 -0700)]
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>
10 years agodoc: Clarify the requirement that the cinder user's key must be present on the comput... 4146/head
Lee Revell [Mon, 23 Mar 2015 19:37:29 +0000 (15:37 -0400)]
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>
10 years agoMerge pull request #4125 from dzafman/wip-11176-hammer
Loic Dachary [Mon, 23 Mar 2015 19:37:14 +0000 (20:37 +0100)]
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>
10 years agoMerge pull request #4086 from tchaikov/fix-doxygen-warnings
Loic Dachary [Mon, 23 Mar 2015 19:35:52 +0000 (20:35 +0100)]
Merge pull request #4086 from tchaikov/fix-doxygen-warnings

doc: fix doxygen warnings

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4145 from ceph/wip-hammer-rgw
Sage Weil [Mon, 23 Mar 2015 19:30:47 +0000 (12:30 -0700)]
Merge pull request #4145 from ceph/wip-hammer-rgw

Wip hammer rgw

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agorgw: update makefile to enable civetweb config 4145/head
Yehuda Sadeh [Fri, 27 Feb 2015 16:14:41 +0000 (08:14 -0800)]
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 caa90225bad9fe5e9c275e6189b3396b4d396e3f)

10 years agocivetweb: update submodule
Yehuda Sadeh [Fri, 27 Feb 2015 16:14:27 +0000 (08:14 -0800)]
civetweb: update submodule

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 0f8be6f086faaea4b20a36dfdd436d2300f56d08)

10 years agorgw: pass civetweb configurables to civetweb
Yehuda Sadeh [Tue, 17 Feb 2015 23:05:40 +0000 (15:05 -0800)]
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 986d7554426764a149621ba733c5c075b94e0431)

10 years agorgw: don't overwrite bucket / object owner when setting acls
Yehuda Sadeh [Fri, 27 Feb 2015 23:32:50 +0000 (15:32 -0800)]
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)

10 years agoMerge pull request #4011 from ceph/wip-mds-damaged
Gregory Farnum [Mon, 23 Mar 2015 18:21:23 +0000 (11:21 -0700)]
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>
10 years agomds: handle read/replay errors in MDLog with damaged() 4011/head
John Spray [Thu, 19 Mar 2015 20:42:59 +0000 (20:42 +0000)]
mds: handle read/replay errors in MDLog with damaged()

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: call damaged() on what were assertions in replay
John Spray [Thu, 19 Mar 2015 20:41:36 +0000 (20:41 +0000)]
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>
10 years agoosdc/Journaler: improved error handling
John Spray [Thu, 19 Mar 2015 20:16:55 +0000 (20:16 +0000)]
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>
10 years agomds: catch exceptions in ::decode
John Spray [Thu, 19 Mar 2015 20:15:47 +0000 (20:15 +0000)]
mds: catch exceptions in ::decode

...and translate them into more readily handlable -EINVALs

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #4102 from larkly/patch-docerror-usermgmt
Gregory Farnum [Mon, 23 Mar 2015 18:20:01 +0000 (11:20 -0700)]
Merge pull request #4102 from larkly/patch-docerror-usermgmt

Minor fix: bootstrap-mds in user-management.rst

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomds: handle encoding errors on MDSTable load
John Spray [Thu, 19 Mar 2015 15:30:15 +0000 (15:30 +0000)]
mds: handle encoding errors on MDSTable load

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3893 from ceph/wip-10390
Gregory Farnum [Mon, 23 Mar 2015 18:17:42 +0000 (11:17 -0700)]
Merge pull request #3893 from ceph/wip-10390

#10390: Refactor stray handling code and add throttling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3371 from nilamdyuti/wip-doc-ceph-object-gateway
Loic Dachary [Mon, 23 Mar 2015 17:25:41 +0000 (18:25 +0100)]
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>
10 years agoMerge pull request #4137 from majianpeng/assert-version
Sage Weil [Mon, 23 Mar 2015 16:21:43 +0000 (09:21 -0700)]
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>
10 years agoMerge pull request #4141 from tchaikov/sync-rst-with-manpages
Loic Dachary [Mon, 23 Mar 2015 15:45:21 +0000 (16:45 +0100)]
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>
10 years agoMerge pull request #4117 from ceph/wip-libcephfs-flock
Gregory Farnum [Mon, 23 Mar 2015 14:14:36 +0000 (07:14 -0700)]
Merge pull request #4117 from ceph/wip-libcephfs-flock

Fixes for libcephfs flock tests

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agodoc: Adds updated radosgw-admin man page under man/ 3371/head
Nilamdyuti Goswami [Thu, 22 Jan 2015 18:23:50 +0000 (23:53 +0530)]
doc: Adds updated radosgw-admin man page under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates radosgw-admin man page.
Nilamdyuti Goswami [Thu, 22 Jan 2015 18:21:52 +0000 (23:51 +0530)]
doc: Updates radosgw-admin man page.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Adds updated radosgw man page under man/
Nilamdyuti Goswami [Tue, 20 Jan 2015 16:28:00 +0000 (21:58 +0530)]
doc: Adds updated radosgw man page under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates radosgw man page.
Nilamdyuti Goswami [Tue, 20 Jan 2015 16:26:14 +0000 (21:56 +0530)]
doc: Updates radosgw man page.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Adds updated radosgw man page under man/
Nilamdyuti Goswami [Wed, 14 Jan 2015 18:55:28 +0000 (00:25 +0530)]
doc: Adds updated radosgw man page under man/

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates radosgw man page with configuration for mod_proxy_fcgi .
Nilamdyuti Goswami [Wed, 14 Jan 2015 18:53:17 +0000 (00:23 +0530)]
doc: Updates radosgw man page with configuration for mod_proxy_fcgi .

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agomds: call damaged() on errors loading SessionMap
John Spray [Thu, 19 Mar 2015 13:24:11 +0000 (13:24 +0000)]
mds: call damaged() on errors loading SessionMap

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomon/MDSMonitor: add "mds repaired"
John Spray [Mon, 16 Mar 2015 01:02:03 +0000 (01:02 +0000)]
mon/MDSMonitor: add "mds repaired"

For clearing an MDS rank out of `damaged`

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: emit DAMAGED on MDSTable load error
John Spray [Mon, 16 Mar 2015 00:18:30 +0000 (00:18 +0000)]
mds: emit DAMAGED on MDSTable load error

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: add damaged() method
John Spray [Mon, 16 Mar 2015 00:04:36 +0000 (00:04 +0000)]
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>
10 years agomds: implement Beacon::send_and_wait
John Spray [Wed, 18 Mar 2015 17:42:54 +0000 (17:42 +0000)]
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>
10 years agomds: report damaged ranks in health
John Spray [Sun, 15 Mar 2015 23:46:26 +0000 (23:46 +0000)]
mds: report damaged ranks in health

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomon/MDSMonitor: handle DAMAGED in beacon
John Spray [Sun, 15 Mar 2015 23:18:52 +0000 (23:18 +0000)]
mon/MDSMonitor: handle DAMAGED in beacon

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: report damaged in MDSMap::print_summary
John Spray [Wed, 18 Mar 2015 17:54:46 +0000 (17:54 +0000)]
mds: report damaged in MDSMap::print_summary

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds/MDSMap: update print() for DAMAGED
John Spray [Wed, 18 Mar 2015 19:05:28 +0000 (19:05 +0000)]
mds/MDSMap: update print() for DAMAGED

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: add `damaged` set to MDSMap
John Spray [Fri, 13 Mar 2015 21:06:39 +0000 (17:06 -0400)]
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>
10 years agomds: introduce DAMAGED state
John Spray [Fri, 13 Mar 2015 21:04:34 +0000 (17:04 -0400)]
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>
10 years agomds: remove unused Beacon::last_send
John Spray [Wed, 18 Mar 2015 19:08:35 +0000 (19:08 +0000)]
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>
10 years agomds: remove a spurious #if 1
John Spray [Fri, 13 Mar 2015 20:58:09 +0000 (16:58 -0400)]
mds: remove a spurious #if 1

This crept in in f93bf385.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: be fairer in enqueuing purges 3893/head
John Spray [Fri, 20 Mar 2015 21:09:43 +0000 (21:09 +0000)]
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>
10 years agodoc: update .rst file with their .8 counterparts 4141/head
Kefu Chai [Mon, 23 Mar 2015 03:59:40 +0000 (11:59 +0800)]
doc: update .rst file with their .8 counterparts

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoosd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use 4137/head
Jianpeng Ma [Mon, 23 Mar 2015 07:12:23 +0000 (15:12 +0800)]
osd/ReplicatedPG: For CEPH_OSD_OP_ASSERT_VER, it should use
op.assert_ver rather than op.watch.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #4134 from dzafman/wip-dzman-hammer
Loic Dachary [Sun, 22 Mar 2015 23:41:17 +0000 (00:41 +0100)]
Merge pull request #4134 from dzafman/wip-dzman-hammer

Minor man page improvement

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Regenerate man/ceph.8 based on ceph.rst changes 4134/head
David Zafman [Fri, 20 Mar 2015 22:38:33 +0000 (15:38 -0700)]
doc: Regenerate man/ceph.8 based on ceph.rst changes

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Break ceph osd pool get into sections based on pool type
David Zafman [Fri, 20 Mar 2015 22:33:39 +0000 (15:33 -0700)]
doc: Break ceph osd pool get into sections based on pool type

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4135 from ceph/wip-11198
Haomai Wang [Sun, 22 Mar 2015 16:01:08 +0000 (00:01 +0800)]
Merge pull request #4135 from ceph/wip-11198

Fix ceph_test_async_driver failed

10 years agoFix ceph_test_async_driver failed 4135/head
Haomai Wang [Sun, 22 Mar 2015 15:59:19 +0000 (23:59 +0800)]
Fix ceph_test_async_driver failed

This test will create 10000 sockets which will failed because of limited system fd. Actually we only need to create several hundreds sockets and it's enough to get the test's goal.

Fix bug #11198

10 years agoMerge pull request #3873 from tchaikov/cli-human-readable-errno
Loic Dachary [Sun, 22 Mar 2015 08:19:58 +0000 (09:19 +0100)]
Merge pull request #3873 from tchaikov/cli-human-readable-errno

rados: translate errno to str in CLI

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3841 from ceph/wip-10217
Loic Dachary [Sun, 22 Mar 2015 08:08:21 +0000 (09:08 +0100)]
Merge pull request #3841 from ceph/wip-10217

qa/workunits/fs/misc: fix filelock_interrupt.py

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3829 from liewegas/wip-recovery-sleep
Loic Dachary [Sun, 22 Mar 2015 08:03:57 +0000 (09:03 +0100)]
Merge pull request #3829 from liewegas/wip-recovery-sleep

osd: inject simple sleep in recovery

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3685 from XinzeChi/wip-mark-started
Sage Weil [Sat, 21 Mar 2015 22:23:47 +0000 (15:23 -0700)]
Merge pull request #3685 from XinzeChi/wip-mark-started

osd: clear extra mark_started

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3282 from tchaikov/pq-test
Sage Weil [Sat, 21 Mar 2015 21:53:36 +0000 (14:53 -0700)]
Merge pull request #3282 from tchaikov/pq-test

common/PrioritizedQueue: add basic tests for it

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3177 from davidzhang84/wip-inject-eio-ec
Sage Weil [Sat, 21 Mar 2015 21:52:51 +0000 (14:52 -0700)]
Merge pull request #3177 from davidzhang84/wip-inject-eio-ec

Add EIO injection on EC pool for mdata and data error only for now

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3889 from XinzeChi/wip-tier-stat
Sage Weil [Sat, 21 Mar 2015 21:39:54 +0000 (14:39 -0700)]
Merge pull request #3889 from XinzeChi/wip-tier-stat

osd: add l_osd_op_cache_hit perf counter for cache pool

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4010 from majianpeng/osdmap-nspace
Sage Weil [Sat, 21 Mar 2015 21:39:35 +0000 (14:39 -0700)]
Merge pull request #4010 from majianpeng/osdmap-nspace

mon:make 'ceph osd map' accept namespace.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4130 from dachary/wip-backports
Loic Dachary [Sat, 21 Mar 2015 10:22:49 +0000 (11:22 +0100)]
Merge pull request #4130 from dachary/wip-backports

doc: what does it mean for a release to be supported

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agodoc: what does it mean for a release to be supported 4130/head
Loic Dachary [Sat, 21 Mar 2015 10:06:28 +0000 (11:06 +0100)]
doc: what does it mean for a release to be supported

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4122 from trhoden/rgw-quickstart
Sage Weil [Sat, 21 Mar 2015 00:45:38 +0000 (17:45 -0700)]
Merge pull request #4122 from trhoden/rgw-quickstart

doc: Add RGW quick start info

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4098 from ceph/wip-11128
Yehuda Sadeh [Sat, 21 Mar 2015 00:11:35 +0000 (17:11 -0700)]
Merge pull request #4098 from ceph/wip-11128

auth: reinitialize NSS modules after fork()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoceph-objectstore-tool: Output only unsupported features when incomatible 4125/head
David Zafman [Fri, 20 Mar 2015 23:57:40 +0000 (16:57 -0700)]
ceph-objectstore-tool: Output only unsupported features when incomatible

Fixes: #11176
Backport: firefly, giant

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #4040 from dzafman/wip-11092-11093
Dan Mick [Fri, 20 Mar 2015 23:39:00 +0000 (16:39 -0700)]
Merge pull request #4040 from dzafman/wip-11092-11093

Fix ceph pg dump_stuck with multiple options

Reviewed-by: Dan Mick <dmick@redhat.com>
10 years agoauth: use crypto_init_mutex to protect NSS_Shutdown() 4098/head
Yan, Zheng [Fri, 20 Mar 2015 23:13:51 +0000 (07:13 +0800)]
auth: use crypto_init_mutex to protect NSS_Shutdown()

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agodoc: Add RGW quick start info 4122/head
Travis Rhoden [Fri, 20 Mar 2015 21:07:36 +0000 (17:07 -0400)]
doc: Add RGW quick start info

Add details of how to use ceph-deploy to deploy the CivetWeb-based
RGW present in Hammer.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
10 years agomailmap: Wuxingyi affiliation 4009/head
Yann Dupont [Fri, 20 Mar 2015 21:33:27 +0000 (21:33 +0000)]
mailmap: Wuxingyi affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agoMerge pull request #4120 from trhoden/quickstart-mon-create
Sage Weil [Fri, 20 Mar 2015 21:32:29 +0000 (14:32 -0700)]
Merge pull request #4120 from trhoden/quickstart-mon-create

doc: remove reference to old ceph-deploy steps

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodoc: remove reference to old ceph-deploy steps 4120/head
Travis Rhoden [Fri, 20 Mar 2015 21:10:54 +0000 (17:10 -0400)]
doc: remove reference to old ceph-deploy steps

ceph-deploy 1.1.3 is ancient, and isn't easily found or installed.

No need to reference it and call out the steps necessary to use if
using it.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
10 years agomailmap: Rohan Mars affiliation
Yann Dupont [Fri, 20 Mar 2015 21:08:10 +0000 (21:08 +0000)]
mailmap: Rohan Mars affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Javier Guerra affiliation
Yann Dupont [Fri, 20 Mar 2015 20:50:22 +0000 (20:50 +0000)]
mailmap: Javier Guerra affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Thomas Johnson affiliation
Yann Dupont [Tue, 17 Mar 2015 18:02:20 +0000 (18:02 +0000)]
mailmap: Thomas Johnson affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Alfredo Deza affiliation
Yann Dupont [Mon, 16 Mar 2015 22:07:51 +0000 (22:07 +0000)]
mailmap: Alfredo Deza affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Vicente Cheng affiliation
Yann Dupont [Mon, 16 Mar 2015 21:35:33 +0000 (21:35 +0000)]
mailmap: Vicente Cheng affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Fix Xan Peng affiliation
Yann Dupont [Mon, 16 Mar 2015 21:31:41 +0000 (21:31 +0000)]
mailmap: Fix Xan Peng affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Zhicheng Wei affiliation.
Yann Dupont [Mon, 16 Mar 2015 21:14:28 +0000 (21:14 +0000)]
mailmap: Zhicheng Wei affiliation.

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Pete Zaitcev affiliation
Yann Dupont [Mon, 16 Mar 2015 21:11:18 +0000 (21:11 +0000)]
mailmap: Pete Zaitcev affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Alexis Normand affiliation
Yann Dupont [Mon, 16 Mar 2015 00:25:46 +0000 (00:25 +0000)]
mailmap: Alexis Normand affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>