David Zafman
84a5c8494c
vstart.sh: Fix usage
...
Signed-off-by: David Zafman <dzafman@redhat.com>
2014-10-27 08:35:37 -07:00
Loic Dachary
1f566023ed
Merge pull request #2753 from dachary/wip-mailmap
...
mailmap updates
2014-10-25 16:44:31 -07:00
Sage Weil
06a73c3916
doc/release-notes: v0.87 giant (draft)
...
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 15:22:29 -07:00
Sage Weil
fd2943a00b
Merge pull request #2763 from ceph/wip-da-SCA-20141010
...
Some fixes from SCA runs
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-24 14:53:53 -07:00
Danny Al-Gaaf
ecbbf87d3b
Paxos.cc: use reinterpret_cast instead of c-style cast
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-10-24 23:36:02 +02:00
Danny Al-Gaaf
784f6d521d
fuse_ll.cc: use reinterpret_cast instead of c-style cast
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-10-24 23:36:02 +02:00
Danny Al-Gaaf
3994cca981
librados.cc: use static_cast instead of c-style cast
...
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-10-24 23:35:45 +02:00
Sage Weil
ccb2b6f296
Merge pull request #2789 from ceph/wip-rgw-explicit-reason
...
rgw: send http status reason explicitly in fastcgi
2014-10-24 11:35:06 -07:00
Sage Weil
191c45be4d
Merge remote-tracking branch 'gh/giant'
2014-10-24 11:19:39 -07:00
Sage Weil
719dc171c6
Revert "Enforce cache size on read requests"
...
This reverts commit 4fc9fffc49
.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:19:35 -07:00
Sage Weil
71d32027c7
Revert "osdc: Fix ObjectCounter::_readx perf counters"
...
This reverts commit 830373ef01
.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:19:21 -07:00
Sage Weil
c2cebe5b6d
Revert "osdc: Fix compiler warning"
...
This reverts commit cb290a117a
.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:19:15 -07:00
Sage Weil
a1f23b7a95
Revert "rbd: ObjectCacher reads can hang when reading sparse files"
...
This reverts commit cdb7675a21
.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:16:36 -07:00
Sage Weil
b808cdfaa8
Revert "Fix read performance regression in ObjectCacher"
...
This reverts commit 65be257e92
.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:16:25 -07:00
Federico Gimenez
c4b2abdd41
.gitmodules: ignoring changes in rocksdb submodule
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
(cherry picked from commit 60eaeca4dd
)
2014-10-24 11:14:03 -07:00
Josh Durgin
7272bb882c
Merge pull request #2797 from ceph/wip-rbd-revert
...
rbd/objectcacher: revert recent changes for giant
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-10-24 11:12:29 -07:00
Sage Weil
082416fcca
Revert "Enforce cache size on read requests"
...
This reverts commit 4fc9fffc49
.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:06:16 -07:00
Sage Weil
544b9a82d9
Revert "rbd: ObjectCacher reads can hang when reading sparse files"
...
This reverts commit cdb7675a21
.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:06:08 -07:00
Sage Weil
3b1eafcabb
Revert "Fix read performance regression in ObjectCacher"
...
This reverts commit 65be257e92
.
Too late for giant.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 11:05:53 -07:00
Sage Weil
3ef6fd1d0f
Merge pull request #2768 from ceph/wip-msgr
...
msgr: merge AsyncMessenger
Lightly reviewed. Won't impact build or runtime unless explicitly enabled with ms_type = async (or random).
2014-10-24 10:58:27 -07:00
David Zafman
7d62170efa
Merge pull request #2795 from ceph/wip-9873
...
objecter: fix tick_event shutdown race (9873)
Reviewed-by: David Zafman <dzafman@redhat.com>
2014-10-24 10:49:32 -07:00
Sage Weil
6a1392ee18
Merge pull request #2793 from dachary/wip-dead-code-lrc
...
erasure-code: remove LRC dead code
2014-10-24 10:40:58 -07:00
Sage Weil
f76f83ce3f
osdc/Objecter: fix tick_event handling in shutdown vs tick race
...
If we fail to cancel the tick_event, we rely on tick() itself to clear
tick_event. I'm not quite sure how we got this wrong in the previous
commit, but this boils down to two cases:
1) shutdown() successfully cancels the event and clears tick_event. tick()
never runs. tick_event == NULL when we finish.
2) shutdown() fails to cancel the event because it has already started. In
this case tick itself is blocking (or about to block) waiting on the
rlock. When it does run it will clear tick_event itself, then see
initiazed == 0 and exit without rescheduling.
Fixes : #9873
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 09:32:20 -07:00
Sage Weil
48484356bb
common/Timer: recheck stopping before sleep if we dropped the lock
...
If we have safe_callbacks==false, the stopping flag may have changed while
we were doing our callback. Recheck it and exit to avoid a deadlock on
shutdown.
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-24 09:20:41 -07:00
Loic Dachary
8d51142543
erasure-code: remove LRC dead code
...
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-10-24 08:09:39 -07:00
Sage Weil
dd071904d8
Merge pull request #2790 from fgimenez/git-ignore-src-rocksdb
...
.gitmodules: ignoring changes in rocksdb submodule
2014-10-24 08:01:16 -07:00
Sage Weil
3c740e6cc5
Merge pull request #2791 from majianpeng/fix1
...
ECTransaction: Remove unused typedef.
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-24 06:58:18 -07:00
Jianpeng Ma
9d09e37551
ECTransaction: Remove unused typedef.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-10-24 14:46:52 +08:00
Federico Gimenez
60eaeca4dd
.gitmodules: ignoring changes in rocksdb submodule
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2014-10-24 08:46:50 +02:00
Sage Weil
6d8a5766ef
Merge pull request #2783 from xanpeng/patch-1
...
Remove unnecessary expressions about conf_journal_sz
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-23 17:59:56 -07:00
Sage Weil
9d1b585fdb
Merge pull request #2787 from ceph/fix-fstat-mode
...
java: fill in stat structure correctly
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-23 17:57:02 -07:00
Sage Weil
4e7b8412e5
Merge pull request #2784 from xinxinsh/master
...
check rocksdb library when '--with-librocksdb' option is enabled
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-23 17:54:56 -07:00
Yehuda Sadeh
a9dd4af401
rgw: send http status reason explicitly in fastcgi
...
There are issues in certain versions of apache 2.4, where the reason is
not sent back. Instead, just provide the reason explicitly.
Backport: firefly, giant
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2014-10-23 17:41:43 -07:00
Sage Weil
bf4d72a960
Merge remote-tracking branch 'gh/giant'
2014-10-23 16:44:45 -07:00
Noah Watkins
44a8d59b10
java: fill in stat structure correctly
...
Added stat filling helper function but only stat and lstat were updated.
This patch makes fstat use it. Crucially the fstat wasn't updating the
mode flags.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2014-10-23 13:58:23 -07:00
Sage Weil
8a9b953b7c
Merge pull request #2785 from athanatos/wip-9821
...
PG:: reset_interval_flush and in set_last_peering_reset
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-23 13:45:26 -07:00
Dan Mick
9a12467a9c
Merge pull request #2733 from dachary/wip-9372-injectargs
...
cli: do not parse injectargs arguments twice
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2014-10-23 12:32:37 -07:00
Loic Dachary
860a3ac19e
Merge pull request #2759 from dachary/wip-9836-test-mon-id
...
tests: mon id is incorrectly skipped
2014-10-23 11:29:26 -07:00
Samuel Just
f2178d6ac4
Merge pull request #2766 from dachary/wip-9408-buffer-alignment-giant
...
erasure-code: buffer alignment (giant)
Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-10-23 09:52:00 -07:00
Loic Dachary
50a7b3de58
Merge pull request #2781 from zhouyuan/lrc_layer_plugin_doc
...
EC: document the LRC per layer plugin configuration
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-10-23 08:26:40 -07:00
xan
8ae942a9d3
Remove unnecessary expressions about conf_journal_sz
...
Signed-off-by: Xan Peng xanpeng@gmail.com
2014-10-23 19:05:32 +08:00
Yuan Zhou
024efeb6d4
EC: document the LRC per layer plugin configuration
...
LRC now uses Jerasure as the default EC backend. But it is actually
possible to switch to other backend like Isa using the low level
configuration. This commits Adds documents on how to specify the EC
backend in each LRC layer:
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
2014-10-23 14:32:59 +08:00
xinxin shu
a460c3b85b
check rocksdb library when '--with-librocksdb' option is enabled
...
Signed-off-by: xinxin shu <xinxin.shu@intel.com>
2014-10-23 13:20:58 +08:00
Loic Dachary
5ca69d665b
Merge pull request #2767 from derricks/more_verbose_error_output
...
Make better error reporting for client's call to rados.Rados
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-10-22 17:22:12 -07:00
Greg Farnum
95a0ee1d99
qa: use sudo when rsyncing /usr so we can read everything
...
Signed-off-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit fa07c04231
)
2014-10-22 17:14:32 -07:00
Greg Farnum
fa07c04231
qa: use sudo when rsyncing /usr so we can read everything
...
Signed-off-by: Greg Farnum <greg@inktank.com>
2014-10-22 17:11:32 -07:00
Sage Weil
42bcabfe54
Merge pull request #2777 from ceph/wip-9859
...
mon: Monitor: MMonGetMap doesn't require caps
Reviewed-by: Sage Weil <sage@redhat.com>
2014-10-22 11:36:07 -07:00
Joao Eduardo Luis
227ecd8b03
mon: Monitor: MMonGetMap doesn't require caps
...
We are dropping the requirement for MON_CAP_R for MMonGetMap.
Reason is simple enough: clients may need to contact the monitors and
obtain the latest monmap before authenticating. This happens, for
instance, when a client calls MonClient::get_monmap_privately(). The
osd uses this function during mkfs, prior to initializing a keyring or
even so much as existing.
Fixes : #9859
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-10-22 19:33:55 +01:00
Josh Durgin
317b83dddd
Merge pull request #2770 from ceph/wip-9857
...
rbd: Correct readahead divide by zero exception
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-10-21 16:53:27 -07:00
Derrick Schneider
e81d887813
Make better error reporting for client's call to rados.Rados
...
Signed-off-by: Derrick Schneider derrick.schneider@gmail.com
2014-10-21 13:44:24 -07:00