]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years agoosd/OSDMap: new_up_internal -> new_up_cluster
Sage Weil [Wed, 22 May 2013 23:03:36 +0000 (16:03 -0700)]
osd/OSDMap: new_up_internal -> new_up_cluster

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoceph: remove cli test
Sage Weil [Wed, 22 May 2013 16:39:11 +0000 (09:39 -0700)]
ceph: remove cli test

This is about to be removed by wip-ceph-cli anyway.  And it broke in
commit 132d5bf7f9af7de9e2028e20c95ba91637da5875.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #297 from dalgaaf/wip-da-CID-727982
Sage Weil [Wed, 22 May 2013 15:54:56 +0000 (08:54 -0700)]
Merge pull request #297 from dalgaaf/wip-da-CID-727982

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #310 from dalgaaf/wip-da-CID-fixes-4
Sage Weil [Wed, 22 May 2013 15:37:09 +0000 (08:37 -0700)]
Merge pull request #310 from dalgaaf/wip-da-CID-fixes-4

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomds/Migrator.cc: fix possible dereference NULL return value 310/head
Danny Al-Gaaf [Wed, 22 May 2013 15:28:06 +0000 (17:28 +0200)]
mds/Migrator.cc: fix possible dereference NULL return value

CID 716997 (#1 of 1): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "in" when
  calling "MDSCacheObject::is_auth() const".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Migrator.cc: fix possible dereference NULL return value
Danny Al-Gaaf [Wed, 22 May 2013 15:25:16 +0000 (17:25 +0200)]
mds/Migrator.cc: fix possible dereference NULL return value

ID 716998 (#1 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "in" when
  calling "operator <<(std::ostream &, CInode &)".

CID 716998 (#2 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "in" when
  calling "MDCache::add_replica_dir(ceph::buffer::list::iterator &,
  CInode *, int, std::list<Context *, std::allocator<Context *> > &)".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Migrator.cc: delete some empty lines at EOF
Danny Al-Gaaf [Wed, 22 May 2013 15:23:40 +0000 (17:23 +0200)]
mds/Migrator.cc: delete some empty lines at EOF

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Migrator.cc: fix possible dereference NULL return value
Danny Al-Gaaf [Wed, 22 May 2013 15:21:59 +0000 (17:21 +0200)]
mds/Migrator.cc: fix possible dereference NULL return value

CID 716999 (#1 of 1): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "in" when
  calling "CInode::put_stickydirs()".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMerge pull request #309 from dalgaaf/wip-da-CID-fixes-3-v2
Sage Weil [Wed, 22 May 2013 15:20:49 +0000 (08:20 -0700)]
Merge pull request #309 from dalgaaf/wip-da-CID-fixes-3-v2

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomds/Migrator.cc: fix dereference NULL return value
Danny Al-Gaaf [Wed, 22 May 2013 15:17:01 +0000 (17:17 +0200)]
mds/Migrator.cc: fix dereference NULL return value

CID 717000 (#1 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "dir" when
  calling "operator <<(std::ostream &, CDir &)".

CID 717000 (#2 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "dir" when
  calling "Migrator::import_reverse_unfreeze(CDir *)".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Migrator.cc: fix possible NULL pointer dereference
Danny Al-Gaaf [Wed, 22 May 2013 15:06:40 +0000 (17:06 +0200)]
mds/Migrator.cc: fix possible NULL pointer dereference

Move dout() calls behind the related asserts to prevent possible NULL
pointer dereference.

CID 717001 (#1 of 1): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "diri" when calling
  "operator <<(std::ostream &, CInode

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Server.cc: fix possible NULL pointer dereference 309/head
Danny Al-Gaaf [Fri, 17 May 2013 12:38:24 +0000 (14:38 +0200)]
mds/Server.cc: fix possible NULL pointer dereference

Add asserts to solve these CID issues:

CID 717002 (#1 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "dir"
  when calling "CDir::lookup(std::string const &, snapid_t)".
CID 717002 (#2 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "dir"
  when calling "CDir::lookup(std::string const &, snapid_t)".

CID 717003 (#1 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "dn" when
  calling "operator <<(std::ostream &, CDentry &)"
CID 717003 (#2 of 2): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "straydn"
  when calling "CDentry::push_projected_linkage()".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agosrc/rbd.cc: silence CID COPY_PASTE_ERROR warning
Danny Al-Gaaf [Fri, 17 May 2013 12:15:23 +0000 (14:15 +0200)]
src/rbd.cc: silence CID COPY_PASTE_ERROR warning

CID 1021212 (#1 of 1): Copy-paste error (COPY_PASTE_ERROR)
  copy_paste_error: "r" in "r = -*__errno_location()" looks like
  a copy-paste error. Should it say "fd" instead?

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDS.cc: fix dereference null return value
Danny Al-Gaaf [Wed, 22 May 2013 13:42:52 +0000 (15:42 +0200)]
mds/MDS.cc: fix dereference null return value

Fix for:

returned_null: Function "SessionMap::get_session(entity_name_t)" returns
  null (checked 12 out of 14 times)

CID 739601 (#1 of 1): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null
  "this->sessionmap.get_session(entity_name_t::CLIENT(client.v))" when
  calling "MDS::send_message_client_counted(Message *, Session *)"

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDCache.cc: fix possible NULL pointer dereference
Danny Al-Gaaf [Wed, 15 May 2013 16:14:06 +0000 (18:14 +0200)]
mds/MDCache.cc: fix possible NULL pointer dereference

Assert if 'cur' is NULL.

CID 966616 (#1 of 1): Dereference null return value (NULL_RETURNS)
  dereference: Dereferencing a pointer that might be null "cur" when
  calling "CInode::is_dir()".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agodoc: update mon cluster rescue process for cuttlefish+
Sage Weil [Tue, 21 May 2013 21:45:29 +0000 (14:45 -0700)]
doc: update mon cluster rescue process for cuttlefish+

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoFix usage for "ceph osd lost"
David Zafman [Tue, 21 May 2013 21:43:41 +0000 (14:43 -0700)]
Fix usage for "ceph osd lost"

Will be superceded, but use this commit to backport

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
12 years agomon: implement --extract-monmap <filename>
Sage Weil [Tue, 21 May 2013 21:36:11 +0000 (14:36 -0700)]
mon: implement --extract-monmap <filename>

This will make for a simpler process for
  http://ceph.com/docs/master/rados/operations/add-or-rm-mons/#removing-monitors-from-an-unhealthy-cluster

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #306 from Elbandi/wip-fuse-ioctl
Sage Weil [Tue, 21 May 2013 21:26:40 +0000 (14:26 -0700)]
Merge pull request #306 from Elbandi/wip-fuse-ioctl

ceph-fuse: add ioctl support

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoceph-monstore-tool: implement getmonmap
Sage Weil [Tue, 21 May 2013 20:27:42 +0000 (13:27 -0700)]
ceph-monstore-tool: implement getmonmap

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoceph-fuse: add ioctl support 306/head
Andras Elso [Tue, 21 May 2013 19:51:55 +0000 (21:51 +0200)]
ceph-fuse: add ioctl support

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agoceph-disk: fix stat errors with new suppress code
Sage Weil [Tue, 21 May 2013 19:52:03 +0000 (12:52 -0700)]
ceph-disk: fix stat errors with new suppress code

Broken by 225fefe5e7c997b365f481b6c4f66312ea28ed61.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agorbd image_read.sh: test different clone object orders
Alex Elder [Tue, 21 May 2013 17:25:53 +0000 (12:25 -0500)]
rbd image_read.sh: test different clone object orders

An rbd clone image can be created with an object order that differs
from that of its parent.  This patch adds testing for that in
qa/workunits/rbd/image_read.sh.  By default, clone images will be
created with an object size twice as big as that of its parent.

For simplicity, when a clone's object order differs from its parent
the order will be either one more than or one less than that of its
parent image, meaning its object size is either double or half of
the size of objects used in the parent.

Signed-off-by: Alex Elder <elder@inktank.com>
12 years agorbd image_read.sh: add clone-of-clone testing
Alex Elder [Tue, 21 May 2013 15:05:03 +0000 (10:05 -0500)]
rbd image_read.sh: add clone-of-clone testing

Add testing to verify that a snapshot of a clone and a clone of
that snapshot both produce the correct results when read.

Signed-off-by: Alex Elder <elder@inktank.com>
12 years agorbd image_read.sh: allocate local file at create time
Alex Elder [Tue, 21 May 2013 15:05:03 +0000 (10:05 -0500)]
rbd image_read.sh: allocate local file at create time

Move the dd command that touches the last byte in a local file
into create_image() where it belongs (out of fill_original()).

Signed-off-by: Alex Elder <elder@inktank.com>
12 years agorbd image_read.sh: a few cleanups
Alex Elder [Tue, 21 May 2013 15:05:03 +0000 (10:05 -0500)]
rbd image_read.sh: a few cleanups

The function boolean_toggle() in qa/workunits/rbd/image_read.sh is
defined but never used.  My intentions were good though.  Fix it and
use it for argument parsing.

Change the minimum supported object order so it matches what the
command line interface enforces.

Assign the initial value of TEST_CLONES from the environment if it's
available.

Change defaults to use format 2 and test clones.

Output details about the parameters of the run even if not being
verbose.

Make the order of assignment of argument variables consistent.

And fix a typo unmap_image().

Signed-off-by: Alex Elder <elder@inktank.com>
12 years agorbd: prevent import of a dir
Sage Weil [Tue, 21 May 2013 19:15:49 +0000 (12:15 -0700)]
rbd: prevent import of a dir

Fixes: #2865
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoceph-monstore-tool: be more verbose when replaying a trace
Sage Weil [Tue, 21 May 2013 18:04:25 +0000 (11:04 -0700)]
ceph-monstore-tool: be more verbose when replaying a trace

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoceph-monstore-tool: compact command
Sage Weil [Tue, 21 May 2013 18:04:09 +0000 (11:04 -0700)]
ceph-monstore-tool: compact command

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoceph-monstore-tool: dump-keys command
Sage Weil [Tue, 21 May 2013 18:03:34 +0000 (11:03 -0700)]
ceph-monstore-tool: dump-keys command

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #303 from ceph/wip-librbd-config-create
Josh Durgin [Tue, 21 May 2013 18:16:53 +0000 (11:16 -0700)]
Merge pull request #303 from ceph/wip-librbd-config-create

Reviewed-by: Sage Weil <sage.weil@inktank.com>
12 years agoMerge branch 'next'
Sage Weil [Tue, 21 May 2013 15:26:57 +0000 (08:26 -0700)]
Merge branch 'next'

Conflicts:
debian/ceph.prerm

12 years agoMerge pull request #304 from javacruft/wip-invoke-rc.d
Sage Weil [Tue, 21 May 2013 15:25:21 +0000 (08:25 -0700)]
Merge pull request #304 from javacruft/wip-invoke-rc.d

Use invoke-rc.d in maintainer scripts

12 years agoos/LevelDBStore: fix compression selection
Sage Weil [Tue, 21 May 2013 15:16:56 +0000 (08:16 -0700)]
os/LevelDBStore: fix compression selection

We were always disabling compression.

Fixes: #5131
Reported-by: Sylvain Munaut <s.munaut@whatever-company.com>
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoUse invoke-rc.d in maintainer scripts 304/head
James Page [Tue, 21 May 2013 08:20:53 +0000 (09:20 +0100)]
Use invoke-rc.d in maintainer scripts

Upstart configurations and sysv init scripts should be started and stopped
using invoke-rc.d in maintainer scripts.

This ensures the correct behaviour across both Debian (sysv) and Ubuntu (upstart)
and in restricted environments such as schroot where start/stop of services from
maintainer scripts is normally disabled.

Signed-off-by: James Page <james.page@ubuntu.com>
12 years agoPG: kill some dead IndexedLog methods
Samuel Just [Mon, 20 May 2013 22:44:23 +0000 (15:44 -0700)]
PG: kill some dead IndexedLog methods

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoOSD: kill old split code, it's been dead for a while
Samuel Just [Mon, 20 May 2013 22:19:35 +0000 (15:19 -0700)]
OSD: kill old split code, it's been dead for a while

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
12 years agoMerge pull request #260 from ceph/wip-suppress
Sage Weil [Mon, 20 May 2013 21:40:22 +0000 (14:40 -0700)]
Merge pull request #260 from ceph/wip-suppress

Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
12 years agodebian: stop sysvinit on ceph.prerm
Sage Weil [Mon, 20 May 2013 20:34:27 +0000 (13:34 -0700)]
debian: stop sysvinit on ceph.prerm

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomds: better error check on sessionmap load
Sage Weil [Mon, 20 May 2013 20:34:05 +0000 (13:34 -0700)]
mds: better error check on sessionmap load

Would have helped with #5104.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: be a bit more verbose about osd mark down events
Sage Weil [Mon, 20 May 2013 19:41:30 +0000 (12:41 -0700)]
mon: be a bit more verbose about osd mark down events

Put these in the cluster log; they are interesting.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMakefile: add -Wformat-security
Sage Weil [Mon, 20 May 2013 16:09:25 +0000 (09:09 -0700)]
Makefile: add -Wformat-security

Clean up the formatting a bit here too.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Mon, 20 May 2013 19:22:29 +0000 (12:22 -0700)]
Merge remote-tracking branch 'gh/next'

12 years agoMerge pull request #301 from javacruft/wip-upstart-tasks
Sage Weil [Mon, 20 May 2013 16:10:04 +0000 (09:10 -0700)]
Merge pull request #301 from javacruft/wip-upstart-tasks

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #300 from javacruft/wip-format-security
Sage Weil [Mon, 20 May 2013 16:07:10 +0000 (09:07 -0700)]
Merge pull request #300 from javacruft/wip-format-security

Fix -Werror=format-security errors

12 years agoceph df: fix si units for 'global' stats
Mike Kelly [Thu, 16 May 2013 16:29:50 +0000 (12:29 -0400)]
ceph df: fix si units for 'global' stats

si_t expects bytes, but it was being given kilobytes.

Signed-off-by: Mike Kelly <pioto@pioto.org>
(cherry picked from commit 0c2b738d8d07994fee4c73dd076ac9364a64bdb2)

12 years agoMerge pull request #302 from pioto/ceph-df-unit-fix
Sage Weil [Mon, 20 May 2013 16:05:25 +0000 (09:05 -0700)]
Merge pull request #302 from pioto/ceph-df-unit-fix

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoceph df: fix si units for 'global' stats 302/head
Mike Kelly [Thu, 16 May 2013 16:29:50 +0000 (12:29 -0400)]
ceph df: fix si units for 'global' stats

si_t expects bytes, but it was being given kilobytes.

Signed-off-by: Mike Kelly <pioto@pioto.org>
12 years agoRemove stop on from upstart tasks 301/head
James Page [Mon, 20 May 2013 09:26:06 +0000 (10:26 +0100)]
Remove stop on from upstart tasks

Upstart tasks don't have to concept of 'stop on' as they
are not long running.

12 years agoFix -Werror=format-security errors 300/head
James Page [Mon, 20 May 2013 09:21:16 +0000 (10:21 +0100)]
Fix -Werror=format-security errors

Fixup a couple of errors when compilng with -Werror=format-security.

12 years agolibcephfs: add ceph_get_pool_name()
Sage Weil [Sat, 18 May 2013 00:06:36 +0000 (17:06 -0700)]
libcephfs: add ceph_get_pool_name()

Convert an int pool id to a pool name.  Useful for making sense of the
output from ceph_get_*_layout()'s poolid output argument.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #253 from Elbandi/wip-getlayout
Sage Weil [Fri, 17 May 2013 23:59:18 +0000 (16:59 -0700)]
Merge pull request #253 from Elbandi/wip-getlayout

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc: Added more glossary-compliant terms and indexing.
John Wilkins [Fri, 17 May 2013 22:59:02 +0000 (15:59 -0700)]
doc: Added more glossary-compliant terms and indexing.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added another instance term to the glossary.
John Wilkins [Fri, 17 May 2013 22:58:25 +0000 (15:58 -0700)]
doc: Added another instance term to the glossary.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Minor improvements to Ceph FS landing page.
John Wilkins [Fri, 17 May 2013 22:56:59 +0000 (15:56 -0700)]
doc: Minor improvements to Ceph FS landing page.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agolibcephfs: get the pool name of a file path 253/head
Andras Elso [Fri, 17 May 2013 19:15:35 +0000 (21:15 +0200)]
libcephfs: get the pool name of a file path

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agolibcephfs: get replication factor of a file handle/path
Andras Elso [Mon, 6 May 2013 23:28:12 +0000 (01:28 +0200)]
libcephfs: get replication factor of a file handle/path

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agolibcephfs: get file handle/path layout info
Andras Elso [Fri, 17 May 2013 19:40:03 +0000 (21:40 +0200)]
libcephfs: get file handle/path layout info

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agolibcephfs: get stripe_unit/stripe_count/object_size/pool_id by file handle/path
Andras Elso [Mon, 6 May 2013 23:24:29 +0000 (01:24 +0200)]
libcephfs: get stripe_unit/stripe_count/object_size/pool_id by file handle/path

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agolibcephfs: fix typos
Andras Elso [Mon, 6 May 2013 23:23:33 +0000 (01:23 +0200)]
libcephfs: fix typos

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agoClient: get describe_layout by file handle/path
Andras Elso [Mon, 6 May 2013 23:20:37 +0000 (01:20 +0200)]
Client: get describe_layout by file handle/path

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agoMerge pull request #295 from ceph/wip-5077
Sage Weil [Fri, 17 May 2013 16:26:25 +0000 (09:26 -0700)]
Merge pull request #295 from ceph/wip-5077

Reviewed-by: Joao Luis <joao.luis@inktank.com>
12 years agomon: add 'compact' command
Sage Weil [Fri, 17 May 2013 16:17:18 +0000 (09:17 -0700)]
mon: add 'compact' command

As in, 'ceph mon tell \* compact'

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>
12 years agoMerge pull request #296 from dalgaaf/wip-da-CID-1021213
Josh Durgin [Fri, 17 May 2013 15:35:10 +0000 (08:35 -0700)]
Merge pull request #296 from dalgaaf/wip-da-CID-1021213

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
12 years agokv_flat_btree_async.cc: release AioCompletion before leave the loop 297/head
Danny Al-Gaaf [Thu, 16 May 2013 17:41:49 +0000 (19:41 +0200)]
kv_flat_btree_async.cc: release AioCompletion before leave the loop

CID 727982 (#1 of 1): Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "aioc" going out of scope leaks the storage
  it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agolibrbd/internal.cc: fix resource leak 296/head
Danny Al-Gaaf [Thu, 16 May 2013 13:56:12 +0000 (15:56 +0200)]
librbd/internal.cc: fix resource leak

Call release() on librados::AioCompletion to free storage before
leave the loop or call new again.

CID 1021213 (#1 of 1): Resource leak (RESOURCE_LEAK)
  leaked_storage: Variable "rados_completion" going out of scope leaks
  the storage it points to.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agodoc: Omitted literal syntax from toc.
John Wilkins [Fri, 17 May 2013 06:10:54 +0000 (23:10 -0700)]
doc: Omitted literal syntax from toc.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added fuse syntax to the fstab doc.
John Wilkins [Fri, 17 May 2013 06:10:32 +0000 (23:10 -0700)]
doc: Added fuse syntax to the fstab doc.

fixes: #3672

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge branch 'next'
Sage Weil [Fri, 17 May 2013 03:39:56 +0000 (20:39 -0700)]
Merge branch 'next'

12 years agosysvinit: fix enumeration of local daemons when specifying type only
Sage Weil [Fri, 17 May 2013 03:37:05 +0000 (20:37 -0700)]
sysvinit: fix enumeration of local daemons when specifying type only

- prepend $local to the $allconf list at the top
- remove $local special case for all case
- fix the type prefix checks to explicitly check for prefixes

Fugly bash, but works!

Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
12 years agoudev: install disk/by-partuuid rules
Sage Weil [Fri, 17 May 2013 01:40:29 +0000 (18:40 -0700)]
udev: install disk/by-partuuid rules

Wheezy's udev (175-7.2) has broken rules for the /dev/disk/by-partuuid/
symlinks that ceph-disk relies on.  Install parallel rules that work.  On
new udev, this is harmless; old older udev, this will make life better.

Fixes: #4865
Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: clear pg delta after some period 295/head
Sage Weil [Fri, 17 May 2013 00:58:48 +0000 (17:58 -0700)]
mon: clear pg delta after some period

If we have not pg_map updates, the delta doesn't update, and can get stuck
with the velocity right before activity stopped.  This is confusing, and
can cause incorrect health warnings about in-progress recovery.

To fix this, zero the delta if there is no activity for
'mon delta reset interval' seconds.

Fixes: #5077
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoos/FileStore: fix replay guard error msgs (again)
Sage Weil [Thu, 16 May 2013 23:06:25 +0000 (16:06 -0700)]
os/FileStore: fix replay guard error msgs (again)

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agotest_filestore_idempotent_sequence: unmount prior to deleting store
Samuel Just [Thu, 16 May 2013 20:00:32 +0000 (13:00 -0700)]
test_filestore_idempotent_sequence: unmount prior to deleting store

FileStoreDiff umounts the stores in its destructor.

Also, DeterministicOpSequence handles deletes its passed
object store.

Fixes: #5076
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
12 years agoRevert "test_filejournal.cc: cleanup memory in destructor"
Samuel Just [Thu, 16 May 2013 19:49:35 +0000 (12:49 -0700)]
Revert "test_filejournal.cc: cleanup memory in destructor"

The finish() method for Contexts calls delete this.

This reverts commit 36028916c4630ea66007760efed8fc6c441e7af5.

Fixes: #5075
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
12 years agolibrbd: make image creation defaults configurable 303/head
Josh Durgin [Thu, 16 May 2013 22:28:40 +0000 (15:28 -0700)]
librbd: make image creation defaults configurable

Programs using older versions of the image creation functions can't
set newer parameters like image format and fancier striping.

Setting these options lets them use all the new functionality without
being patched and recompiled to use e.g. rbd_create3().
This is particularly useful for things like qemu-img, which does not
know how to create format 2 images yet.

Refs: #5067
backport: cuttlefish, bobtail
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoos/FileStore: print error code to log on replay guard failure
Sage Weil [Thu, 16 May 2013 22:28:17 +0000 (15:28 -0700)]
os/FileStore: print error code to log on replay guard failure

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agorbd.py: fix stripe_unit() and stripe_count()
Josh Durgin [Thu, 16 May 2013 22:21:24 +0000 (15:21 -0700)]
rbd.py: fix stripe_unit() and stripe_count()

These matched older versions of the functions, but would segfault
using the current versions.

backport: cuttlefish, bobtail
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agocls_rbd: make sure stripe_unit is not larger than object size
Josh Durgin [Thu, 16 May 2013 22:19:46 +0000 (15:19 -0700)]
cls_rbd: make sure stripe_unit is not larger than object size

Test a few other cases too.

backport: cuttlefish, bobtail
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agodoc: Added index reference.
John Wilkins [Thu, 16 May 2013 20:59:49 +0000 (13:59 -0700)]
doc: Added index reference.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added glossary references and index references.
John Wilkins [Thu, 16 May 2013 20:59:29 +0000 (13:59 -0700)]
doc: Added glossary references and index references.

fixes: #3321

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added cluster map and CRUSH definitions.
John Wilkins [Thu, 16 May 2013 20:57:53 +0000 (13:57 -0700)]
doc: Added cluster map and CRUSH definitions.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixing index references.
John Wilkins [Thu, 16 May 2013 20:57:23 +0000 (13:57 -0700)]
doc: Fixing index references.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added latency comment.
John Wilkins [Thu, 16 May 2013 20:56:06 +0000 (13:56 -0700)]
doc: Added latency comment.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodebian: make radosgw require matching version of librados2
Sage Weil [Thu, 16 May 2013 20:17:45 +0000 (13:17 -0700)]
debian: make radosgw require matching version of librados2

...indirectly via ceph-common.  We get bad behavior when they diverge, I
think because of libcommon.la being linked both statically and dynamically.

Fixes: #4997
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoMerge pull request #291 from dalgaaf/wip-da-CID-1019548
Sage Weil [Thu, 16 May 2013 20:10:50 +0000 (13:10 -0700)]
Merge pull request #291 from dalgaaf/wip-da-CID-1019548

client/Client.cc: fix/silence "logically dead code" CID-Error

Even money that this satisfies the coverity gods...

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoFileJournal: adjust write_pos prior to unlocking write_lock
Samuel Just [Tue, 14 May 2013 23:35:48 +0000 (16:35 -0700)]
FileJournal: adjust write_pos prior to unlocking write_lock

In committed_thru, we use write_pos to reset the header.start value in cases
where seq is past the end of our journalq.  It is therefore important that the
journalq be updated atomically with write_pos (that is, under the write_lock).

The call to align_bl() is moved into do_write in order to ensure that write_pos
is adjusted correctly prior to write_bl().

Also, we adjust pos at the end of write_bl() such that pos \in [get_top(),
header.max_size) after write_bl().

Fixes: #5020
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoclient/Client.cc: fix/silence "logically dead code" CID-Error 291/head
Danny Al-Gaaf [Thu, 16 May 2013 17:49:06 +0000 (19:49 +0200)]
client/Client.cc: fix/silence "logically dead code" CID-Error

Fix handling of 'safe' and the conditions after calling file_flush().

CID 1019548 (#1 of 1): Logically dead code (DEADCODE)
  dead_error_begin: Execution cannot reach this statement "flock.Unlock();"

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds: avoid assert after suicide()
Sage Weil [Thu, 16 May 2013 16:42:11 +0000 (09:42 -0700)]
mds: avoid assert after suicide()

Fixes: #5079
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #290 from dalgaaf/wip-da-SCA-cppcheck-v2
Sage Weil [Thu, 16 May 2013 16:14:19 +0000 (09:14 -0700)]
Merge pull request #290 from dalgaaf/wip-da-SCA-cppcheck-v2

Reviewed-by: Sage Weil <sage@inktank.com>
rgw bits Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

12 years agoobjclass/class_debug.cc: reduce scope of 'n' in cls_log() 290/head
Danny Al-Gaaf [Wed, 15 May 2013 13:38:43 +0000 (15:38 +0200)]
objclass/class_debug.cc: reduce scope of 'n' in cls_log()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agotools/ceph-filestore-dump.cc: reduce scope of 'r' in export_files()
Danny Al-Gaaf [Wed, 15 May 2013 13:01:24 +0000 (15:01 +0200)]
tools/ceph-filestore-dump.cc: reduce scope of 'r' in export_files()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agotest/system/systest_runnable.cc: reduce scope of 'ret' in join()
Danny Al-Gaaf [Wed, 15 May 2013 13:00:53 +0000 (15:00 +0200)]
test/system/systest_runnable.cc: reduce scope of 'ret' in join()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agotest/system/st_rados_list_objects.cc: reduce scope of 'ret' in run()
Danny Al-Gaaf [Wed, 15 May 2013 13:00:19 +0000 (15:00 +0200)]
test/system/st_rados_list_objects.cc: reduce scope of 'ret' in run()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agotest/system/st_rados_create_pool.cc_ reduce scope of 'ret' in run()
Danny Al-Gaaf [Wed, 15 May 2013 12:59:34 +0000 (14:59 +0200)]
test/system/st_rados_create_pool.cc_ reduce scope of 'ret' in run()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agotest/system/rados_list_parallel.cc: reduce scope of 'ret'
Danny Al-Gaaf [Wed, 15 May 2013 12:59:11 +0000 (14:59 +0200)]
test/system/rados_list_parallel.cc: reduce scope of 'ret'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agotest/librbd/test_librbd.cc: reduce scope of several variables
Danny Al-Gaaf [Wed, 15 May 2013 12:58:46 +0000 (14:58 +0200)]
test/librbd/test_librbd.cc: reduce scope of several variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agorgw/rgw_tools.cc: reduce scope of 'ret' in rgw_get_obj()
Danny Al-Gaaf [Wed, 15 May 2013 12:57:10 +0000 (14:57 +0200)]
rgw/rgw_tools.cc: reduce scope of 'ret' in rgw_get_obj()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agorgw/rgw_common.cc: reduce scope of 'end' in two cases
Danny Al-Gaaf [Wed, 15 May 2013 12:56:27 +0000 (14:56 +0200)]
rgw/rgw_common.cc: reduce scope of 'end' in two cases

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agorgw/rgw_bucket.cc: reduce scope of 'max' in rgw_remove_bucket()
Danny Al-Gaaf [Wed, 15 May 2013 12:21:34 +0000 (14:21 +0200)]
rgw/rgw_bucket.cc: reduce scope of 'max' in rgw_remove_bucket()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>