]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
12 years agoinit-ceph: fix --restart option
Sage Weil [Mon, 4 Mar 2013 20:34:40 +0000 (12:34 -0800)]
init-ceph: fix --restart option

Reported-by: Bryan K. Wright <bkw1a@ayesha.phys.virginia.edu>
Signed-off-by: Sage Weil <sage@inktank.com>
12 years agodoc: Updated year in footer.
John Wilkins [Mon, 4 Mar 2013 19:48:14 +0000 (11:48 -0800)]
doc: Updated year in footer.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge branch 'master' of https://github.com/ceph/ceph
John Wilkins [Mon, 4 Mar 2013 18:59:50 +0000 (10:59 -0800)]
Merge branch 'master' of https://github.com/ceph/ceph

12 years agodoc: Added instructions for ensuring ceph config file and keyring prior to mounting...
John Wilkins [Mon, 4 Mar 2013 18:59:18 +0000 (10:59 -0800)]
doc: Added instructions for ensuring ceph config file and keyring prior to mounting ceph fuse.

fixes: #3796

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoMerge pull request #89 from Elbandi/master
Sage Weil [Mon, 4 Mar 2013 18:33:15 +0000 (10:33 -0800)]
Merge pull request #89 from Elbandi/master

remove unused variable from makefile

12 years agoMerge remote-tracking branch 'gh/wip-3484'
Sage Weil [Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)]
Merge remote-tracking branch 'gh/wip-3484'

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoBuild: no longer need to use LEVELDB_INCLUDE 89/head
Andras Elso [Fri, 1 Mar 2013 15:34:01 +0000 (16:34 +0100)]
Build: no longer need to use LEVELDB_INCLUDE

Signed-off-by: Andras Elso <elso.andras@gmail.com>
12 years agotools: ceph: add 'ceph df' usage
Joao Eduardo Luis [Sat, 2 Mar 2013 18:36:37 +0000 (18:36 +0000)]
tools: ceph: add 'ceph df' usage

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agomon: Monitor: 'ceph df'
Joao Eduardo Luis [Fri, 1 Mar 2013 16:32:24 +0000 (16:32 +0000)]
mon: Monitor: 'ceph df'

Fixes: #3484
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
12 years agoREADME: Add libsnappy-dev to build requirements.
Gary Lowell [Sat, 2 Mar 2013 07:32:54 +0000 (23:32 -0800)]
README:  Add libsnappy-dev to build requirements.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agodoc: missing blank line in radosgw/config-ref
Dan Mick [Sat, 2 Mar 2013 03:53:33 +0000 (19:53 -0800)]
doc: missing blank line in radosgw/config-ref

12 years agoMerge pull request #85 from dalgaaf/wip-da-spec-1
Gary Lowell [Sat, 2 Mar 2013 03:09:04 +0000 (19:09 -0800)]
Merge pull request #85 from dalgaaf/wip-da-spec-1

Fix package requirements to get sgdisk and merge some changes back from SUSE spec file.

Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoMerge pull request #88 from nmtadam/master
Sage Weil [Sat, 2 Mar 2013 01:50:00 +0000 (17:50 -0800)]
Merge pull request #88 from nmtadam/master

librados.hpp typo

12 years agolibrados.hpp: replace paris with pairs 88/head
Adam Manzanares [Fri, 1 Mar 2013 23:49:26 +0000 (15:49 -0800)]
librados.hpp: replace paris with pairs

Signed-off-by: Adam Manzanares <nmtadam@gmail.com>
Working on a lua-rados library I noticed that paris was used
in the place of pairs in some comments.

