]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years agoCInode.h: use static_cast instead of C-Style cast
Danny Al-Gaaf [Thu, 28 Feb 2013 13:58:38 +0000 (14:58 +0100)]
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>
12 years agoCDentry.h: use static_cast instead of C-Style cast
Danny Al-Gaaf [Thu, 28 Feb 2013 13:45:03 +0000 (14:45 +0100)]
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>
12 years agoMerge branch 'wip-4222'
Gary Lowell [Thu, 28 Feb 2013 05:54:06 +0000 (21:54 -0800)]
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>
12 years agofix ceph-object-corpus submodule commit
Sage Weil [Thu, 28 Feb 2013 05:04:49 +0000 (21:04 -0800)]
fix ceph-object-corpus submodule commit

Broken by 58f4cd53b9a29ec16c863fde8e790381dee20253

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc: rbd-cloudstack: fix bullet list, missing words, change ! to .
Dan Mick [Thu, 28 Feb 2013 02:43:46 +0000 (18:43 -0800)]
doc: rbd-cloudstack: fix bullet list, missing words, change ! to .

12 years agoceph-test.install: Add libcephfs-test.jar to package.
Gary Lowell [Thu, 28 Feb 2013 02:25:09 +0000 (18:25 -0800)]
ceph-test.install:  Add libcephfs-test.jar to package.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoMerge branch 'wip-4281'
Sage Weil [Thu, 28 Feb 2013 00:10:35 +0000 (16:10 -0800)]
Merge branch 'wip-4281'

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc: Consolidated Ubuntu and Ubuntu 12.10 requirements.
John Wilkins [Thu, 28 Feb 2013 00:03:31 +0000 (16:03 -0800)]
doc: Consolidated Ubuntu and Ubuntu 12.10 requirements.

fixes: #4288

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agomon: PaxosServices: don't ignore get_version(ver,bl) return value
Joao Eduardo Luis [Wed, 27 Feb 2013 18:30:15 +0000 (18:30 +0000)]
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>
12 years agodoc: Added dependencies for ubuntu 12.10.
John Wilkins [Wed, 27 Feb 2013 23:53:51 +0000 (15:53 -0800)]
doc: Added dependencies for ubuntu 12.10.

fixes: #4288

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodebian: require cryptsetup-bin
Sage Weil [Wed, 27 Feb 2013 21:31:12 +0000 (13:31 -0800)]
debian: require cryptsetup-bin

This is needed for ceph-disk-prepare's dmcrypt support.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agovstart.sh: give mon. key mon = 'allow *' caps
Sage Weil [Wed, 27 Feb 2013 05:50:53 +0000 (21:50 -0800)]
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>
12 years agodoc: fixed link and form edit.
John Wilkins [Wed, 27 Feb 2013 21:27:51 +0000 (13:27 -0800)]
doc: fixed link and form edit.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added auth entry to index.
John Wilkins [Wed, 27 Feb 2013 21:27:21 +0000 (13:27 -0800)]
doc: Added auth entry to index.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Removed auth entries from general. Part of an auth-specific section now.
John Wilkins [Wed, 27 Feb 2013 21:26:59 +0000 (13:26 -0800)]
doc: Removed auth entries from general. Part of an auth-specific section now.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added comment to enable message. Added link to Auth Config Reference.
John Wilkins [Wed, 27 Feb 2013 21:26:19 +0000 (13:26 -0800)]
doc: Added comment to enable message. Added link to Auth Config Reference.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added Auth Config Reference as standalone config reference.
John Wilkins [Wed, 27 Feb 2013 21:25:16 +0000 (13:25 -0800)]
doc: Added Auth Config Reference as standalone config reference.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoosd: allow log trimming during recovery
Sage Weil [Sat, 23 Feb 2013 01:18:29 +0000 (17:18 -0800)]
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>
12 years agoceph-fuse: add ceph options for all current fuse options
Sage Weil [Wed, 27 Feb 2013 18:51:46 +0000 (10:51 -0800)]
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>
12 years agoMerge pull request #81 from dalgaaf/wip-da-sca-style-1
Sage Weil [Wed, 27 Feb 2013 18:54:01 +0000 (10:54 -0800)]
Merge pull request #81 from dalgaaf/wip-da-sca-style-1

