Commit Graph

18403 Commits

Author SHA1 Message Date
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
Greg Farnum
5aa60ce416 Merge remote branch 'origin/wip-dencoder'
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
2012-02-23 15:06:32 -08:00
Greg Farnum
db99217b2a Merge remote branch 'origin/wip-1820'
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
2012-02-23 15:06:15 -08:00
Sage Weil
e8bc42ff43 osd: only set CLEAN when we are not remapped (up == acting)
If we have a temporary mapping for this PG, consider that unclean.  This
makes CLEAN and REMAPPED mutually exclusive.  For example, a 2 node cluster
with 2x replication and one osd marked out will make the pgs all
active+remapped, not active+clean+remapped.

Fixes: #2094
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 15:05:46 -08:00
Sage Weil
d8df5655c2 Merge remote-tracking branch 'gh/wip-pg-query'
Reviewed-by: Josh Durgin <josh.durgin@dreamhost.com>
2012-02-23 14:56:54 -08:00
Greg Farnum
ddc9998322 osd: conditionally encode old pg_pool_t when no CEPH_FEATURE_OSDENC
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>
2012-02-23 14:55:48 -08:00
Sage Weil
cd9f7df917 Merge remote-tracking branch 'gh/wip-dump-ops-in-flight'
Reviewed-by: Sage Weil <sage@newdream.net>
2012-02-23 14:38:03 -08:00
Sage Weil
d85e9153ef mon: use pending_mdsmap for deactivate
We should always look at the proposed map to avoid weird races.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 14:28:46 -08:00
Sage Weil
a1544c0e06 doc: 'deactivate mds' instead of 'stop mds'
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 14:28:46 -08:00
Sage Weil
079dd6db38 mon: mds "stop" -> "deactivate"
See #1820.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 14:28:46 -08:00
Greg Farnum
700fe079b2 test: add basic test for the OSD's dump_ops_in_flight adminsocket command
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
2012-02-23 12:12:17 -08:00
Greg Farnum
5944016b05 osd: add "dump_ops_in_flight" to the AdminSocket.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
2012-02-23 12:12:14 -08:00
Sage Weil
21c43133c2 mon: refuse to stop mds if max_mds will make it rejoin
Otherwise the MDS will leave the cluster and immediately rejoin, which is
useless and confusing to users.  See #1820.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 12:08:52 -08:00
Sage Weil
7700ea94f9 crushtool: add --reweight-item cli tests
Test list, tree, and straw buckets.

Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 11:53:48 -08:00
Sage Weil
286df2db3e crush: fix weight adjust for list, tree buckets
Fix the typo.  Code now matches that for straw buckets.

Reported-by: ZhuRongze <zrz4ceph@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
2012-02-23 11:39:57 -08:00
Sage Weil
963dec8288 Merge branch 'wip-2090'
Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
2012-02-23 11:16:17 -08:00
Sage Weil
62a113aaa7 mon: unlock mon before msgr shutdown
The ceph_mon.cc main() will delete mon when the msgr dispatch thread
completes.  Make sure we unlock before we shut down the messenger, and
avoid touching this after messenger->shutdown().

Fixes: #2090
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-23 11:15:05 -08:00
Sage Weil
d1fe2f8fd7 mon: deprecate mon 'stop' command
Send SIGTERM.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2012-02-23 11:15:05 -08:00