12 years agodoc: Instruction should have been noout, not nodown.
John Wilkins [Fri, 1 Mar 2013 23:09:31 +0000 (15:09 -0800)]
doc: Instruction should have been noout, not nodown.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agodoc: Fixed OSD pool config settings. Should be in [global], not [osd].
John Wilkins [Fri, 1 Mar 2013 19:35:47 +0000 (11:35 -0800)]
doc: Fixed OSD pool config settings. Should be in [global], not [osd].

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
12 years agoceph.spec.in: Require gptfdisk for Suse, gdisk for otherwise
Gary Lowell [Fri, 1 Mar 2013 18:38:49 +0000 (10:38 -0800)]
ceph.spec.in: Require gptfdisk for Suse, gdisk for otherwise

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoMerge pull request #87 from dalgaaf/wip-da-sca-style-2
Sage Weil [Fri, 1 Mar 2013 18:18:57 +0000 (10:18 -0800)]
Merge pull request #87 from dalgaaf/wip-da-sca-style-2

Fix more issues found via cppcheck

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoosd/Watch.cc: init NotifyTimeoutCB::canceled in constructor with false 87/head
Danny Al-Gaaf [Fri, 1 Mar 2013 17:52:27 +0000 (18:52 +0100)]
osd/Watch.cc: init NotifyTimeoutCB::canceled in constructor with false

Initialize NotifyTimeoutCB::canceled in the constructor with
false as already done in onter cases.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoosd/ReplicatedPG.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 17:44:59 +0000 (18:44 +0100)]
osd/ReplicatedPG.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoReplicatedPG.cc: remove unused variables
Danny Al-Gaaf [Fri, 1 Mar 2013 16:58:19 +0000 (17:58 +0100)]
ReplicatedPG.cc: remove unused variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoReplicatedPG.cc: remove consecutive return/break statement
Danny Al-Gaaf [Fri, 1 Mar 2013 16:55:55 +0000 (17:55 +0100)]
ReplicatedPG.cc: remove consecutive return/break statement

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoosd/PG.cc: reduce scope of listed_collection in read_log_old()
Danny Al-Gaaf [Fri, 1 Mar 2013 16:14:53 +0000 (17:14 +0100)]
osd/PG.cc: reduce scope of listed_collection in read_log_old()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoosd/PG.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 16:11:31 +0000 (17:11 +0100)]
osd/PG.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoosd/OSD.cc: remove unused variable 'map<int64_t, int> pool_resize'
Danny Al-Gaaf [Fri, 1 Mar 2013 16:05:03 +0000 (17:05 +0100)]
osd/OSD.cc: remove unused variable 'map<int64_t, int> pool_resize'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoosd/OSD.cc: reduce scope of "PG *pg" in OSD::handle_pg_query()
Danny Al-Gaaf [Fri, 1 Mar 2013 15:57:13 +0000 (16:57 +0100)]
osd/OSD.cc: reduce scope of "PG *pg" in OSD::handle_pg_query()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoosd/OSD.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 15:54:26 +0000 (16:54 +0100)]
osd/OSD.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoos/IndexManager.cc: reduce scope of 'int r' in IndexManager::build_index()
Danny Al-Gaaf [Fri, 1 Mar 2013 15:37:36 +0000 (16:37 +0100)]
os/IndexManager.cc: reduce scope of 'int r' in IndexManager::build_index()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoos/LevelDBStore.h: pass const string by reference to past_prefix()
Danny Al-Gaaf [Fri, 1 Mar 2013 15:33:40 +0000 (16:33 +0100)]
os/LevelDBStore.h: pass const string by reference to past_prefix()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoos/FileStore.cc: fix warning about comparing int with bool
Danny Al-Gaaf [Fri, 1 Mar 2013 15:27:38 +0000 (16:27 +0100)]
os/FileStore.cc: fix warning about comparing int with bool

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoos/FileStore.cc: remove identical else branch
Danny Al-Gaaf [Fri, 1 Mar 2013 15:09:15 +0000 (16:09 +0100)]
os/FileStore.cc: remove identical else branch

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoos/FileStore.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 15:04:24 +0000 (16:04 +0100)]
os/FileStore.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoSimpleMessenger.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 14:54:21 +0000 (15:54 +0100)]
SimpleMessenger.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomsg/Pipe.cc: reduce scope of some variables
Danny Al-Gaaf [Fri, 1 Mar 2013 14:40:51 +0000 (15:40 +0100)]
msg/Pipe.cc: reduce scope of some variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/Paxos.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 14:09:37 +0000 (15:09 +0100)]
mon/Paxos.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/PGMonitor.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 13:37:29 +0000 (14:37 +0100)]
mon/PGMonitor.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/PGMap.cc: remove useless assigment to 'first', it's never used
Danny Al-Gaaf [Fri, 1 Mar 2013 13:33:39 +0000 (14:33 +0100)]
mon/PGMap.cc: remove useless assigment to 'first', it's never used

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/OSDMonitor.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 13:32:09 +0000 (14:32 +0100)]
mon/OSDMonitor.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/MonmapMonitor.cc: remove unused variable
Danny Al-Gaaf [Fri, 1 Mar 2013 13:25:55 +0000 (14:25 +0100)]
mon/MonmapMonitor.cc: remove unused variable

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/MonmapMonitor.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 13:22:20 +0000 (14:22 +0100)]
mon/MonmapMonitor.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/Monitor.cc: reduce scope of reuse_caps in Monitor::_ms_dispatch()
Danny Al-Gaaf [Fri, 1 Mar 2013 13:18:04 +0000 (14:18 +0100)]
mon/Monitor.cc: reduce scope of reuse_caps in Monitor::_ms_dispatch()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/Monitor.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 13:15:08 +0000 (14:15 +0100)]
mon/Monitor.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/MonClient.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 13:02:15 +0000 (14:02 +0100)]
mon/MonClient.cc: use static_cast instead of C-Style cast

