]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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>
12 years agocrushtool.cc: remove unneeded function declaration
Danny Al-Gaaf [Tue, 26 Feb 2013 14:47:05 +0000 (15:47 +0100)]
crushtool.cc: remove unneeded function declaration

Remove unneeded function declarations (data_analysis() is unused and
usage() is not needed).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/journal.cc: fix assert in replay() 74/head
Danny Al-Gaaf [Tue, 26 Feb 2013 14:21:38 +0000 (15:21 +0100)]
mds/journal.cc: fix assert in replay()

Fix assert in replay(), check if mds->sessionmap.version is cmapv
instead of assign cmapv to  mds->sessionmap.version. Add missing
second '='.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoKeyValueDBMemory.cc: use empty() instead of size() == 0 73/head
Danny Al-Gaaf [Tue, 26 Feb 2013 10:25:49 +0000 (11:25 +0100)]
KeyValueDBMemory.cc: use empty() instead of size() == 0

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoReplicatedPG.cc: use empty() instead of size() == 0
Danny Al-Gaaf [Tue, 26 Feb 2013 10:19:25 +0000 (11:19 +0100)]
ReplicatedPG.cc: use empty() instead of size() == 0

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoFileStore.cc: use if(!empty()) instead of if(size())
Danny Al-Gaaf [Tue, 26 Feb 2013 10:16:56 +0000 (11:16 +0100)]
FileStore.cc: use if(!empty()) instead of if(size())

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon_store_converter.cc: use empty() instead of size()
Danny Al-Gaaf [Tue, 26 Feb 2013 10:15:35 +0000 (11:15 +0100)]
mon_store_converter.cc: use empty() instead of size()

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoPaxos.cc: use empty() instead of size()
Danny Al-Gaaf [Tue, 26 Feb 2013 10:13:45 +0000 (11:13 +0100)]
Paxos.cc: use empty() instead of size()

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMonitor.h: use empty() instead of !size()
Danny Al-Gaaf [Mon, 25 Feb 2013 16:08:14 +0000 (17:08 +0100)]
Monitor.h: use empty() instead of !size()

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMonitor.cc: use empty() instead of size()
Danny Al-Gaaf [Mon, 25 Feb 2013 16:06:36 +0000 (17:06 +0100)]
Monitor.cc: use empty() instead of size()

Use empty() since it should be prefered as it has, following the
standard, a constant time complexity regardless of the containter
type. The same is not guaranteed for size().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: Create placeholder directorys under /var/lib/ceph (Bug 4119)
Gary Lowell [Tue, 26 Feb 2013 07:51:25 +0000 (23:51 -0800)]
ceph.spec.in:  Create placeholder directorys under /var/lib/ceph (Bug 4119)

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoconfigure.ac: Add test for c++ compiler.
Gary Lowell [Mon, 11 Feb 2013 06:21:52 +0000 (22:21 -0800)]
configure.ac: Add test for c++ compiler.

The AC_PROG_CXX macro sets a flag if a C++ compiler is found
but does not fail if one is not found, it left to application
to test the flags as needed. This fix will issue an error
when a c++ compiler is not found.  Bug 3955.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
it's not installed, this fix adds an error message for a

12 years agotest_lock_fence.sh, rbdrw.py: rbd lock/fence test
Dan Mick [Mon, 26 Nov 2012 21:43:13 +0000 (13:43 -0800)]
test_lock_fence.sh, rbdrw.py: rbd lock/fence test

qa/workunits/rbd/test_lock_fence.sh runs using test/rbdrw.py

rbdrw.py creates an image, locks it, and runs an I/O loop;
test_lock_fence.sh runs it, waits, and then blacklists that client,
which causes rbdrw.py to get ESHUTDOWN on operations thereafter.
Currently doesn't work with rbd caching enabled.

rbd.py gets new exception type for ESHUTDOWN

Fixes: #3190
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge remote-tracking branch 'gh/wip-4249-master'
Sage Weil [Tue, 26 Feb 2013 01:48:16 +0000 (17:48 -0800)]
Merge remote-tracking branch 'gh/wip-4249-master'

12 years agoMerge remote-tracking branch 'gh/wip-4249' into next
Sage Weil [Tue, 26 Feb 2013 01:48:07 +0000 (17:48 -0800)]
Merge remote-tracking branch 'gh/wip-4249' into next

12 years agoMerge remote-tracking branch 'gh/wip-4252'
Sage Weil [Tue, 26 Feb 2013 01:41:07 +0000 (17:41 -0800)]
Merge remote-tracking branch 'gh/wip-4252'

12 years agomon: PaxosService: remove lingering uses of paxos getters and wait methods
Sage Weil [Sat, 23 Feb 2013 17:01:07 +0000 (09:01 -0800)]
mon: PaxosService: remove lingering uses of paxos getters and wait methods

