Commit Graph

18370 Commits

Author SHA1 Message Date
Sage Weil
9fa8781c01 v0.43 2012-03-02 08:53:30 -08:00
Josh Durgin
cd31388578 librados: only shutdown objecter after it's initialized
The objecter is only initialized once the RadosClient state is
CONNECTED from the perspective of a RadosClient::shutdown()
caller. Error paths in RadosClient::connect() may call shutdown while
still in the CONNECTING state.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
2012-03-01 17:16:29 -08:00
Sage Weil
749281eda7 Makefile: add json_spirit headers to tarball
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-29 16:21:15 -08:00
Sage Weil
fd0712dfb4 Makefile: drop separate libjson_spirit.la
automake seems to have difficulty with the .la dependency on another .la.
Since libjson_spirit.la is only used by libcommon.la anyway, just build it
directly into that.  Sigh.

...
CXXLD libjson_spirit.la
AR libmds.a
CXXLD libcls_rbd.la
CXXLD libcls_rgw.la
CXXLD cephfs
CCLD test_ioctls
CC libcommon_la-ceph_ver.lo
CXX libcommon_la-version.lo
CXX ceph_dencoder.o
CCLD mount.ceph
CC ceph_ver.o
CXX test_libhadoopcephfs_build-version.o
CXXLD test_libhadoopcephfs_build
CXXLD libcommon.la
libtool: link: cannot find the library `libjson_spirit.la' or unhandled argument `libjson_spirit.la'

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-28 09:30:47 -08:00
Sage Weil
a7de459f69 ceph-osd: clarify error messages
So we know where the error came from.  And use real error codes in init().

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-28 09:11:59 -08:00
Wido den Hollander
97926e1846 init: Actually do start the daemons when 'service ceph start <type>' is specified
A bug in my previous patch prevented any daemon with auto_start set to false from starting.

This patch allows:
* /etc/init.d/ceph start osd|mds|mon
* service ceph start osd|mds|mon

It however does not start daemons if auto_start is disabled when you invoke:
* /etc/init.d/ceph start
* service ceph start

Signed-off-by: Wido den Hollander <wido@widodh.nl>
2012-02-28 09:10:52 -08:00
Sage Weil
1917024134 filestore: make less noise on ENOENT
Don't generate high-level log spam on every open error.

Signed-off-by: Sage Weil <sage@newdream.net>
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
2012-02-27 15:13:35 -08:00
Greg Farnum
244b702966 pg: use get_cluster_inst instead of get_inst in activate
This was mistakenly broken in 4b3bb5ab37

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Reviewed-by: Sam Just <sam.just@dreamhost.com>
2012-02-27 14:49:34 -08:00
Sage Weil
ee4d99099f journaler: log on unexpected objecter error
This will help with #2110, #1796, #1640.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-27 11:39:53 -08:00
Sage Weil
91b119a064 osd: fix recursive map_lock via check_replay_queue()
Also drop activate_pg() helper while we're at it, so it's clear that we
are the only user.

recursive lock of OSD::map_lock (33)
 ceph version 0.42-146-g7ad35ce (commit:7ad35ce489cc5f9169eb838e1196fa2ca4d6e985)
2012-02-24 12:30:16.541416 1: (PG::lock(bool)+0x2a) [0xa09348]
2012-02-24 12:30:16.541424 2: (OSD::_lookup_lock_pg(pg_t)+0xbd) [0x84b8df]
2012-02-24 12:30:16.541431 3: (OSD::activate_pg(pg_t, utime_t)+0x9f) [0x87463b]
2012-02-24 12:30:16.541442 4: (OSD::check_replay_queue()+0x12f) [0x87452d]
2012-02-24 12:30:16.541450 5: (OSD::tick()+0x23c) [0x8535ea]
2012-02-24 12:30:16.541456 6: (OSD::C_Tick::finish(int)+0x1f) [0x881671]
2012-02-24 12:30:16.541462 7: (SafeTimer::timer_thread()+0x2d5) [0x8f8211]
2012-02-24 12:30:16.541468 8: (SafeTimerThread::entry()+0x1c) [0x8f923c]
2012-02-24 12:30:16.541475 9: (Thread::_entry_func(void*)+0x23) [0x9c8109]
2012-02-24 12:30:16.541485 10: (()+0x68ba) [0x7f9dbed838ba]
2012-02-24 12:30:16.541491 11: (clone()+0x6d) [0x7f9dbd66f02d]
2012-02-24 12:30:16.541495 common/lockdep.cc: In function 'int lockdep_will_lock(const char*, int)' thread 7f9db9d98700 time 2012-02-24 12:30:16.541504

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Reviewed-by: Sam Just <samuel.just@dreamhost.com>
2012-02-27 09:56:21 -08:00
Sage Weil
402ece5e31 init-ceph: stick with /var/run for the time being
/run isn't present on older systems.  Stick with the old location until it
is more pervasive, or we add an autoconf option to control it.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-26 20:56:05 -08:00
Laszlo Boszormenyi
41295b584a debian: /var/run/ceph -> /run/ceph
/run/ceph should exists for creating UNIX domain sockets
ceph uses UNIX domain sockets for internal communication. Create their
directory on startup as /run is on a virtual filesystem.