Use static_cast<T*>(m) instead of C-Style cast, add missing
include needed for static_cast.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/MDSMonitor.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 12:57:39 +0000 (13:57 +0100)]
mon/MDSMonitor.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/LogMonitor.cc: move unused variable into related code block
Danny Al-Gaaf [Fri, 1 Mar 2013 12:53:54 +0000 (13:53 +0100)]
mon/LogMonitor.cc: move unused variable into related code block

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/LogMonitor.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 12:51:57 +0000 (13:51 +0100)]
mon/LogMonitor.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/Elector.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 12:49:37 +0000 (13:49 +0100)]
mon/Elector.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomon/AuthMonitor.cc: remove unused 'std::stringstream ss'
Danny Al-Gaaf [Fri, 1 Mar 2013 12:47:10 +0000 (13:47 +0100)]
mon/AuthMonitor.cc: remove unused 'std::stringstream ss'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/flock.cc: remove unused variable 'crossed_waiting_locks'
Danny Al-Gaaf [Fri, 1 Mar 2013 12:41:48 +0000 (13:41 +0100)]
mds/flock.cc: remove unused variable 'crossed_waiting_locks'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Server.cc: reduce scope of some variables
Danny Al-Gaaf [Fri, 1 Mar 2013 12:38:11 +0000 (13:38 +0100)]
mds/Server.cc: reduce scope of some variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Server.cc: : use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 12:33:12 +0000 (13:33 +0100)]
mds/Server.cc: : use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Migrator.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 12:27:03 +0000 (13:27 +0100)]
mds/Migrator.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDS.cc: remove unused variable 'oldresolve'
Danny Al-Gaaf [Fri, 1 Mar 2013 12:20:39 +0000 (13:20 +0100)]
mds/MDS.cc: remove unused variable 'oldresolve'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDS.cc: : use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 12:20:03 +0000 (13:20 +0100)]
mds/MDS.cc: : use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDCache.cc: remove unused variables recover_q and check_q
Danny Al-Gaaf [Fri, 1 Mar 2013 12:10:32 +0000 (13:10 +0100)]
mds/MDCache.cc: remove unused variables recover_q and check_q

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDCache.cc: reduce scope of 'in' in MDCache::open_root_inode()
Danny Al-Gaaf [Fri, 1 Mar 2013 12:05:32 +0000 (13:05 +0100)]
mds/MDCache.cc: reduce scope of 'in' in MDCache::open_root_inode()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDCache.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 12:03:19 +0000 (13:03 +0100)]
mds/MDCache.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDBalancer.h: init some double variables in constructor
Danny Al-Gaaf [Fri, 1 Mar 2013 11:49:37 +0000 (12:49 +0100)]
mds/MDBalancer.h: init some double variables in constructor

