summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "filestore: fix op queue quiesce during commit"historic/btrfs-bug-2198Sage Weil2012-03-031-8/+7
| | | | This reverts commit 1009d1a016f049e19ad729a0c00a354a3956caf7.
* Revert "filestore: wait to start op if other ops are in line"Sage Weil2012-03-031-3/+1
| | | | This reverts commit 93d7ef96316f30d3d7caefe07a5a747ce883ca2d.
* librados: only shutdown objecter after it's initializedJosh Durgin2012-03-011-2/+2
| | | | | | | | | | 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>
* Makefile: add json_spirit headers to tarballSage Weil2012-02-291-0/+10
| | | | Signed-off-by: Sage Weil <sage@newdream.net>
* Makefile: drop separate libjson_spirit.laSage Weil2012-02-281-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* ceph-osd: clarify error messagesSage Weil2012-02-282-4/+4
| | | | | | So we know where the error came from. And use real error codes in init(). Signed-off-by: Sage Weil <sage@newdream.net>
* init: Actually do start the daemons when 'service ceph start <type>' is ↵Wido den Hollander2012-02-281-2/+4
| | | | | | | | | | | | | | | | 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>
* filestore: make less noise on ENOENTSage Weil2012-02-271-2/+2
| | | | | | | 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>
* pg: use get_cluster_inst instead of get_inst in activateGreg Farnum2012-02-271-1/+1
| | | | | | | This was mistakenly broken in 4b3bb5ab37a05fa001d59f24da7d9c30d650321b Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com> Reviewed-by: Sam Just <sam.just@dreamhost.com>
* journaler: log on unexpected objecter errorSage Weil2012-02-271-1/+10
| | | | | | This will help with #2110, #1796, #1640. Signed-off-by: Sage Weil <sage@newdream.net>
* osd: fix recursive map_lock via check_replay_queue()Sage Weil2012-02-272-23/+29
| | | | | | | | | | | | | | | | | | | | | | | 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>
* init-ceph: stick with /var/run for the time beingSage Weil2012-02-261-1/+1
| | | | | | | /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>
* debian: /var/run/ceph -> /run/cephLaszlo Boszormenyi2012-02-261-1/+4
| | | | | | | | | | | /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>
* debian: build-{indep,arch}Laszlo Boszormenyi2012-02-261-2/+5
| | | | Signed-off-by: Laszlo Boszormenyi <gcs@debian.hu>
* debian: sdparm|hdparm, new standards versionLaszlo Boszormenyi2012-02-261-2/+2
| | | | Signed-off-by: Laszlo Boszormenyi <gcs@debian.hu>
* rgw: initialize bucket_id in bucket structureYehuda Sadeh2012-02-241-1/+1
| | | | | | might make valgrind a little bit less noisy. Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
* rgw: _exit(0) on SIGTERMSage Weil2012-02-241-0/+3
| | | | | | | 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>
* Merge remote branch 'gh/wip-crush-adjust'Sage Weil2012-02-244-2/+184
|\ | | | | | | Reviewed-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
| * crushtool: add --reweight-item cli testsSage Weil2012-02-233-0/+182
| | | | | | | | | | | | Test list, tree, and straw buckets. Signed-off-by: Sage Weil <sage@newdream.net>
| * crush: fix weight adjust for list, tree bucketsSage Weil2012-02-231-2/+2
| | | | | | | | | | | | | | Fix the typo. Code now matches that for straw buckets. Reported-by: ZhuRongze <zrz4ceph@gmail.com> Signed-off-by: Sage Weil <sage@newdream.net>
* | Merge remote branch 'gh/wip-mds-resetter'Sage Weil2012-02-243-35/+52
|\ \ | | | | | | | | | Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
| * | mds: clean up useless blockSage Weil2012-02-231-12/+10
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | mds: fix Resetter lockingSage Weil2012-02-232-32/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix ceph-mds --journal-resetAlexandre Oliva2012-02-222-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Complete configuration initialization for special actions, and hold Resetter lock while running reset. Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br> Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
* | | Merge branch 'wip-pg-query'Sage Weil2012-02-243-0/+188
|\ \ \ | | | | | | | | | | | | Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
| * | | osd: include timestamps in state json dumpsSage Weil2012-02-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Include the time we entered this state in the dump. Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
| * | | osd: dump recovery_state states in jsonSage Weil2012-02-243-38/+94
| | | | | | | | | | | | | | | | | | | | | | | | Use a formatter. Present a vector of states, inner to outer. Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
| * | | osd: query Peering substatesSage Weil2012-02-242-0/+53
| | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | | osd: query recovery state machineSage Weil2012-02-243-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'stable'Sage Weil2012-02-244-4/+37
|\ \ \ \
| * | | | v0.42.2v0.42.2Sage Weil2012-02-242-1/+7
| | | | |
| * | | | Merge remote-tracking branch 'gh/stable' into stableSage Weil2012-02-242-3/+30
| |\ \ \ \
| | * | | | osd: conditionally encode old pg_pool_t when no CEPH_FEATURE_OSDENCGreg Farnum2012-02-232-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes OSDMap compatibility between v0.42 and <v0.42. For MOSDMap, reencode maps if OSDENC feature is missing. Also rev the message version. We don't use COMPAT version here because v3 can't be understood by v2 (that's why we're checking feature bits). (It will be possible to do that later when our constituent types can be decoded by multiple versions.) Fixes: #2095 Signed-off-by: Sage Weil <sage@newdream.net> Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
* | | | | | Merge branch 'stable'Sage Weil2012-02-242-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | v0.42.1v0.42.1Sage Weil2012-02-232-1/+7
| | | | | |
| * | | | | debian: add ceph-dencoderSage Weil2012-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | | | | ceph.spec.in: add ceph-dencoderSage Weil2012-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | | | | ceph-dencoder: man pageSage Weil2012-02-233-1/+292
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
* | | | | osd: fix array indexSage Weil2012-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
* | | | | lockdep: don't make noise on startupSage Weil2012-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Who cares! Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
* | | | | formatter: fix trailing dump_stream()Sage Weil2012-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Merge branch 'wip-2007'Sage Weil2012-02-2423-6/+2377
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
| * | | | osd: use blocks for readability in list_missingSage Weil2012-02-241-22/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@newdream.net>
| * | | | osd: add tunable for number of records in osd command repliesSage Weil2012-02-242-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g., 'pg <pgid> list_missing [offset]'. Signed-off-by: Sage Weil <sage@newdream.net>
| * | | | osd: 'pg <pgid> list_missing <json hobject_t offset>'Sage Weil2012-02-241-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | hobject_t: decode jsonSage Weil2012-02-242-0/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
| * | | | add libjson_spirit.laSage Weil2012-02-2416-1/+2288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | osd: pass in data to do_commandSage Weil2012-02-244-5/+7
|/ / / / | | | | | | | | | | | | Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
* | | | osd: 'tell osd.N mark_unfound_lost revert' -> 'pg <pgid> mark_unfound_lost ↵Sage Weil2012-02-243-55/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert' More consistent interface. Fixes: #2030 Signed-off-by: Sage Weil <sage.weil@dreamhost.com> Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
* | | | lockdep: warn on stderr (via derr), not stdoutSage Weil2012-02-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we screw up ceph-conf output and the like. Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
View Lorry Controller Status