Commit Graph

24338 Commits

Author SHA1 Message Date
Samuel Just
d6724525e1 crush-map.rst: fix chooseleaf syntax in ssd example
Fixes: 4304
Backport: bobtail
Reviewed-by: Greg Farnum <greg@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-28 15:50:48 -08:00
Sage Weil
6a9cda7ec4 Merge pull request #84 from dalgaaf/wip-da-sca-style
Some more smaller fixes

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-28 14:59:19 -08:00
Sage Weil
ffc0ff68e0 init-ceph: kick off ceph-create-keys when starting mons
We don't have a particularly tidy way to kick off ceph-create-keys from
sysvinit.  So, do something simple, ugly, and functional: if we are
starting a mon, and it looks like a 'new' type that is in /var/lib/ceph,
then start ceph-create-keys too.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-02-28 13:45:04 -08:00
Sage Weil
1e0b2d8952 init-ceph: fix default admin socket path used for status
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-28 13:44:52 -08:00
Sage Weil
0cbe406f93 osd: show retry attempt in MOSDOp operator<<
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-28 13:33:40 -08:00
Sage Weil
c47c02dd87 msg/Pipe: allow tuning of TCP receive buffer size
Performance tests on high-end machines have indicated the Linux autotuning
of the receive buffer sizes can cause throughput collapse.  See bug
#2100, and this email discussion:

   http://marc.info/?l=ceph-devel&m=133009796706284&w=2

Initially default to 0, which leaves us with the default.  We may adjust
the default in the future.

Tested-by: Jim Schutt <jaschut@sandia.gov>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-02-28 13:01:27 -08:00
Sage Weil
e10c1d1453 msg/Pipe: move setting of socket options into a common method
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-02-28 13:00:19 -08:00
Danny Al-Gaaf
6cba92450f librbd/internal.cc: remove unused variable total_write
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 19:45:29 +01:00
Danny Al-Gaaf
c12d91e9e2 librbd/internal.cc: reduce scope of 'int r'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 19:41:37 +01:00
Danny Al-Gaaf
bed61fcacb librados/librados.cc: don't check unsigned 'len' against less than zero
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 19:34:47 +01:00
Danny Al-Gaaf
a2b14cf64e librados/librados.cc: reduce scope of 'ret' in rados_objects_list_next()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 19:33:03 +01:00
Danny Al-Gaaf
f441d38c99 librados/librados.cc: use static_cast instead of C-Style cast
Use static_cast<T>() instead of C-Style cast.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 19:30:19 +01:00
Danny Al-Gaaf
56902d72e7 librados/RadosClient.cc: use static_cast instead of C-Style cast
Use static_cast<T>() instead of C-Style cast. Add some missing
includes to make the static_cast work.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 19:24:27 +01:00
Sage Weil
43e9edd0ce Merge pull request #82 from dalgaaf/wip-da-spec
ceph.spec.in: add new Requires from ceph-disk-prepare

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-28 09:29:04 -08:00
Sage Weil
30a0852e43 Merge pull request #83 from dalgaaf/wip-da-realloc
crush/builder.c: fix realloc handling

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-28 09:28:39 -08:00
Danny Al-Gaaf
2f66b493b2 crush/builder.c: fix realloc handling
Fix handling of realloc. If realloc() fails it returns NULL, assigning
the return value of realloc() directly to the pointer without checking
for the result will lead to a memory leak in error case.

Use a temporary pointer to hold the result of realloc(). In error case
return -ENOMEM, otherwise assign it to the pointer we want to realloc.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 18:07:28 +01:00
Danny Al-Gaaf
9b87690ffd crush/builder.c: fix sizeof handling of bucket->h.items
Fix sizeof handling for realloc/malloc of bucket->h.items. items are
of type __s32 and not __u32 (sizeof gives the same size, but fix it
to represent the correct type).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 17:13:24 +01:00
Danny Al-Gaaf
56777b0863 cls_rbd.cc: remove another unused variable
Remove 'new_snaps' since it only used for a sizeof() call,
get the size directly from the data type of new_snaps instead.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 16:12:20 +01:00
Danny Al-Gaaf
9f98b80f2e cls_rbd.cc: remove unused variable
Remove unused variable 'len', left over from commit
0b0009cfe8.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 15:56:22 +01:00
Danny Al-Gaaf
d75cf4661d CInode.h: use static_cast instead of C-Style cast
Use static_cast<const T>() instead of C-Style cast. Change CInode* to
const, since it never changed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 14:58:38 +01:00
Danny Al-Gaaf
4f1cd469fc CDentry.h: use static_cast instead of C-Style cast
Use static_cast<T>() instead of C-Style cast.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 14:45:03 +01:00
Danny Al-Gaaf
5c3f5c5b69 ceph.spec.in: add new Requires from ceph-disk-prepare
Added new Requires from ceph-disk-prepare: cryptsetup, gptfdisk,
parted and util-linux.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 14:16:26 +01:00
Gary Lowell
caa0af2519 Merge branch 'wip-4222'
Fix for Bug 4222.  Add libcephfs-test.jar to the ceph-test package.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-27 21:54:51 -08:00
Sage Weil
5ce080946a fix ceph-object-corpus submodule commit
Broken by 58f4cd53b9

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 21:04:49 -08:00
Dan Mick
58f4cd53b9 doc: rbd-cloudstack: fix bullet list, missing words, change ! to . 2013-02-27 18:43:46 -08:00
Gary Lowell
b65ca564b6 ceph-test.install: Add libcephfs-test.jar to package.
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-27 18:25:09 -08:00
Sage Weil
f5cfd9af3c Merge branch 'wip-4281'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-27 16:10:35 -08:00
John Wilkins
be3581ecff doc: Consolidated Ubuntu and Ubuntu 12.10 requirements.
fixes: #4288

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-27 16:03:31 -08:00
Joao Eduardo Luis
fac4959d1a mon: PaxosServices: don't ignore get_version(ver,bl) return value
get_version(version_t,bufferlist) can only return one of two values:
  -ENOENT iff the version doesn't exist
  zero iff it was successful