Fix some smaller style issues

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomon: MonitorDBStore: return -ENOENT on get() if key doesn't exist
Joao Eduardo Luis [Wed, 27 Feb 2013 18:31:55 +0000 (18:31 +0000)]
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>
12 years agokv_flat_btree_async.cc: remove unused variables 81/head
Danny Al-Gaaf [Wed, 27 Feb 2013 18:36:25 +0000 (19:36 +0100)]
kv_flat_btree_async.cc: remove unused variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agokv_flat_btree_async.cc: remove some unreachable break statements
Danny Al-Gaaf [Wed, 27 Feb 2013 18:32:23 +0000 (19:32 +0100)]
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>
12 years agokey_value_store/cls_kvs.cc: remove unused variable dupmap
Danny Al-Gaaf [Wed, 27 Feb 2013 18:18:05 +0000 (19:18 +0100)]
key_value_store/cls_kvs.cc: remove unused variable dupmap

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agobloom_filter.hpp: check for self assignment
Danny Al-Gaaf [Wed, 27 Feb 2013 18:14:03 +0000 (19:14 +0100)]
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>
12 years agocrush/builder.c: reduce scope of oldsize in crush_add_rule()
Danny Al-Gaaf [Wed, 27 Feb 2013 17:53:28 +0000 (18:53 +0100)]
crush/builder.c: reduce scope of oldsize in crush_add_rule()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agodebian: let dpkg calculate the shlibs dep for leveldb (if any)
Sage Weil [Wed, 27 Feb 2013 17:45:02 +0000 (09:45 -0800)]
debian: let dpkg calculate the shlibs dep for leveldb (if any)

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoCrushCompiler.cc: remove duplicate if/else branches
Danny Al-Gaaf [Wed, 27 Feb 2013 17:27:56 +0000 (18:27 +0100)]
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>
12 years agocommon/secret.c: reduce the scope of some variables
Danny Al-Gaaf [Wed, 27 Feb 2013 17:22:24 +0000 (18:22 +0100)]
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>
12 years agopick_address.cc: pass const string by refrence
Danny Al-Gaaf [Wed, 27 Feb 2013 17:01:07 +0000 (18:01 +0100)]
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>
12 years agoobj_bencher.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Wed, 27 Feb 2013 17:00:20 +0000 (18:00 +0100)]
obj_bencher.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>
12 years agoconfig.cc: remove unused variable 'val' from parse_injectargs()
Danny Al-Gaaf [Wed, 27 Feb 2013 16:53:14 +0000 (17:53 +0100)]
config.cc: remove unused variable 'val' from parse_injectargs()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocode_environment.cc: move variable ret in get_process_name()
Danny Al-Gaaf [Wed, 27 Feb 2013 16:50:45 +0000 (17:50 +0100)]
code_environment.cc: move variable ret in get_process_name()

Move 'ret' in get_process_name() to the correct block to suppress
warning about unused variable in cppcheck.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph_context.cc: remove unused variable 'args' from do_command
Danny Al-Gaaf [Wed, 27 Feb 2013 16:49:59 +0000 (17:49 +0100)]
ceph_context.cc: remove unused variable 'args' from do_command

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMerge pull request #79 from dalgaaf/wip-da-leveldb
Sage Weil [Wed, 27 Feb 2013 16:43:10 +0000 (08:43 -0800)]
Merge pull request #79 from dalgaaf/wip-da-leveldb

Some fixes related to switch to system leveldb

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #80 from dalgaaf/wip-da-4261
Sage Weil [Wed, 27 Feb 2013 16:36:13 +0000 (08:36 -0800)]
Merge pull request #80 from dalgaaf/wip-da-4261