Initialize double variables my_load and target_load with 0.0 in
the constructor.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/MDBalancer.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 11:40:01 +0000 (12:40 +0100)]
mds/MDBalancer.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoESession.h: initialze 'open' in the constructor with false
Danny Al-Gaaf [Fri, 1 Mar 2013 11:33:37 +0000 (12:33 +0100)]
ESession.h: initialze 'open' in the constructor with false

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/LogEvent.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 11:15:13 +0000 (12:15 +0100)]
mds/LogEvent.cc: use static_cast instead of C-Style cast

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Locker.cc: reduce scope of 'pool' in Locker::issue_client_lease()
Danny Al-Gaaf [Fri, 1 Mar 2013 11:11:01 +0000 (12:11 +0100)]
mds/Locker.cc: reduce scope of 'pool' in Locker::issue_client_lease()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: merge fdupes support from SUSE packages 85/head
Danny Al-Gaaf [Fri, 1 Mar 2013 11:02:44 +0000 (12:02 +0100)]
ceph.spec.in: merge fdupes support from SUSE packages

Use fdupes to avoid duplicated files as done in the SUSE
packages. Since it doesn't work as expected on Fedora/RHEL
do this only on SUSE based distros.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: add on non-RHEL sharutils to 'BuildRequires:'
Danny Al-Gaaf [Fri, 1 Mar 2013 10:56:54 +0000 (11:56 +0100)]
ceph.spec.in: add on non-RHEL sharutils to 'BuildRequires:'

Add sharutils to 'BuildRequires:', needed for configure.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoceph.spec.in: fix 'Requires:' to get sgdisk into the system
Danny Al-Gaaf [Fri, 1 Mar 2013 10:51:26 +0000 (11:51 +0100)]
ceph.spec.in: fix 'Requires:' to get sgdisk into the system

Fix package Requirements to get sgdisk. On RHEL/CentOS/Fedora the
package is gdisk. On SUSE/openSUSE < 12.2 it's scsirastools on
openSUSE >= 12.2 it's in gptfdisk.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agomds/Locker.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 10:41:06 +0000 (11:41 +0100)]
mds/Locker.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 agomds/CDir.h: use static_cast instead of C-Style cast
Danny Al-Gaaf [Fri, 1 Mar 2013 10:22:23 +0000 (11:22 +0100)]
mds/CDir.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 agoceph.spec.in: gdisk for for rpm based systems instead of gptfdisk.
Gary Lowell [Fri, 1 Mar 2013 06:30:43 +0000 (22:30 -0800)]
ceph.spec.in: gdisk for for rpm based systems instead of gptfdisk.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
12 years agoMerge branch 'next'
Sage Weil [Fri, 1 Mar 2013 00:58:02 +0000 (16:58 -0800)]
Merge branch 'next'

12 years agomsgr: drop messages on cons with CLOSED Pipes
Sage Weil [Thu, 28 Feb 2013 20:46:00 +0000 (12:46 -0800)]
msgr: drop messages on cons with CLOSED Pipes

Back in commit 6339c5d43974f4b495f15d199e01a141e74235f5, we tried to make
this deal with a race between a faulting pipe and new messages being
queued.  The sequence is

- fault starts on pipe
- fault drops pipe_lock to unregister the pipe
- user (objecter) queues new message on the con
- submit_message reopens a Pipe (due to this bug)
- the message managed to make it out over the wire
- fault finishes faulting, calls ms_reset
- user (objecter) closes the con
- user (objecter) resends everything