We should use the PaxosServices getters, setters, and wait methods when and
wherever possible.  These must have fallen through the cracks during the
merge.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agosystest: restrict list error acceptance
Josh Durgin [Mon, 25 Feb 2013 23:02:50 +0000 (15:02 -0800)]
systest: restrict list error acceptance

Only ignore errors after the midway point if the midway_sem_post is
defined.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit 5b24a68b6e7d57bac688021b822fb2f73494c3e9)

12 years agosystest: fix race with pool deletion
Josh Durgin [Mon, 25 Feb 2013 22:55:34 +0000 (14:55 -0800)]
systest: fix race with pool deletion

The second test have pool deletion and object listing wait on the same
semaphore to connect and start. This led to errors sometimes when the
pool was deleted before it could be opened by the listing process. Add
another semaphore so the pool deletion happens only after the listing
has begun.

Fixes: #4147
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit b0271e390564119e998e18189282252d54f75eb6)

12 years agoMerge remote-tracking branch 'gh/wip-4147'
Sage Weil [Tue, 26 Feb 2013 00:49:37 +0000 (16:49 -0800)]
Merge remote-tracking branch 'gh/wip-4147'

12 years agodoc: Added subnet example and verbiage to network settings.
John Wilkins [Tue, 26 Feb 2013 00:29:57 +0000 (16:29 -0800)]
doc: Added subnet example and verbiage to network settings.

fixes: #4049

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added content to remove REJECT rules from iptables.
John Wilkins [Tue, 26 Feb 2013 00:12:50 +0000 (16:12 -0800)]
doc: Added content to remove REJECT rules from iptables.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agotest_rbd: move flatten tests back into TestClone
Josh Durgin [Tue, 26 Feb 2013 00:09:26 +0000 (16:09 -0800)]
test_rbd: move flatten tests back into TestClone

They need the same setup, and it's easy enough to run specific
subtests. Making them a separate subclass accidentally duplicated
tests from TestClone.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoqa: enable watch-notify dependent test
Josh Durgin [Mon, 25 Feb 2013 23:59:48 +0000 (15:59 -0800)]
qa: enable watch-notify dependent test

This works now that watch-notify has been reworked a bit.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agotest_rbd: close image before removing it
Josh Durgin [Mon, 25 Feb 2013 23:55:36 +0000 (15:55 -0800)]
test_rbd: close image before removing it

This error was masked before by watch notify not differentiating
between watches from the same client with different cookies.
Reopen the image at the end of this test so teardown works.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agodoc: Added a small ref section for osd config reference.
John Wilkins [Mon, 25 Feb 2013 23:28:07 +0000 (15:28 -0800)]
doc: Added a small ref section for osd config reference.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Updated osd configuration reference.
John Wilkins [Mon, 25 Feb 2013 23:27:09 +0000 (15:27 -0800)]
doc: Updated osd configuration reference.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agosystest: restrict list error acceptance
Josh Durgin [Mon, 25 Feb 2013 23:02:50 +0000 (15:02 -0800)]
systest: restrict list error acceptance

Only ignore errors after the midway point if the midway_sem_post is
defined.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agosystest: fix race with pool deletion
Josh Durgin [Mon, 25 Feb 2013 22:55:34 +0000 (14:55 -0800)]
systest: fix race with pool deletion

The second test have pool deletion and object listing wait on the same
semaphore to connect and start. This led to errors sometimes when the
pool was deleted before it could be opened by the listing process. Add
another semaphore so the pool deletion happens only after the listing
has begun.

Fixes: #4147
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoqa: output rados test names as they run
Josh Durgin [Mon, 25 Feb 2013 22:09:41 +0000 (14:09 -0800)]
qa: output rados test names as they run

So we don't have to figure out which test is running from the output,
which can be difficult with the system tests.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoPG,ReplicatedPG: use pg_has_reset_since to discard old async events
Samuel Just [Mon, 25 Feb 2013 21:28:31 +0000 (13:28 -0800)]
PG,ReplicatedPG: use pg_has_reset_since to discard old async events

Local async events are obsolete if the pg is deleting or if the
epoch at which they were created is prior to last_peering_reset.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoPG::build_scrub_map: detect race with peering via last_peering_reset
Samuel Just [Mon, 25 Feb 2013 20:40:06 +0000 (12:40 -0800)]
PG::build_scrub_map: detect race with peering via last_peering_reset

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoReplicatedPG::C_OSD_CommittedPushedObject: use intrusive_ptr for pg
Samuel Just [Mon, 25 Feb 2013 20:36:29 +0000 (12:36 -0800)]
ReplicatedPG::C_OSD_CommittedPushedObject: use intrusive_ptr for pg

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoReplicatedPG::C_OSD_CommittedPushedObject take epoch submitted
Samuel Just [Mon, 25 Feb 2013 20:35:26 +0000 (12:35 -0800)]
ReplicatedPG::C_OSD_CommittedPushedObject take epoch submitted

