Commit Graph

24484 Commits

Author SHA1 Message Date
Sage Weil
0449c3ae69 Merge pull request #79 from dalgaaf/wip-da-leveldb
Some fixes related to switch to system leveldb

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-27 08:43:10 -08:00
Sage Weil
babb32996e 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>
2013-02-27 08:36:13 -08:00
Danny Al-Gaaf
cd4dc834bf cls_crypto.cc: remove some unused variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 16:54:35 +01:00
Danny Al-Gaaf
924040bacf cls_acl.cc: remove unused variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 16:51:56 +01:00
Danny Al-Gaaf
b20d024841 common/armor.c: reduce scope of some variables
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 16:48:55 +01:00
Danny Al-Gaaf
289d81645f 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>
2013-02-27 16:40:37 +01:00
Danny Al-Gaaf
a7e797d761 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>
2013-02-27 16:14:22 +01:00
Danny Al-Gaaf
90c407ee1c 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>
2013-02-27 16:04:57 +01:00
Danny Al-Gaaf
85e36c156c 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>
2013-02-27 15:53:52 +01:00
Danny Al-Gaaf
f42a63ba1b 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>
2013-02-27 15:39:18 +01:00
Danny Al-Gaaf
43161532d6 debian/control: add libleveldb-dev to Build-Depends:
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 14:47:49 +01:00
Danny Al-Gaaf
2becb35aef README: add leveldb-dev to package list needed for build
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 14:47:29 +01:00
Danny Al-Gaaf
f811f72795 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>
2013-02-27 14:39:13 +01:00
Danny Al-Gaaf
37d148ba91 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>
2013-02-27 14:27:48 +01:00
Danny Al-Gaaf
83dbaf656b 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>
2013-02-27 14:26:16 +01:00
Danny Al-Gaaf
8162215d7e 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>
2013-02-27 14:22:48 +01:00
Gary Lowell
ea546aef0c 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>
2013-02-26 20:07:49 -08:00
Gary Lowell
a34e7c6f6b ceph-test.install: remove cepkfs-test.jar
This was merged prematurely to mast.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 18:28:34 -08:00
Sage Weil
75ce88fb69 doc: fix rst for watch/notify internals
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-26 17:45:33 -08:00
Samuel Just
c313423cfd 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>
2013-02-26 17:36:32 -08:00
Sage Weil
d6b4a7be20 Merge branch 'next' 2013-02-26 17:29:48 -08:00
Gary Lowell
0666b630b7 ceph-test.install: Add libcephfs-test.jar.
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 17:29:46 -08:00
Sage Weil
1da4087e07 Merge pull request #78 from Elbandi/master
Some fixes and functions for libcephfs and client

Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-26 17:11:21 -08:00
Andras Elso
1d8e1195aa client: add some new functions: lchmod, fsetattr, lutime
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-02-27 01:53:09 +01:00
Andras Elso
ac9ed33a07 client: allow change file owner or group only
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-02-27 01:53:06 +01:00
Andras Elso
7bd8400678 client: use get_filehandle
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-02-27 01:52:59 +01:00
Andras Elso
3cc0551b2a client: fix log data
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-02-27 01:52:54 +01:00
Andras Elso
c5d78f4a97 libcephfs: fix default parameters document for ceph_open_layout
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-02-27 01:52:47 +01:00
Sage Weil
3768050f8f 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>
2013-02-26 16:11:26 -08:00
Sage Weil
b271b656a8 Merge remote-tracking branch 'gh/wip-4256'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-26 15:53:35 -08:00
Joao Eduardo Luis
b5c9e59f56 PendingReleaseNotes: mention ceph-mon requiring the creation of data dir
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-02-26 23:47:51 +00:00
Joao Eduardo Luis
ebf47175c4 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>
2013-02-26 23:47:51 +00:00
Joao Eduardo Luis
cf20ea6e1a mon: Monitor: check for an argument to 'quorum' before reading the array
Fixes: #4218

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-02-26 23:47:51 +00:00
Joao Eduardo Luis
6810111cb7 mon: Monitor: adjust sync start criteria considering a peon's bootstrap
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-02-26 23:47:51 +00:00
Joao Eduardo Luis
d9962cc3dd 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>
2013-02-26 23:47:09 +00:00
Josh Durgin
f58601d681 librbd: fix rollback size
The duplicate calls to get_image_size() and get_snap_size() replaced
by 5806226cf0 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>
2013-02-26 14:55:11 -08:00
Sage Weil
c8dd2b67b3 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>
2013-02-26 14:07:12 -08:00
Sage Weil
5b468e25b1 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>
2013-02-26 13:12:08 -08:00
Sage Weil
be31390978 msgr: print dump before asserting (if that is enabled)
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-26 12:38:33 -08:00
Sage Weil
20b093395d msgr: dump corrupt message to log (at high debug levels)
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-26 12:35:06 -08:00
Sage Weil
33d91cce78 Merge remote-tracking branch 'gh/next' 2013-02-26 12:29:35 -08:00
Sage Weil
6d89b34e56 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>
2013-02-26 12:26:43 -08:00
Sage Weil
86df164d04 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>
2013-02-26 12:26:32 -08:00
Sage Weil
0ba8db6b66 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>
2013-02-26 12:26:22 -08:00
Sage Weil
dd123333b8 Merge remote-tracking branch 'gh/wip_4257'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-26 12:25:43 -08:00
Sage Weil
c1cffc714e mon: avoid expensive dump unless log will gather
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-26 11:33:47 -08:00
Sage Weil
95a379aa73 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>
2013-02-26 11:10:44 -08:00
Gary Lowell
95c13bf5c1 Merge branch 'wip-4119'
Fix for bug 4119r, create directories under /var/lib/ceph.
2013-02-26 11:09:16 -08:00
Joe Buck
6bd0969569 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>
2013-02-26 10:53:35 -08:00
Danny Al-Gaaf
12740642c2 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>
2013-02-26 19:51:03 +01:00