Commit Graph

18481 Commits

Author SHA1 Message Date
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
Yehuda Sadeh
5efa821c22 rgw: swift read acls allow bucket listing
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
2012-02-23 20:22:03 -08:00
Yehuda Sadeh
f09fb870c6 rgw: fix swift acl enforcement
we'll also need to make it so that swift read acls allow bucket listing

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
2012-02-23 20:11:08 -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
Yehuda Sadeh
4dfec574ef rgw: enforce swift acls
doesn't work yet, but almost.

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
2012-02-23 17:22:53 -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
Yehuda Sadeh
f5bf9d9c7f rgw: s3 only shows s3 acls
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
2012-02-23 15:34:26 -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
Yehuda Sadeh
4d1d522943 rgw: show swift ACLs 2012-02-23 14:59:10 -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