Any other value is incorrect.

Fixes: #4281

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-02-27 23:54:21 +00:00
John Wilkins
ded84b1b4d doc: Added dependencies for ubuntu 12.10.
fixes: #4288

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-27 15:53:51 -08:00
Sage Weil
cfcaceac44 debian: require cryptsetup-bin
This is needed for ceph-disk-prepare's dmcrypt support.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 15:43:57 -08:00
Sage Weil
5e278b852d vstart.sh: give mon. key mon = 'allow *' caps
This is needed for ceph-create-keys to do its thing.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 14:41:22 -08:00
John Wilkins
202ae8e7fd doc: fixed link and form edit.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-27 13:27:51 -08:00
John Wilkins
783555f7a3 doc: Added auth entry to index.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-27 13:27:21 -08:00
John Wilkins
7f7b2e7481 doc: Removed auth entries from general. Part of an auth-specific section now.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-27 13:26:59 -08:00
John Wilkins
712fca64e9 doc: Added comment to enable message. Added link to Auth Config Reference.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-27 13:26:19 -08:00
John Wilkins
c0ed9011dd doc: Added Auth Config Reference as standalone config reference.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-27 13:25:16 -08:00
Sage Weil
f62c5ab8e8 osd: allow log trimming during recovery
We rely on min_last_complete_ondisk being accurate; as long as we have logs
from that point, the current replicas will be able to safely recovery via
their logs.  Bump the target size, just as we do with degraded.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-02-27 11:21:11 -08:00
Sage Weil
c980b76353 ceph-fuse: add ceph options for all current fuse options
This will make it easier to disable these for end users, and for platforms
with old libfuse versions that don't support them.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 11:04:53 -08:00
Sage Weil
bf2cad1af9 Merge pull request #81 from dalgaaf/wip-da-sca-style-1
Fix some smaller style issues

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-27 10:54:01 -08:00
Joao Eduardo Luis
cf0d4f8618 mon: MonitorDBStore: return -ENOENT on get() if key doesn't exist
And adjust version_t get(string,string) so that, in case of -ENOENT, it
returns 0 (when a key doesn't exist, assumes its value is zero), and make
sure it asserts in all other negative return values.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-02-27 18:50:16 +00:00
Danny Al-Gaaf
1a581d0d5a kv_flat_btree_async.cc: remove unused variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 19:36:25 +01:00
Danny Al-Gaaf
b6884e8e8c kv_flat_btree_async.cc: remove some unreachable break statements
Remove unreachable break statements after return calls in a switch.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 19:32:23 +01:00
Danny Al-Gaaf
ebdf67f372 key_value_store/cls_kvs.cc: remove unused variable dupmap
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 19:18:05 +01:00
Danny Al-Gaaf
ca71457bf0 bloom_filter.hpp: check for self assignment
Check for self assignment in operator= to avoid problems with
dynamic memory (cppcheck).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 19:14:03 +01:00
Danny Al-Gaaf
8d35a660e4 crush/builder.c: reduce scope of oldsize in crush_add_rule()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 18:53:28 +01:00
Sage Weil
d9d075e976 debian: let dpkg calculate the shlibs dep for leveldb (if any)
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 09:45:02 -08:00
Danny Al-Gaaf
afa811caa8 CrushCompiler.cc: remove duplicate if/else branches
Fix duplicate content of a if/else branch. Remove the
complete if/else around the content.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 18:27:56 +01:00
Danny Al-Gaaf
9a40ab3afe common/secret.c: reduce the scope of some variables
Reduce the scope of error_buf to the place where it's used.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 18:22:24 +01:00
Danny Al-Gaaf
4b242f9a49 pick_address.cc: pass const string by refrence
Pass 'const string networks' by reference to find_ip_in_subnet_list().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 18:01:07 +01:00