It appears as though the previous patch *meant* to drop *m on the floor in
this case, which is what this patch does.  And that fixes the crash I am
hitting; see #4271.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoosd: add 'osd debug op order' to track and assert order of client ops
Sage Weil [Thu, 28 Feb 2013 23:34:35 +0000 (15:34 -0800)]
osd: add 'osd debug op order' to track and assert order of client ops

Keep a big fat slow map in memory to ensure that client ops are applied to
objects in the order the clien sent them.  This will make it easier to
catch ordering bugs due to requeuing as soon as they happen, when the logs
are easier to wade through, and not later when the client notices something
is awry.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agoosd: include osdmap epoch in osd_op message operator<<
Sage Weil [Thu, 28 Feb 2013 23:32:24 +0000 (15:32 -0800)]
osd: include osdmap epoch in osd_op message operator<<

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agoosd: useful debugging for when we drop requests
Sage Weil [Thu, 28 Feb 2013 23:32:47 +0000 (15:32 -0800)]
osd: useful debugging for when we drop requests

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
12 years agocrush-map.rst: fix chooseleaf syntax in ssd example
Samuel Just [Thu, 28 Feb 2013 23:46:08 +0000 (15:46 -0800)]
crush-map.rst: fix chooseleaf syntax in ssd example

Fixes: 4304
Backport: bobtail
Reviewed-by: Greg Farnum <greg@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agoMerge pull request #84 from dalgaaf/wip-da-sca-style
Sage Weil [Thu, 28 Feb 2013 22:59:19 +0000 (14:59 -0800)]
Merge pull request #84 from dalgaaf/wip-da-sca-style

Some more smaller fixes

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoinit-ceph: kick off ceph-create-keys when starting mons
Sage Weil [Thu, 28 Feb 2013 21:45:04 +0000 (13:45 -0800)]
init-ceph: kick off ceph-create-keys when starting mons

We don't have a particularly tidy way to kick off ceph-create-keys from
sysvinit.  So, do something simple, ugly, and functional: if we are
starting a mon, and it looks like a 'new' type that is in /var/lib/ceph,
then start ceph-create-keys too.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoinit-ceph: fix default admin socket path used for status
Sage Weil [Thu, 28 Feb 2013 21:43:50 +0000 (13:43 -0800)]
init-ceph: fix default admin socket path used for status

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agoosd: show retry attempt in MOSDOp operator<<
Sage Weil [Thu, 28 Feb 2013 21:33:40 +0000 (13:33 -0800)]
osd: show retry attempt in MOSDOp operator<<

Signed-off-by: Sage Weil <sage@inktank.com>
12 years agomsg/Pipe: allow tuning of TCP receive buffer size
Sage Weil [Thu, 28 Feb 2013 21:01:27 +0000 (13:01 -0800)]
msg/Pipe: allow tuning of TCP receive buffer size

Performance tests on high-end machines have indicated the Linux autotuning
of the receive buffer sizes can cause throughput collapse.  See bug
#2100, and this email discussion:

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

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

Tested-by: Jim Schutt <jaschut@sandia.gov>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agomsg/Pipe: move setting of socket options into a common method
Sage Weil [Thu, 28 Feb 2013 21:00:19 +0000 (13:00 -0800)]
msg/Pipe: move setting of socket options into a common method

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
12 years agoFileJournal::wrap_read_bl: adjust pos before returning
Samuel Just [Thu, 28 Feb 2013 00:58:45 +0000 (16:58 -0800)]
FileJournal::wrap_read_bl: adjust pos before returning

Otherwise, we may feed an offset past the end of the journal to
check_header in read_entry and incorrectly determine that the entry is
corrupt.