ceph_argparse.cc: accept also 0/1 for boolean injectargs

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agocls_crypto.cc: remove some unused variables
Danny Al-Gaaf [Wed, 27 Feb 2013 15:54:35 +0000 (16:54 +0100)]
cls_crypto.cc: remove some unused variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocls_acl.cc: remove unused variables
Danny Al-Gaaf [Wed, 27 Feb 2013 15:51:56 +0000 (16:51 +0100)]
cls_acl.cc: remove unused variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocommon/armor.c: reduce scope of some variables
Danny Al-Gaaf [Wed, 27 Feb 2013 15:48:55 +0000 (16:48 +0100)]
common/armor.c: reduce scope of some variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph_argparse.cc: accept also 0/1 for boolean injectargs 80/head
Danny Al-Gaaf [Wed, 27 Feb 2013 15:40:37 +0000 (16:40 +0100)]
ceph_argparse.cc: accept also 0/1 for boolean injectargs

Accept also 0 (as false) and 1 (true) as arguments for
boolean option on injectargs.

Fixes: #4261
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoTextTable: pass const string by refrence to define_column()
Danny Al-Gaaf [Wed, 27 Feb 2013 15:14:22 +0000 (16:14 +0100)]
TextTable: pass const string by refrence to define_column()

Pass 'const string heading' by reference to define_column().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoCephBroker.h: use static_cast instead of C-Style cast
Danny Al-Gaaf [Wed, 27 Feb 2013 15:04:57 +0000 (16:04 +0100)]
CephBroker.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>
12 years agoSyntheticClient.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Wed, 27 Feb 2013 14:53:52 +0000 (15:53 +0100)]
SyntheticClient.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>
12 years agodebian/control: fix Depends 79/head
Danny Al-Gaaf [Wed, 27 Feb 2013 14:39:18 +0000 (15:39 +0100)]
debian/control: fix Depends

Remove request for libleveldb1 version > 1.2. Every libleveldb1 package
should work, otherwise the SO name/version of the library should change.

Fixes: #3945
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agodebian/control: add libleveldb-dev to Build-Depends:
Danny Al-Gaaf [Wed, 27 Feb 2013 13:47:49 +0000 (14:47 +0100)]
debian/control: add libleveldb-dev to Build-Depends:

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoREADME: add leveldb-dev to package list needed for build
Danny Al-Gaaf [Wed, 27 Feb 2013 13:43:19 +0000 (14:43 +0100)]
README: add leveldb-dev to package list needed for build

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: fix leveldb handling
Danny Al-Gaaf [Wed, 27 Feb 2013 13:39:13 +0000 (14:39 +0100)]
ceph.spec.in: fix leveldb handling

There is no need to add leveldb as 'Requires:'. The RPM build system
will find this dependency by itself.

Add leveldb-devel to BuildRequires: since this is what the package
really needs to build ceph correctly with libleveldb1.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoconfigure.ac: check for libsnappy
Danny Al-Gaaf [Wed, 27 Feb 2013 13:27:48 +0000 (14:27 +0100)]
configure.ac: check for libsnappy

Since libsnappy is needed by leveldb, check if the lib is installed
before check for leveldb.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoadd src/leveldb to .gitignore
Danny Al-Gaaf [Wed, 27 Feb 2013 13:26:16 +0000 (14:26 +0100)]
add src/leveldb to .gitignore

Add src/leveldb to .gitignore in master, since the directory
may get checked out by older branches. Ignore it since it's not
needed in master.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoremove leveldb from master branch
Danny Al-Gaaf [Wed, 27 Feb 2013 13:22:48 +0000 (14:22 +0100)]
remove leveldb from master branch

Since we now build against system leveldb and no longer
against a git submodule, drop the submodule from git master.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoBuild: Change build to always use system leveldb
Gary Lowell [Sat, 16 Feb 2013 01:58:48 +0000 (17:58 -0800)]
Build: Change build to always use system leveldb

Dynamically link to the leveldb installed on the system rather than
statically linking ceph copy.  Remove the --with-system-leveldb config
option, and add a requirement for leveldb libraries for rpm and debian
packages.  Bug 3945.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoceph-test.install: remove cepkfs-test.jar
Gary Lowell [Wed, 27 Feb 2013 02:28:34 +0000 (18:28 -0800)]
ceph-test.install:  remove cepkfs-test.jar

