Commit Graph

27335 Commits

Author SHA1 Message Date
Sage Weil
b55e455ed4 Merge pull request #395 from kri5/wip-vstart-documentation
doc: Add a page to document vstart.sh script
2013-07-08 13:35:46 -07:00
Christophe Courtaut
eec903a6ec doc: Fix env variables in vstart.sh documentation
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
2013-07-08 22:19:21 +02:00
Yehuda Sadeh
784ce25842 Merge pull request #406 from kri5/wip-3074
rgw: Add --help support to radosgw

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-08 11:43:13 -07:00
Christophe Courtaut
6f1653a6d5 rgw: Add --help support to radosgw
http://tracker.ceph.com/issues/3074 fixes #3074

The support of --help option is added through this patch.
By now, it displays the generic options usage used in radosgw.

Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
2013-07-08 11:40:20 +02:00
Yehuda Sadeh
d09ce3df2e rgw: fix rgw_remove_bucket()
function was referring bucket info object directly, instead of going
through helper functions, which is now a must.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-04 23:44:02 -07:00
Christophe Courtaut
a793e203fd doc: Add a page to document vstart.sh script
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
2013-07-04 14:08:41 +02:00
Sage Weil
c14847c304 .gitignore: cls_test_*
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-03 22:04:10 -07:00
Sage Weil
46b7fc2ed9 radosgw-admin: fix cli test
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-03 21:43:37 -07:00
Yehuda Sadeh
a0b1be99ea rgw: fix type encoding
due to bad merge

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-03 18:08:47 -07:00
Yehuda Sadeh
d30fc4bdd1 Merge remote-tracking branch 'origin/master' into wip-rgw-geo
Conflicts:
	src/Makefile.am
	src/include/rados/librados.hpp
	src/rgw/rgw_admin.cc
	src/rgw/rgw_bucket.cc
	src/rgw/rgw_common.cc
	src/rgw/rgw_common.h
	src/rgw/rgw_json_enc.cc
	src/rgw/rgw_main.cc
	src/rgw/rgw_op.h
	src/rgw/rgw_rados.cc
	src/rgw/rgw_tools.cc
	src/rgw/rgw_user.cc
	src/rgw/rgw_user.h

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-03 17:09:56 -07:00
Yehuda Sadeh
a825ae7a4d rgw: remove a few warnings
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-03 13:23:58 -07:00
Yehuda Sadeh
dc29c7a437 rgw: renamed a few unit tests
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-03 13:17:10 -07:00
Yehuda Sadeh
c2873c1d23 rgw: make rgw_cls_complete_op backward compatible
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-03 13:04:45 -07:00
Yehuda Sadeh
20e3abcc6a rgw: make rgw_bucket_dir_entry backward compatible
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-03 11:38:43 -07:00
Yan, Zheng
4fb782c38c mds: fix O_TRUNC locking
When truncating a file, we should xlock the corresponding filelock.
(revoke any Fw caps from clients).

[note from sw: setattr on size also takes the filelock xlock.]

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-03 11:13:35 -07:00
Sage Weil
cd44a62371 Makefile: include rbdmap in dist tarball
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-03 11:11:19 -07:00
Sage Weil
2f9afb862d Merge pull request #390 from ksperis/rbdmap.init-2
init-rbdmap install

Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-03 07:03:35 -07:00
Yehuda Sadeh
9941171436 rgw: keep max_marker on bucket index
and expose it via the REST interface

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 21:29:12 -07:00
Sage Weil
9376ce4f08 Merge remote-tracking branch 'gh/next'
Conflicts:
	src/mon/OSDMonitor.cc
2013-07-02 19:43:17 -07:00
Yehuda Sadeh
2eea41a471 Merge remote-tracking branch 'origin/wip-rgw-geo-2' into wip-rgw-geo 2013-07-02 18:59:22 -07:00
Yehuda Sadeh
f571bd38f6 Merge pull request #382 from kri5/wip-5324
rgw: admin: Add --shard-id option to help

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 18:26:38 -07:00
Yehuda Sadeh
24699cce9b Merge branch 'wip-rgw-geo-2' into wip-rgw-geo
Conflicts:
	src/rgw/rgw_admin.cc
	src/rgw/rgw_common.cc
	src/rgw/rgw_common.h
	src/rgw/rgw_rest.cc
	src/rgw/rgw_rest_log.cc

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 18:13:41 -07:00
Yehuda Sadeh
0da7da8263 unitests: fix compilation
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 18:01:09 -07:00
Dan Mick
9942efde77 mon: dead code removal
Remove code for 'mds cluster_fail', 'osd tell', and auth_usage()

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-02 17:10:35 -07:00
Sage Weil
09e9fef028 Merge branch 'wip-ceph-disk'
Passed ceph-deploy suite.

Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-07-02 16:55:26 -07:00
Yehuda Sadeh
5c053b1073 rgw: handle new rest operations
md + data logs, get shard info

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 16:30:15 -07:00
Yehuda Sadeh
fcc423d659 rgw: RESTful api for shards info
For both mdlog, datalog

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 16:15:42 -07:00
Yehuda Sadeh
19828cb89e cls_log: store info in header, new op to retrieve it
Keep max_timestamp, max_marker. Add a new op to retrieve header.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 15:38:49 -07:00
Yehuda Sadeh
b3f6423e70 rgw: replica log RESTful api uses bucket instance id
Modified RESTful api for replica log to use bucket instance id
instead of bucket name.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 15:02:30 -07:00
Yehuda Sadeh
e10005c55f rgw: rework replica log + RESTful api
Rather than making the caller code handle encode/decode/dump etc,
we introduce an RGWReplicaBounds struct which the RGWReplicaLogger classes
traffic in (instead of the string marker, utime_t time, and list of pairs of
items). Right now this is just referring to cls_replica_log internal structs,
but we use typedefs so that we can cleanly change them over later and avoid
crossing the namespaces too much.