What we really care about is that the epoch in which the Context
was submitted is at complete() time >= last_peering_reset.

Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agolibrbd: remove unused internal method
Josh Durgin [Mon, 25 Feb 2013 20:12:57 +0000 (12:12 -0800)]
librbd: remove unused internal method

get_snap_size() has been replaced by get_image_size(snap_id) everywhere.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge branch 'wip-4249' into wip-4249-master
Josh Durgin [Mon, 25 Feb 2013 20:05:16 +0000 (12:05 -0800)]
Merge branch 'wip-4249' into wip-4249-master

Make snap_rollback() only take a read lock on snap_lock, since
it does not modify snapshot-related fields.
Conflicts:
src/librbd/internal.cc

12 years agolibrbd: drop snap_lock before invalidating cache
Josh Durgin [Mon, 25 Feb 2013 19:33:48 +0000 (11:33 -0800)]
librbd: drop snap_lock before invalidating cache

Writeback will take the snap_lock, so read everything we need under it
before invalidating the cache. This avoids a recursive lock when writeback
uses snap_lock while snap_rollback() was holding it.

Remove a not-very-useful debugging message that depended on snap_lock being held.

Fixes: #4249
Backport: bobtail
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
12 years agoMerge pull request #71 from dalgaaf/wip-da-sca-c_str
Sage Weil [Mon, 25 Feb 2013 17:10:49 +0000 (09:10 -0800)]
Merge pull request #71 from dalgaaf/wip-da-sca-c_str

fix some c_str() usage

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #72 from dalgaaf/wip-da-comp-sign-unsign
Sage Weil [Mon, 25 Feb 2013 16:53:22 +0000 (08:53 -0800)]
Merge pull request #72 from dalgaaf/wip-da-comp-sign-unsign

Monitor.cc: fix -Wsign-

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #70 from dalgaaf/wip-da-fix-spec
Sage Weil [Mon, 25 Feb 2013 16:52:26 +0000 (08:52 -0800)]
Merge pull request #70 from dalgaaf/wip-da-fix-spec

Add missing files to spec and debian files

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agodoc: Moved admonition to kernel mount.
John Wilkins [Mon, 25 Feb 2013 16:21:11 +0000 (08:21 -0800)]
doc: Moved admonition to kernel mount.

fixes: #4146

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Added verbiage to describe single host deadlocks.
John Wilkins [Mon, 25 Feb 2013 16:19:58 +0000 (08:19 -0800)]
doc: Added verbiage to describe single host deadlocks.

fixes: #3076

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMonitor.cc: fix -Wsign-compare 72/head
Danny Al-Gaaf [Mon, 25 Feb 2013 15:38:50 +0000 (16:38 +0100)]
Monitor.cc: fix -Wsign-compare

Fix -Wsign-compare, make 'i' unsigned int.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agodebian: add new files 70/head
Danny Al-Gaaf [Mon, 25 Feb 2013 14:36:37 +0000 (15:36 +0100)]
debian: add new files

Add new (installed) files to debian install files.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: add new files
Danny Al-Gaaf [Mon, 25 Feb 2013 14:34:17 +0000 (15:34 +0100)]
ceph.spec.in: add new files

Add new files to spec file since they get installed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoClient.cc: don't pass c_str() if std::string is expected 71/head
Danny Al-Gaaf [Mon, 25 Feb 2013 14:28:37 +0000 (15:28 +0100)]
Client.cc: don't pass c_str() if std::string is expected

Don't pass c_str() to _lookup(). The function expect a std::string
as second parameter.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoPaxos.h: fix dangerouse use of c_str()
Danny Al-Gaaf [Mon, 25 Feb 2013 13:10:20 +0000 (14:10 +0100)]
Paxos.h: fix dangerouse use of c_str()

No need to use c_str() in get_statename(), simply return a
std::strin instead.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agodebian: make gdisk, parted requirements, not recommendations.
Sage Weil [Sun, 24 Feb 2013 21:31:06 +0000 (13:31 -0800)]
debian: make gdisk, parted requirements, not recommendations.

ceph-prepare-disk (and thus ceph-deploy) need this.

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Sun, 24 Feb 2013 21:22:47 +0000 (13:22 -0800)]
Merge remote-tracking branch 'gh/next'

12 years agoMinor wording change.
Neil Levine [Sat, 23 Feb 2013 00:43:44 +0000 (00:43 +0000)]
Minor wording change.

Signed-off-by: Neil Levine <neil.levine@inktank.com>