Fixes: 4296
Backport: bobtail
Backport: argonaut
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
12 years agolibrbd/internal.cc: remove unused variable total_write 84/head
Danny Al-Gaaf [Thu, 28 Feb 2013 18:45:29 +0000 (19:45 +0100)]
librbd/internal.cc: remove unused variable total_write

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agolibrbd/internal.cc: reduce scope of 'int r'
Danny Al-Gaaf [Thu, 28 Feb 2013 18:41:37 +0000 (19:41 +0100)]
librbd/internal.cc: reduce scope of 'int r'

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agolibrados/librados.cc: don't check unsigned 'len' against less than zero
Danny Al-Gaaf [Thu, 28 Feb 2013 18:34:47 +0000 (19:34 +0100)]
librados/librados.cc: don't check unsigned 'len' against less than zero

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agolibrados/librados.cc: reduce scope of 'ret' in rados_objects_list_next()
Danny Al-Gaaf [Thu, 28 Feb 2013 18:33:03 +0000 (19:33 +0100)]
librados/librados.cc: reduce scope of 'ret' in rados_objects_list_next()

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agolibrados/librados.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Thu, 28 Feb 2013 18:30:19 +0000 (19:30 +0100)]
librados/librados.cc: use static_cast instead of C-Style cast

Use static_cast<T>() instead of C-Style cast.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agolibrados/RadosClient.cc: use static_cast instead of C-Style cast
Danny Al-Gaaf [Thu, 28 Feb 2013 18:24:27 +0000 (19:24 +0100)]
librados/RadosClient.cc: use static_cast instead of C-Style cast

Use static_cast<T>() instead of C-Style cast. Add some missing
includes to make the static_cast work.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agoMerge pull request #82 from dalgaaf/wip-da-spec
Sage Weil [Thu, 28 Feb 2013 17:29:04 +0000 (09:29 -0800)]
Merge pull request #82 from dalgaaf/wip-da-spec

ceph.spec.in: add new Requires from ceph-disk-prepare

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agoMerge pull request #83 from dalgaaf/wip-da-realloc
Sage Weil [Thu, 28 Feb 2013 17:28:39 +0000 (09:28 -0800)]
Merge pull request #83 from dalgaaf/wip-da-realloc

crush/builder.c: fix realloc handling

Reviewed-by: Sage Weil <sage@inktank.com>
12 years agocrush/builder.c: fix realloc handling 83/head
Danny Al-Gaaf [Thu, 28 Feb 2013 17:07:28 +0000 (18:07 +0100)]
crush/builder.c: fix realloc handling

Fix handling of realloc. If realloc() fails it returns NULL, assigning
the return value of realloc() directly to the pointer without checking
for the result will lead to a memory leak in error case.

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

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocrush/builder.c: fix sizeof handling of bucket->h.items
Danny Al-Gaaf [Thu, 28 Feb 2013 16:13:24 +0000 (17:13 +0100)]
crush/builder.c: fix sizeof handling of bucket->h.items

Fix sizeof handling for realloc/malloc of bucket->h.items. items are
of type __s32 and not __u32 (sizeof gives the same size, but fix it
to represent the correct type).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocls_rbd.cc: remove another unused variable
Danny Al-Gaaf [Thu, 28 Feb 2013 15:12:20 +0000 (16:12 +0100)]
cls_rbd.cc: remove another unused variable

Remove 'new_snaps' since it only used for a sizeof() call,
get the size directly from the data type of new_snaps instead.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
12 years agocls_rbd.cc: remove unused variable
Danny Al-Gaaf [Thu, 28 Feb 2013 14:56:22 +0000 (15:56 +0100)]
cls_rbd.cc: remove unused variable

Remove unused variable 'len', left over from commit
0b0009cfe8429072ba2af6f6843537d5501b27c3.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
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 agoceph.spec.in: add new Requires from ceph-disk-prepare 82/head
Danny Al-Gaaf [Thu, 28 Feb 2013 13:16:26 +0000 (14:16 +0100)]
ceph.spec.in: add new Requires from ceph-disk-prepare

Added new Requires from ceph-disk-prepare: cryptsetup, gptfdisk,
parted and util-linux.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
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>