This greatly reduces the amount of code in rgw_rest_replica_log -- hurrah!

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-02 15:02:30 -07:00
Yehuda Sadeh
288088d273 cls_replica_log: implement decode_json for the types
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-02 15:02:30 -07:00
Greg Farnum
7db133ddaf ceph_json: add a utime_t decoder
This needs to be cleaned up a bit as we don't actually want to
import rgw_common into ceph_json (we'll need to pull the parse_date
out of that and into somewhere more accessible/appropriate).

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-02 15:02:25 -07:00
Sage Weil
87c98e92d1 sysvinit, upstart: handle symlinks to dirs in /var/lib/ceph/*
Match a symlink to a dir, not just dirs.  This fixes the osd case of e.g.,
creating an osd in /data/osd$id in which ceph-disk makes a symlink from
/var/lib/ceph/osd/ceph-$id.

Fix proposed by Matt Thompson <matt.thompson@mandiant.com>; extended to
include the upstart users too.

Fixes: #5490
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-07-02 14:43:17 -07:00
Sage Weil
cb97338b11 ceph-disk: handle /dev/foo/bar devices throughout
Assume the last component is the unique device name, even if it appears
under a subdir of /dev.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-02 14:00:15 -07:00
Sage Weil
e082f1247f ceph-disk: make is_held() smarter about full disks
Handle the case where the device is a full disk.  Make the partition
check a bit more robust (don't make assumptions about naming aside from
the device being a prefix of the partition).

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-02 14:00:15 -07:00
Sage Weil
a4805efc18 osdc/Objecter: resend command map version checks on reconnect
We already do this for Ops and LingerOps, but missed this when we added
CommandOps to the mix.  The result is that an ill-timed mon disconnect will
leave a command map check (and thus the command) hanging.

This misbehavior was introduced when CommandOp was introduced, back in
commit 2e172225b0, and we failed to fix it
in 8808ca57c6.

Fixes: #5493
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-02 13:43:29 -07:00
Greg Farnum
653bc2de09 common: move parse_time into utime_t header
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-02 13:06:06 -07:00
Greg Farnum
370d1752ed rgw: remove get_bound_info from RGWReplicaLogger
It doesn't have any users and we're about to expose a wrapper class instead.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-02 12:39:12 -07:00
Greg Farnum
b6c836657d key_value_store: fixup errno handling
Don't use "errno" as a variable name, and include <errno.h>
instead of some of the specific paths.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-02 12:39:12 -07:00
Babu Shanmugam
fc7d6227d3 RESTful implementation to dump regionmap implementation
Signed-off-by: Babu Shanmugam <anbu@enovance.com>
2013-07-02 12:39:12 -07:00
Babu Shanmugam
641bd2fa38 RESTful API implementation for replica_log
Signed-off-by: Babu Shanmugam <anbu@enovance.com>
2013-07-02 12:38:28 -07:00
Sage Weil
08cf4c0d9a Merge pull request #386 from ceph/wip-osd-xattr
automatically enable xattrs in omap; make size limits well defined

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-07-02 11:32:23 -07:00
Simon Leinen
da1fb93fab mds: man page: Fixed cut & paste error 2013-07-02 11:03:39 -07:00
athanatos
32673bd095 Merge pull request #388 from dachary/master
set object_info_t pool of an ObjectContext if it is undefined or bad

Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-07-02 10:53:04 -07:00
Loic Dachary
a4cd631776 set object_info_t pool of an ObjectContext if it is undefined or bad
When reading object_info_t from an existing object attribute, the pool
may be < 0 and should be set to the pool containing the object. This is done
on the oi object on the stack but overriden later by:

    obc->obs.oi.decode(bv);

This decode is superfluous and is removed so that it does not override
the modified value of the pool.

Signed-off-by: Loic Dachary <loic@dachary.org>
2013-07-02 19:40:32 +02:00
Laurent Barbe
0efcccdcc2 Move rbdmap file to /etc/ceph
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2013-07-02 16:53:11 +02:00
Laurent Barbe
ffe7045893 install rules for init-rbdmap
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2013-07-02 16:50:40 +02:00
Christophe Courtaut
6ff2b16b5f rgw-admin: Adds option --shard-id to help.t
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
2013-07-02 15:27:02 +02:00
Christophe Courtaut
3a20b06938 rgw: admin: Add --shard-id option to help
http://tracker.ceph.com/issues/5324 fixes #5324
Explains operations dependency,
which is more important than the semantic.

Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
2013-07-02 15:24:02 +02:00
Yehuda Sadeh
08123b6a13 Merge pull request #387 from ceph/wip-5346
rgw: add RGWFormatter_Plain allocation to sidestep cranky strlen()

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-01 21:00:02 -07:00