Last-Update: <2012-02-26>
Bug-Debian: http://bugs.debian.org/660238
Forwarded: <ceph-devel@vger.kernel.org>
Signed-off-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
2012-02-26 20:47:53 -08:00
Laszlo Boszormenyi
0d8b5756e1 debian: build-{indep,arch}
Signed-off-by: Laszlo Boszormenyi <gcs@debian.hu>
2012-02-26 20:45:52 -08:00
Laszlo Boszormenyi
3ad6ccb4a6 debian: sdparm|hdparm, new standards version
Signed-off-by: Laszlo Boszormenyi <gcs@debian.hu>
2012-02-26 20:45:06 -08:00
Yehuda Sadeh
266902a993 rgw: initialize bucket_id in bucket structure
might make valgrind a little bit less noisy.

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
2012-02-24 17:01:32 -08:00
Sage Weil
f8f6e4d850 rgw: _exit(0) on SIGTERM
We need to do something a bit smarter to get coverage information, but this
is a start.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-24 15:32:07 -08:00
Sage Weil
708be0a5ab Merge remote branch 'gh/wip-crush-adjust'
Reviewed-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
2012-02-24 13:52:32 -08:00
Sage Weil
b0feba56bd Merge remote branch 'gh/wip-mds-resetter'
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
2012-02-24 13:48:06 -08:00
Sage Weil
5c6e8b3795 Merge branch 'wip-pg-query'
Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
2012-02-24 13:43:43 -08:00
Sage Weil
008ce6b2d4 Merge branch 'stable' 2012-02-24 13:22:49 -08:00
Sage Weil
732f3ec94e v0.42.2 2012-02-24 13:00:39 -08:00
Sage Weil
321ba67f1b Merge remote-tracking branch 'gh/stable' into stable 2012-02-24 13:00:33 -08:00
Sage Weil
be761149f5 Merge branch 'stable' 2012-02-24 12:54:41 -08:00
Sage Weil
d85ed91cc7 osd: fix array index
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-24 12:40:50 -08:00
Sage Weil
722e9e59cb lockdep: don't make noise on startup
Who cares!

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 12:40:34 -08:00
Sage Weil
fdaed0a7a2 formatter: fix trailing dump_stream()
Flush a previous dump_stream() if it was the last thing prior to a
close_section().

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 12:40:13 -08:00
Sage Weil
7ad35ce489 osd: include timestamps in state json dumps
Include the time we entered this state in the dump.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 12:04:29 -08:00
Sage Weil
185c6b1fd8 Merge branch 'wip-2007'
Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
2012-02-24 12:00:00 -08:00
Sage Weil
e22adac224 osd: use blocks for readability in list_missing
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-24 11:59:20 -08:00
Sage Weil
6d90a6ddc8 osd: dump recovery_state states in json
Use a formatter.  Present a vector of states, inner to outer.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 11:33:57 -08:00
Sage Weil
a7c8bfbea0 osd: query Peering substates
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-24 11:33:57 -08:00
Sage Weil
e22a45a18d osd: query recovery state machine
For now, just append this to the end of the pg <pgid> query json dump.
We definitely want to do something smarter here, but I'm not sure whether
json or plaintext is the way to go.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-24 11:33:57 -08:00
Sage Weil
d3b203af16 osd: add tunable for number of records in osd command replies
e.g., 'pg <pgid> list_missing [offset]'.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-24 11:24:45 -08:00
Sage Weil
91fbc687eb osd: 'pg <pgid> list_missing <json hobject_t offset>'
Dump missing objects in json.  If more key is non-zero, user should ask for
more by passing the last object as the offset for the next request.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 11:24:44 -08:00
Sage Weil
6c257c4d12 hobject_t: decode json
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 11:24:44 -08:00
Sage Weil
2677c72fde add libjson_spirit.la
This is lightweight and relies on boost spirit, which we already use, so
there are no new dependencies.

There were some other libraries that also looked good, but they weren't
already packages for existing Debian distros like squeeze or even wheezy.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 11:24:44 -08:00
Sage Weil
0361a3c431 osd: pass in data to do_command
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 11:24:44 -08:00
Sage Weil
c9416e6184 osd: 'tell osd.N mark_unfound_lost revert' -> 'pg <pgid> mark_unfound_lost revert'
More consistent interface.

Fixes: #2030
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
2012-02-24 11:24:04 -08:00
Sage Weil
6403852426 lockdep: warn on stderr (via derr), not stdout
Otherwise we screw up ceph-conf output and the like.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-24 11:15:12 -08:00
Sage Weil
804f243b2a do_autogen.sh: -T for --without-tcmalloc
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-24 11:15:04 -08:00
Sage Weil
7c7349ef5d ceph: fix help.t
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-23 18:58:35 -08:00
Sage Weil
c3e1291da9 v0.42.1 2012-02-23 18:48:57 -08:00
Sage Weil
0281f1c61d debian: add ceph-dencoder
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 18:48:57 -08:00
Sage Weil
f6e42a8ba8 ceph.spec.in: add ceph-dencoder
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 18:48:57 -08:00
Sage Weil
730b9ee0dc ceph-dencoder: man page
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 18:48:57 -08:00
Greg Farnum
cbf79a97d1 ceph-tool: remove reference to "stop" command
This doesn't exist any more, and I don't think it
ever "cleanly shut down the filesystem" -- certainly not
within my recent lifetime!

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Reviewed-by: Dan Mick <dan.mick@dreamhost.com>
2012-02-23 18:13:54 -08:00
Greg Farnum
3bad945bd3 mds: remove unused MDBalancer dump_pop_map() function.
Commenting it out is not the right answer. ;)

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Reviewed-by: Dan Mick <dan.mick@dreamhost.com>
2012-02-23 18:13:43 -08:00
Sage Weil
065d6dd8d7 mds: clean up useless block
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 16:35:41 -08:00
Sage Weil
159f2b864c mds: fix Resetter locking
We need to hold the lock for ms_dispatch, esp calls into objecter.  We
should only drop it when blocking; use distinct naming for the on-stack
mutex used for that.

Reported-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-23 16:35:41 -08:00
Greg Farnum
c88da93ecd Merge remote branch 'origin/wip-mds-old-inodes'
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
2012-02-23 15:33:39 -08:00