This was merged prematurely to mast.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agodoc: fix rst for watch/notify internals
Sage Weil [Wed, 27 Feb 2013 01:45:23 +0000 (17:45 -0800)]
doc: fix rst for watch/notify internals

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoOpRequest: rmw_flags may actually be 0
Samuel Just [Wed, 27 Feb 2013 01:35:40 +0000 (17:35 -0800)]
OpRequest: rmw_flags may actually be 0

If the operation includes only an invalid method,
the flags will be 0.

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge branch 'next'
Sage Weil [Wed, 27 Feb 2013 01:29:48 +0000 (17:29 -0800)]
Merge branch 'next'

12 years agoceph-test.install: Add libcephfs-test.jar.
Gary Lowell [Tue, 26 Feb 2013 23:00:55 +0000 (15:00 -0800)]
ceph-test.install:  Add libcephfs-test.jar.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoMerge pull request #78 from Elbandi/master
Sage Weil [Wed, 27 Feb 2013 01:11:21 +0000 (17:11 -0800)]
Merge pull request #78 from Elbandi/master

Some fixes and functions for libcephfs and client

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoclient: add some new functions: lchmod, fsetattr, lutime 78/head
Andras Elso [Tue, 26 Feb 2013 23:24:20 +0000 (00:24 +0100)]
client: add some new functions: lchmod, fsetattr, lutime

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agoclient: allow change file owner or group only
Andras Elso [Tue, 26 Feb 2013 23:20:39 +0000 (00:20 +0100)]
client: allow change file owner or group only

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agoclient: use get_filehandle
Andras Elso [Tue, 26 Feb 2013 23:23:11 +0000 (00:23 +0100)]
client: use get_filehandle

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agoclient: fix log data
Andras Elso [Tue, 26 Feb 2013 23:24:44 +0000 (00:24 +0100)]
client: fix log data

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agolibcephfs: fix default parameters document for ceph_open_layout
Andras Elso [Tue, 26 Feb 2013 23:14:49 +0000 (00:14 +0100)]
libcephfs: fix default parameters document for ceph_open_layout

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agoMerge pull request #76 from dalgaaf/wip-da-sca-style
Sage Weil [Wed, 27 Feb 2013 00:11:26 +0000 (16:11 -0800)]
Merge pull request #76 from dalgaaf/wip-da-sca-style

Fix some style related issues found by cppcheck

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-4256'
Sage Weil [Tue, 26 Feb 2013 23:53:35 +0000 (15:53 -0800)]
Merge remote-tracking branch 'gh/wip-4256'

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoPendingReleaseNotes: mention ceph-mon requiring the creation of data dir
Joao Eduardo Luis [Tue, 26 Feb 2013 23:31:33 +0000 (23:31 +0000)]
PendingReleaseNotes: mention ceph-mon requiring the creation of data dir

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agomon: give useful errors to user when store is missing
Joao Eduardo Luis [Mon, 25 Feb 2013 17:54:18 +0000 (17:54 +0000)]
mon: give useful errors to user when store is missing

We used to assert() instead, which didn't shed enough light on the cause
and could confuse the user into believing something *terrible* had
happened.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agomon: Monitor: check for an argument to 'quorum' before reading the array
Joao Eduardo Luis [Thu, 21 Feb 2013 17:44:39 +0000 (17:44 +0000)]
mon: Monitor: check for an argument to 'quorum' before reading the array

Fixes: #4218
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agomon: Monitor: adjust sync start criteria considering a peon's bootstrap
Joao Eduardo Luis [Tue, 26 Feb 2013 14:41:33 +0000 (14:41 +0000)]
mon: Monitor: adjust sync start criteria considering a peon's bootstrap

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agomon: Paxos: bootstrap if we have fallen behind when we start collecting
Joao Eduardo Luis [Tue, 26 Feb 2013 01:54:10 +0000 (01:54 +0000)]
mon: Paxos: bootstrap if we have fallen behind when we start collecting

Fixes: #4256
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agolibrbd: fix rollback size
Josh Durgin [Tue, 26 Feb 2013 21:20:08 +0000 (13:20 -0800)]
librbd: fix rollback size

