]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Noah Watkins [Sun, 21 Jul 2013 01:41:38 +0000 (18:41 -0700)]
assert: choose function-var name on non-gnu
Selects __PRETTY_FUNCTION__ or __func__. Linux assumes GNU, and chooses
__PRETTY_FUNCTION__ if gcc/g++ versions are favorable.
This also includes a fix in ax_c_var_func.m4:
AC_TRY_COMPILE will wrap the test in main{}, and then GCC will complain
about nested functions. Just use the original main{} body.
diff --git a/m4/ax_c_var_func.m4 b/m4/ax_c_var_func.m4
index
0ad7d2b ..
8b57563 100644
--- a/m4/ax_c_var_func.m4
+++ b/m4/ax_c_var_func.m4
@@ -57,9 +57,9 @@ AC_DEFUN([AX_C_VAR_FUNC],
[AC_REQUIRE([AC_PROG_CC])
AC_CACHE_CHECK(whether $CC recognizes __func__, ac_cv_c_var_func,
AC_TRY_COMPILE(,
-[int main() {
+[
char *s = __func__;
-}],
+],
AC_DEFINE(HAVE_FUNC,,
[Define if the C complier supports __func__]) ac_cv_c_var_func=yes,
ac_cv_c_var_func=no) )
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Sage Weil [Wed, 6 Nov 2013 16:06:11 +0000 (08:06 -0800)]
Merge remote-tracking branch 'gh/wip-doc-radosgw'
Sage Weil [Wed, 6 Nov 2013 16:06:09 +0000 (08:06 -0800)]
Revert "doc: radosgw workaround for OpenStack Horizon bug"
This reverts commit
c3c962eb7d2fb5ceea829924af08f8a1471f7acf .
Sage Weil [Wed, 6 Nov 2013 15:57:23 +0000 (07:57 -0800)]
Merge pull request #799 from ceph/wip-doc-install
Wip doc install
Reviewed-by: Neil Levine <neil.levine@inktank.com>
Sage Weil [Wed, 6 Nov 2013 15:51:02 +0000 (07:51 -0800)]
Merge pull request #821 from ceph/port/missing-headers
add missing headers
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Wed, 6 Nov 2013 15:50:20 +0000 (07:50 -0800)]
Merge pull request #822 from ceph/port/rgw
portability patches in rgw
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Wed, 6 Nov 2013 15:45:17 +0000 (07:45 -0800)]
Merge pull request #825 from ceph/port/utime
utime: use to_timespec for conversion
Reviewed-by: Sage Weil <sage@inktank.com>
Noah Watkins [Sun, 4 Aug 2013 19:09:19 +0000 (12:09 -0700)]
rgw: add compat file for name service macros
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Sun, 4 Aug 2013 19:11:01 +0000 (12:11 -0700)]
rgw: avoid sighandler_t in favor of sig_t
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Tue, 29 Oct 2013 18:50:24 +0000 (11:50 -0700)]
crush: add mising header for count
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Tue, 29 Oct 2013 18:50:10 +0000 (11:50 -0700)]
auth: add missing header for list
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Mon, 4 Nov 2013 21:12:41 +0000 (13:12 -0800)]
mon: add missing header for std::find
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Mon, 4 Nov 2013 20:42:57 +0000 (12:42 -0800)]
auth: add missing header file for std::replace
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Yehuda Sadeh [Tue, 5 Nov 2013 20:25:20 +0000 (12:25 -0800)]
Merge pull request #811 from dmsimard/wip_6710
Be more verbose in radosgw init script issues, return the right exit codes
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Noah Watkins [Sun, 21 Jul 2013 01:41:39 +0000 (18:41 -0700)]
utime: use to_timespec for conversion
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
David Moreau Simard [Tue, 5 Nov 2013 17:02:47 +0000 (12:02 -0500)]
Add a verbose argument and some verbosity
This allows a user to use "-v|--verbose" to get some insight as to
what could be preventing radosgw from starting properly.
Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
David Moreau Simard [Tue, 5 Nov 2013 16:40:31 +0000 (11:40 -0500)]
Verify that radosgw started, return appropriate exit code
Changed "/etc/init.d/radosgw status" into a function that now
returns the appropriate exit code.
We now also verify that radosgw actually started properly.
Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
David Moreau Simard [Tue, 5 Nov 2013 16:32:58 +0000 (11:32 -0500)]
We should exit 1 if radosgw is not executable
An exit 0 means everything went okay - we should exit 1 if there is a problem in
starting radosgw.
Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
Sage Weil [Tue, 5 Nov 2013 13:31:57 +0000 (05:31 -0800)]
Merge pull request #816 from ceph/wip-fadvise
wbthrottle: use posix_fadvise if available
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 5 Nov 2013 13:29:54 +0000 (05:29 -0800)]
Merge pull request #815 from ceph/wip-static-cast
assert: use feature test for static_cast
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 5 Nov 2013 13:27:40 +0000 (05:27 -0800)]
Merge pull request #813 from ceph/wip-blkdev
support blkdev size query on osx/freebsd
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 5 Nov 2013 02:37:59 +0000 (18:37 -0800)]
Merge pull request #803 from ceph/wip-6698
upstart: fix ceph-crush-location default
Reviewed-by: Sage Weil <sage@inktank.com>
John Wilkins [Mon, 4 Nov 2013 23:11:49 +0000 (15:11 -0800)]
pdatedoc: Added index link to new install doc. Requires merge of wip-doc-install to work.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Mon, 4 Nov 2013 23:11:05 +0000 (15:11 -0800)]
doc: Deleted old manual install doc.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Mon, 4 Nov 2013 22:57:41 +0000 (14:57 -0800)]
doc: Mentioned that install procedure is for manual deployments, not ceph-deploy or others.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Mon, 4 Nov 2013 22:57:07 +0000 (14:57 -0800)]
doc: Changed text for ceph-extras. Made it required. Mentioned newer versions.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Noah Watkins [Sun, 21 Jul 2013 01:41:38 +0000 (18:41 -0700)]
assert: use feature test for static_cast
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Sun, 21 Jul 2013 01:41:39 +0000 (18:41 -0700)]
wbthrottle: use posix_fadvise if available
Only adding information about data usage. This won't effect correctness.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
John Wilkins [Mon, 4 Nov 2013 20:50:30 +0000 (12:50 -0800)]
doc: Added DNS and SSL dialog.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Noah Watkins [Mon, 4 Nov 2013 16:28:23 +0000 (08:28 -0800)]
test: test helper for get_block_device_size
This is the start of a potential unit test for get_block_device_size. An
actual unit test will probably need to be run as root, and either find a
device, have one specified, or create one (e.g. ramdisk) in a platform
agnostic way. In the mean time, this tool can be run by hand, or called
for a bash script.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Sun, 21 Jul 2013 01:41:39 +0000 (18:41 -0700)]
blkdev: support blkdev size query on osx
Support OSX, add checks for platform specific headers.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
John Wilkins [Mon, 4 Nov 2013 17:54:58 +0000 (09:54 -0800)]
doc: Implemented changes suggested from feedback.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Sage Weil [Mon, 4 Nov 2013 15:58:49 +0000 (07:58 -0800)]
Merge pull request #812 from ceph/revert-struct-init
Revert "fix -Wgnu-designator warnings"
Noah Watkins [Mon, 4 Nov 2013 14:18:45 +0000 (06:18 -0800)]
Revert "fix -Wgnu-designator warnings"
Struct initialization using dot notation as in C99, but that happens to
not be valid C++, although apparently in C++11 it is valid. We'll need a
way to keep clang from throwing warnings at this initialization style,
either using some macros to detect the comiler environment, or perhaps
moving struct initialization to a C file rather than C++.
This reverts commit
6efc2b54d5ce85fcb4b66237b051bcbb5072e6a3 .
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Xing Lin [Sun, 3 Nov 2013 06:05:58 +0000 (00:05 -0600)]
test/libcephfs: free cmount after tests finishes
unmount and release cmount at the end of tests
Signed-off-by: Xing Lin <xinglin@cs.utah.edu>
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 3 Nov 2013 05:17:46 +0000 (22:17 -0700)]
Merge pull request #790 from ceph/wip-warnings
ease clang's anxieties
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Sun, 3 Nov 2013 05:16:18 +0000 (22:16 -0700)]
Merge pull request #793 from ceph/wip-pipe
pipe: use pipe2 feature test; check fcntl retval
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Fri, 1 Nov 2013 23:45:01 +0000 (16:45 -0700)]
upstart: fix ceph-crush-location default
Behave if it is not specified on ceph.conf. (init-ceph also falls back
to the default.)
Fixes: #6698
Signed-off-by: Sage Weil <sage@inktank.com>
Loic Dachary [Tue, 29 Oct 2013 15:13:56 +0000 (16:13 +0100)]
doc: radosgw workaround for OpenStack Horizon bug
Signed-off-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Loic Dachary [Tue, 29 Oct 2013 14:36:31 +0000 (15:36 +0100)]
doc: fix typo in openstack radosgw integration
s/type-object store/type object-store/
Signed-off-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Sage Weil [Thu, 31 Oct 2013 16:49:09 +0000 (09:49 -0700)]
mon/OSDMonitor: refix warning
mon/OSDMonitor.cc: In member function 'int OSDMonitor::_prepare_rename_pool(int64_t, std::string)':
mon/OSDMonitor.cc:4370:55: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
Two fixes for this crossed paths in
0c186096bb9534165394046fd8dd914e1be44094 and
2181b4c94696432814fea828a7efa54586b324a4
Signed-off-by: Sage Weil <sage@inktank.com>
Noah Watkins [Sun, 21 Jul 2013 01:41:40 +0000 (18:41 -0700)]
pipe: use pipe2 feature test; check fcntl retval
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Wed, 30 Oct 2013 14:51:43 +0000 (07:51 -0700)]
fix -Wmismatched-tags warnings
Example: warning: class 'ObjecterDispatcher' was previously declared as
a struct [-Wmismatched-tags]
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Wed, 30 Oct 2013 14:50:03 +0000 (07:50 -0700)]
fix -Wgnu-designator warnings
Example: warning: use of GNU old-style field designator extension
[-Wgnu-designator]
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Wed, 30 Oct 2013 18:58:53 +0000 (11:58 -0700)]
OSD: remove unused private var [-Wunused-private-field]
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Wed, 30 Oct 2013 18:58:29 +0000 (11:58 -0700)]
CrushTester: remove unused private var [-Wunused-private-field]
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Noah Watkins [Wed, 30 Oct 2013 18:55:00 +0000 (11:55 -0700)]
auth: remove unused private var [-Wunused-private-field]
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Samuel Just [Fri, 1 Nov 2013 20:39:16 +0000 (13:39 -0700)]
common/buffer.cc: fix rebuild_page_aligned typo
Introduced:
66a9fbe2c7ba59b7cd034c17865adce3432cd2cb
Fixes: #6003
Signed-off-by: Samuel Just <sam.just@inktank.com>
Noah Watkins [Thu, 31 Oct 2013 16:20:51 +0000 (09:20 -0700)]
test: add gcc compile test for installed headers
libcephfs/librados headers should work with gcc.
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Christophe Courtaut [Thu, 31 Oct 2013 16:43:35 +0000 (17:43 +0100)]
libcephfs: Fix compilation for C compiler
Use struct instead of class, even if it warns.
Warnings are lower priority than compilation break.
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
Christophe Courtaut [Thu, 31 Oct 2013 16:07:56 +0000 (17:07 +0100)]
ceph: Fix compilation with GCC compiler
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
Sage Weil [Fri, 1 Nov 2013 23:08:14 +0000 (16:08 -0700)]
Merge branch 'next'
David Moreau Simard [Fri, 1 Nov 2013 20:42:33 +0000 (16:42 -0400)]
Really use the hostname, otherwise ambiguous
"hostname" can return either the hostname or the fqdn depending on
configuration.
This refers to the issue http://tracker.ceph.com/issues/6706
Signed-off-by: David Moreau Simard <dmsimard@iweb.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Thu, 31 Oct 2013 15:12:24 +0000 (08:12 -0700)]
ceph-object-corpus: revert accidental revert
from
5df3024d7847950672169069b9dc8c8dcb876019
Signed-off-by: Sage Weil <sage@inktank.com>
Wido den Hollander [Thu, 31 Oct 2013 11:42:27 +0000 (12:42 +0100)]
docs: Fix a typo in RGW documentation
Sage Weil [Fri, 1 Nov 2013 23:07:21 +0000 (16:07 -0700)]
Merge pull request #792 from ceph/wip-doc-openstack
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Sage Weil [Fri, 1 Nov 2013 23:06:52 +0000 (16:06 -0700)]
Merge pull request #766 from kri5/wip-5374
Rebase of Wip 5374 against master
Reviewed-by: Yehuda Sadeh <yehdua@inktank.com>
Ray Lv [Wed, 30 Oct 2013 03:40:54 +0000 (11:40 +0800)]
Wrap hex_to_num table into class HexTable
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Ray Lv [Tue, 29 Oct 2013 11:34:51 +0000 (19:34 +0800)]
[rgw] Set initialized to true after populating table in hex_to_num()
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Samuel Just [Thu, 31 Oct 2013 20:19:32 +0000 (13:19 -0700)]
sharedptr_registry.hpp: removed ptrs need to not blast contents
See the included unit test update. Consider:
1) x = lookup_or_create(1, 1)
2) remove(1)
3) y = lookup_or_create(1, 2)
4) x.reset()
5) z = lookup(1)
The bug is that z will be null since x.reset() caused the
cleanup callback to remove y's key value from contents.
To fix this, contents also records the pointer value for
the weak_ptr. The removal callback only removes the
key from contents if it matches the ptr in contents.
This should work since the pointer passed to the removal
callback must be unique up to that point since it has
not yet been deleted.
This allowed a pg removal -> pg recreation -> pg removal
sequence to cause the second pg removal entry to be
erroneously cleared by the first pg removal's destructor
as it finally made its way through the removal queue.
Fixes: #5951
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Noah Watkins [Wed, 30 Oct 2013 23:34:29 +0000 (16:34 -0700)]
prio-q: initialize cur iterator
For new SubQueues `cur` is not intialized, so front/pop_front will freak
out. I honestly I have no idea how this hasn't been seen, but it was
being triggered frequently on OSX.
Fixes: #6686
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
Samuel Just [Wed, 30 Oct 2013 23:54:39 +0000 (16:54 -0700)]
PGLog: remove obsolete assert in merge_log
This assert assumes that if olog.head != log.head, olog contains
a log entry at log.head, which may not be true since pg splitting
might have left the log with arbitrary holes.
Related:
0c2769d3321bff6e85ec57c85a08ee0b8e751bcb
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Samuel Just [Wed, 30 Oct 2013 23:12:19 +0000 (16:12 -0700)]
test/osd/RadosModel.h: select and reserve roll_back_to atomically
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Samuel Just [Tue, 29 Oct 2013 21:53:53 +0000 (14:53 -0700)]
test/rados/list.cc: we might get some objects more than once
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Wed, 30 Oct 2013 20:20:46 +0000 (13:20 -0700)]
os/chain_listxattr: fix leak fix
e22347df3854a5c5ebc6631c62d70447d67d722d added a bad goto; just free
explicitly instead.
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
John Wilkins [Thu, 31 Oct 2013 23:46:58 +0000 (16:46 -0700)]
doc: Updated rewrite rule.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 23:46:34 +0000 (16:46 -0700)]
doc: Incorporated feedback.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 23:46:02 +0000 (16:46 -0700)]
doc: Created new zone sync image.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 23:45:41 +0000 (16:45 -0700)]
doc: Modified image.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 21:47:49 +0000 (14:47 -0700)]
doc: Removed references to OpenSuse and SLES.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 21:47:25 +0000 (14:47 -0700)]
doc: Retitled document. Made example generic. Fixed link.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 21:46:47 +0000 (14:46 -0700)]
doc: Retitled document.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 00:53:37 +0000 (17:53 -0700)]
doc: Removed the Folsom reference.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 00:44:24 +0000 (17:44 -0700)]
doc: Restored show_image_direct and added a link to older versions.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Thu, 31 Oct 2013 00:21:14 +0000 (17:21 -0700)]
doc: Removed nova-volume, early Ceph references and Folsom references.
fixes: 5006
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:26:01 +0000 (15:26 -0700)]
doc: Removed install yum priorities. Duplicated where relevant.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:23:45 +0000 (15:23 -0700)]
doc: Added quick ceph object store with links to manual install and config.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:23:07 +0000 (15:23 -0700)]
doc: Restored Object Store Quick Start entry for parallelism.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:22:31 +0000 (15:22 -0700)]
doc: Changed install to ceph-deploy install.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:21:59 +0000 (15:21 -0700)]
doc: Added note for ARM support in quantal and raring.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:21:08 +0000 (15:21 -0700)]
Removed add repositories, yum priorities, and consolidated index.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:20:08 +0000 (15:20 -0700)]
doc: Added consolidated install of VM/Cloud software.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:19:45 +0000 (15:19 -0700)]
doc: Removed install qemu. Consolidated to install-vm-cloud.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:19:22 +0000 (15:19 -0700)]
doc: Removed install libvirt. Consolidated to install-vm-cloud.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:18:57 +0000 (15:18 -0700)]
doc: Consolidated install object gateway and install Apache/FastCGI
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:17:49 +0000 (15:17 -0700)]
doc: Removed. Consolidated into install-ceph-gateway.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:17:12 +0000 (15:17 -0700)]
doc: Consolidated Add Repositories.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
John Wilkins [Wed, 30 Oct 2013 22:16:47 +0000 (15:16 -0700)]
doc: Removed doc. Consolidated with Get Packages.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
Sage Weil [Wed, 30 Oct 2013 21:19:45 +0000 (14:19 -0700)]
doc/release-notes: formatting
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Wed, 30 Oct 2013 21:08:08 +0000 (14:08 -0700)]
doc/release-notes: fix formatting
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 29 Oct 2013 23:10:16 +0000 (16:10 -0700)]
doc/release-notes: fix indentation
ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/release-notes.rst:48: Unexpected indentation.
Signed-off-by: Sage Weil <sage@inktank.com>
Gary Lowell [Wed, 30 Oct 2013 18:41:10 +0000 (18:41 +0000)]
Merge branch 'next'
Gary Lowell [Wed, 30 Oct 2013 18:34:42 +0000 (18:34 +0000)]
Merge branch 'next' of jenkins:ceph/ceph into next
Li Wang [Wed, 30 Oct 2013 13:32:34 +0000 (21:32 +0800)]
ceph: Release resource before return in BackedObject::download()
Close file before return
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Li Wang [Wed, 30 Oct 2013 08:39:09 +0000 (16:39 +0800)]
ceph: Fix memory leak in chain_listxattr
Free allocated memory before return
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Li Wang [Wed, 30 Oct 2013 08:18:10 +0000 (16:18 +0800)]
Fix memory leak in Backtrace::print()
Free already allocated memory if short of memory
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Gary Lowell [Wed, 30 Oct 2013 00:45:10 +0000 (00:45 +0000)]
v0.72-rc1
João Eduardo Luís [Tue, 29 Oct 2013 23:34:14 +0000 (16:34 -0700)]
Merge pull request #788 from ceph/wip-6605
mon: OSDMonitor: only allow an osd to boot iff it has the fsid on record
Fixes: #6605
Reviewed-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 29 Oct 2013 22:06:13 +0000 (15:06 -0700)]
Merge remote-tracking branch 'gh/wip-crush-hook'
Reviewed-by: Loic Dachary <loic@dachary.org>
Sage Weil [Tue, 29 Oct 2013 18:08:58 +0000 (11:08 -0700)]
upstart, sysvinit: use ceph-crush-location hook
Instead of hard-coding a check in ceph.conf and some reasonable
defaults, defer this work to ceph-crush-location, and allow users to
specify their own hook with alternative logic.
This can be helpful in a nubmer of cases, like:
- rack (or other) information included in hostname and easily parsed
out by a hook
- multiple types of devices in each host, resulting in 'parallel'
crush trees (e.g., one for hdd, one for ssd)
Signed-off-by: Sage Weil <sage@inktank.com>