The duplicate calls to get_image_size() and get_snap_size() replaced
by 5806226cf0743bb44eaf7bc815897c6846d43233 uncovered this. The first
call was using the currently set snap_id instead of the snapshot being
rolled back to.

Fixes: #4272
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomsg: fix entity_addr_t::is_same_host() for IPv6
Sage Weil [Tue, 26 Feb 2013 22:07:12 +0000 (14:07 -0800)]
msg: fix entity_addr_t::is_same_host() for IPv6

We weren't checking the memcmp return value properly!  Aie...

Backport: bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomon: fix other debug dumps
Sage Weil [Tue, 26 Feb 2013 21:12:08 +0000 (13:12 -0800)]
mon: fix other debug dumps

These should only kick in at high debug levels.  Moving any "work" between
the dout() and dendl lines puts them inside the magical hidden if block
that makes this code a no-op at low debug.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomsgr: print dump before asserting (if that is enabled)
Sage Weil [Tue, 26 Feb 2013 20:38:33 +0000 (12:38 -0800)]
msgr: print dump before asserting (if that is enabled)

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomsgr: dump corrupt message to log (at high debug levels)
Sage Weil [Tue, 26 Feb 2013 20:34:55 +0000 (12:34 -0800)]
msgr: dump corrupt message to log (at high debug levels)

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 26 Feb 2013 20:29:35 +0000 (12:29 -0800)]
Merge remote-tracking branch 'gh/next'

12 years agoosd: allow (some) log trim when degraded, but not during recovery
Sage Weil [Sat, 23 Feb 2013 01:01:53 +0000 (17:01 -0800)]
osd: allow (some) log trim when degraded, but not during recovery

We allow some trim during degraded, although we keep more entries around to
improve our chances of a restarting OSD of doing log-based recovery.

Still disallow during recovery...

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agoosd: restructure calc_trim
Sage Weil [Mon, 25 Feb 2013 23:33:35 +0000 (15:33 -0800)]
osd: restructure calc_trim

No functional change, except that we log more debug, yay!

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agoosd: allow pg log trim during (non-classic) scrub
Sage Weil [Sat, 23 Feb 2013 00:48:02 +0000 (16:48 -0800)]
osd: allow pg log trim during (non-classic) scrub

Chunky (and deep) scrub do not care about PG log trimming.  Classic scrub
still does.

Deep scrub can take a long time, so not trimming the log during that period
may eat lots of RAM; avoid that!

Might fix: #4179
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip_4257'
Sage Weil [Tue, 26 Feb 2013 20:25:43 +0000 (12:25 -0800)]
Merge remote-tracking branch 'gh/wip_4257'

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agomon: avoid expensive dump unless log will gather
Sage Weil [Tue, 26 Feb 2013 19:33:23 +0000 (11:33 -0800)]
mon: avoid expensive dump unless log will gather

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoceph_common.sh: tolerate missing mds, mon, osds in conf
Sage Weil [Tue, 26 Feb 2013 19:10:44 +0000 (11:10 -0800)]
ceph_common.sh: tolerate missing mds, mon, osds in conf

With set -e this seems to fail (at least on some machines) if, say, there
is no MDS in the conf file.  This fixes it.

Tested-by: Mark Nelson <mark.nelson@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge branch 'wip-4119'
Gary Lowell [Tue, 26 Feb 2013 19:09:16 +0000 (11:09 -0800)]
Merge branch 'wip-4119'

Fix for bug 4119r, create directories under /var/lib/ceph.

12 years agotesting: updating hadoop-internal test
Joe Buck [Tue, 19 Feb 2013 18:37:49 +0000 (10:37 -0800)]
testing: updating hadoop-internal test

Small tweaks to the hadoop-internal test
to better use existing environment varaibles
and in response to the recent teuthology
changes.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
12 years agoCephBroker.cc: fix condition 76/head
Danny Al-Gaaf [Tue, 26 Feb 2013 18:51:03 +0000 (19:51 +0100)]
CephBroker.cc: fix condition

from cppcheck:
 Fix Suspicious condition (assignment + comparison); Clarify
 expression with parentheses.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agotest: removing dead code
Joe Buck [Wed, 20 Feb 2013 22:32:01 +0000 (14:32 -0800)]
test: removing dead code

Signed-off-by: Joe Buck <jbbuck@gmail.com>
12 years agotest: updating libcephfs-java tests
Joe Buck [Wed, 20 Feb 2013 23:22:39 +0000 (15:22 -0800)]
test: updating libcephfs-java tests

Recent changes in teuthology necessitate
changes to libcephfs-java test case.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
12 years agoClient.cc: reduce the scope of some variables
Danny Al-Gaaf [Tue, 26 Feb 2013 18:31:02 +0000 (19:31 +0100)]
Client.cc: reduce the scope of some variables

Reduce the scope of some variables.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoClient.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Tue, 26 Feb 2013 18:18:58 +0000 (19:18 +0100)]
Client.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>
12 years agoMerge pull request #75 from alram/master
Sage Weil [Tue, 26 Feb 2013 18:00:41 +0000 (10:00 -0800)]
Merge pull request #75 from alram/master

Typo: pool should be root in rados/operations/crush-map.rst

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoPaxos.h: pass string name function parameter by reference
Danny Al-Gaaf [Tue, 26 Feb 2013 17:50:13 +0000 (18:50 +0100)]
Paxos.h: pass string name function parameter by reference

Pass 'const string name' function parameter by reference.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoTypo: pool should be root in rados/operations/crush-map.rst 75/head
Alexandre Marangone [Tue, 26 Feb 2013 17:47:58 +0000 (09:47 -0800)]
Typo: pool should be root in rados/operations/crush-map.rst

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
12 years agoMerge pull request #73 from dalgaaf/wip-da-sca-cppcheck-emptiness
Sage Weil [Tue, 26 Feb 2013 17:00:38 +0000 (09:00 -0800)]
Merge pull request #73 from dalgaaf/wip-da-sca-cppcheck-emptiness

fix more emptiness checks

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #74 from dalgaaf/wip-da-sca-misc
Sage Weil [Tue, 26 Feb 2013 16:58:51 +0000 (08:58 -0800)]
Merge pull request #74 from dalgaaf/wip-da-sca-misc

mds/journal.cc: fix assert in replay()

Let's see how many bugs this has been hiding... :)

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoosd/ReplicatedPG.cc: remove unused variables
Danny Al-Gaaf [Tue, 26 Feb 2013 15:27:22 +0000 (16:27 +0100)]
osd/ReplicatedPG.cc: remove unused variables

Remove unused variable declarations.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoosd_types.cc: add parenthesis around expression
Danny Al-Gaaf [Tue, 26 Feb 2013 15:24:46 +0000 (16:24 +0100)]
osd_types.cc: add parenthesis around expression

Add parenthesis around expressions like (x && y & z).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoOSDMap.cc: add parenthesis around expression
Danny Al-Gaaf [Tue, 26 Feb 2013 15:23:25 +0000 (16:23 +0100)]
OSDMap.cc: add parenthesis around expression

Add parenthesis around expressions like (x && y & z).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoPGMonitor.cc: add parenthesis around expression
Danny Al-Gaaf [Tue, 26 Feb 2013 15:13:09 +0000 (16:13 +0100)]
PGMonitor.cc: add parenthesis around expression

Add parenthesis around expressions like (x && y & z).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoClient.cc: add parenthesis around expression
Danny Al-Gaaf [Tue, 26 Feb 2013 15:03:19 +0000 (16:03 +0100)]
Client.cc: add parenthesis around expression

Add parenthesis around expressions like (x && y & z).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoCephxProtocol.cc: catch end_of_buffer by reference
Danny Al-Gaaf [Tue, 26 Feb 2013 14:56:03 +0000 (15:56 +0100)]
CephxProtocol.cc: catch end_of_buffer by reference

Follow 'Throw by value, catch by reference' to void copying and
potential slicing the exception.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoCephxProtocol.cc: catch error by reference
Danny Al-Gaaf [Tue, 26 Feb 2013 14:54:19 +0000 (15:54 +0100)]
CephxProtocol.cc: catch error by reference

Follow 'Throw by value, catch by reference' to void copying and
potential slicing the exception.

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