]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
13 years agolog: add missing .cc file
Sage Weil [Wed, 30 May 2012 22:35:30 +0000 (15:35 -0700)]
log: add missing .cc file

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agolog: uninline SubsystemMap mutators
Sage Weil [Wed, 30 May 2012 22:15:50 +0000 (15:15 -0700)]
log: uninline SubsystemMap mutators

This lets you do something like

 p g_ceph_context->_conf->subsys.set_log_level(ceph_subsys_mon, 20)

from gdb.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agofilestore: fix my broken ifdef flow
Sage Weil [Wed, 30 May 2012 22:06:07 +0000 (15:06 -0700)]
filestore: fix my broken ifdef flow

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agodoc: ceph.conf cleanup for cephx authentication.
John Wilkins [Wed, 30 May 2012 21:41:42 +0000 (14:41 -0700)]
doc: ceph.conf cleanup for cephx authentication.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agodoc: fix broken link.
John Wilkins [Wed, 30 May 2012 21:40:08 +0000 (14:40 -0700)]
doc: fix broken link.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agodoc: Added -a to service ceph stop.
John Wilkins [Wed, 30 May 2012 21:29:51 +0000 (14:29 -0700)]
doc: Added -a to service ceph stop.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agodoc: Consolidated mkcephfs deployment files.
John Wilkins [Wed, 30 May 2012 21:29:10 +0000 (14:29 -0700)]
doc: Consolidated mkcephfs deployment files.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agoosd: fix null dereference
Sage Weil [Wed, 30 May 2012 21:28:46 +0000 (14:28 -0700)]
osd: fix null dereference

The pg arg is optional!

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agodoc: Added pools and authentication.
John Wilkins [Wed, 30 May 2012 20:48:04 +0000 (13:48 -0700)]
doc: Added pools and authentication.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agomon: fix reweight_by_utilization waiting
Sage Weil [Wed, 30 May 2012 18:53:18 +0000 (11:53 -0700)]
mon: fix reweight_by_utilization waiting

Propose if we changed something, but not if we don't.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoosd: fix rewewight_by_utilization
Sage Weil [Wed, 30 May 2012 18:53:35 +0000 (11:53 -0700)]
osd: fix rewewight_by_utilization

Update the incremental, not the in-memory OSDMap!

Fixes: #2454
Signed-off-by: Sage Weil <sage@newdream.net>
13 years agofilestore: log about syncfs(2) etc support
Sage Weil [Wed, 30 May 2012 18:14:26 +0000 (11:14 -0700)]
filestore: log about syncfs(2) etc support

Fixes: #2479
Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoMerge remote-tracking branch 'gh/stable'
Sage Weil [Wed, 30 May 2012 18:02:36 +0000 (11:02 -0700)]
Merge remote-tracking branch 'gh/stable'

13 years agodoc: Updated authentication with header canonicalization.
John Wilkins [Wed, 30 May 2012 17:14:30 +0000 (10:14 -0700)]
doc: Updated authentication with header canonicalization.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agoMerge remote-tracking branch 'gh/wip-2349'
Sage Weil [Wed, 30 May 2012 17:05:01 +0000 (10:05 -0700)]
Merge remote-tracking branch 'gh/wip-2349'

Reviewed-by: Sage Weil <sage@newdream.net>
13 years agoworkloadgen: Fix the statistics output and a bug triggered by coll destruction
Joao Eduardo Luis [Wed, 30 May 2012 01:10:35 +0000 (18:10 -0700)]
workloadgen: Fix the statistics output and a bug triggered by coll destruction

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
13 years agofilestore: initialize dummy xattr buffer
Sage Weil [Wed, 30 May 2012 16:13:48 +0000 (09:13 -0700)]
filestore: initialize dummy xattr buffer

Shut up valgrind.

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoosd: fix misdirected op check
Sage Weil [Wed, 30 May 2012 03:41:38 +0000 (20:41 -0700)]
osd: fix misdirected op check

The sense of this check was wrong from the get-go, back in a5d99add.  Fix
it.  This may be silencing a lot of misdirected op noise!

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agotest_filestore_workloadgen: less noise
Sage Weil [Tue, 29 May 2012 23:43:36 +0000 (16:43 -0700)]
test_filestore_workloadgen: less noise

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agotest_filestore_workloadgen: write zeros, not random bytes
Sage Weil [Tue, 29 May 2012 23:41:42 +0000 (16:41 -0700)]
test_filestore_workloadgen: write zeros, not random bytes

The random byte generation is sufficiently slow that it skews the results.
Zeros are good enough!

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agorados.cc: added listomap and getomap commands
Eleanor Cawthon [Tue, 29 May 2012 18:59:15 +0000 (11:59 -0700)]
rados.cc: added listomap and getomap commands

Signed-off-by: Eleanor Cawthon <eleanor.cawthon@inktank.com>
13 years agolibrados.h: update rados_object_list_next documentation for key/locator
Samuel Just [Tue, 29 May 2012 17:30:51 +0000 (10:30 -0700)]
librados.h: update rados_object_list_next documentation for key/locator

*entry and *key don't need to be freed, and are only valid until the
next call to rados_objects_list_*.

Signed-off-by: Samuel Just <sam.just@inktank.com>
13 years agodoc: needed carriage returns between headings, code tag and syntax.
John Wilkins [Fri, 25 May 2012 23:15:14 +0000 (16:15 -0700)]
doc: needed carriage returns between headings, code tag and syntax.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agodoc: removed redundant install.
John Wilkins [Fri, 25 May 2012 23:03:48 +0000 (16:03 -0700)]
doc: removed redundant install.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agodoc: Filled in descriptions for object operations.
John Wilkins [Fri, 25 May 2012 23:03:02 +0000 (16:03 -0700)]
doc: Filled in descriptions for object operations.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agoceph.spec.in: buildrequires libuuid-devel
Sage Weil [Fri, 25 May 2012 16:29:08 +0000 (09:29 -0700)]
ceph.spec.in: buildrequires libuuid-devel

Reported-by: Guido Winkelmann <guido-ceph@thisisnotatest.de>
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoceph.spec.in: drop unnecessary rmdirs
Sage Weil [Fri, 25 May 2012 16:28:07 +0000 (09:28 -0700)]
ceph.spec.in: drop unnecessary rmdirs

This hunk was inadvertantly included in a330c64.

Reported-by: Guido Winkelmann <guido-ceph@thisisnotatest.de>
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agodoc: Restored install for dev/unstable packages.
John Wilkins [Thu, 24 May 2012 23:54:15 +0000 (16:54 -0700)]
doc: Restored install for dev/unstable packages.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agofilestore: make SNAP_DESTROY ioctl check more informative
Sage Weil [Thu, 24 May 2012 22:01:39 +0000 (15:01 -0700)]
filestore: make SNAP_DESTROY ioctl check more informative

Tell user about user_subvol_rm_allowed mount option.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: fix btrfs subvol ioctl tests
Sage Weil [Thu, 24 May 2012 21:53:30 +0000 (14:53 -0700)]
filestore: fix btrfs subvol ioctl tests

Create a temp subvol that *we own* to test snaps against.  Otherwise, we
won't be able to remove them if we weren't the owner of the source subvol
we were snapshotting when we are not root.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: verify that op_seq is nonzero
Sage Weil [Thu, 24 May 2012 21:07:36 +0000 (14:07 -0700)]
filestore: verify that op_seq is nonzero

If we get zero from commit_op_seq something is very wrong, and we should
not continue.  Broken mkfs or something deleted commit_op_seq file.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agovstart.sh: wipe out btrfs subvols in osd dirs
Sage Weil [Thu, 24 May 2012 21:05:27 +0000 (14:05 -0700)]
vstart.sh: wipe out btrfs subvols in osd dirs

For testing on btrfs.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: fix initial btrfs snap creation (on mkfs)
Sage Weil [Thu, 24 May 2012 21:05:09 +0000 (14:05 -0700)]
filestore: fix initial btrfs snap creation (on mkfs)

Create the snap_1 snap of current *after* we write the op_seq.  Otherwise
we will mistakingly believe the snapshot is of op seq 0.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agorgw: replace dump_format() with dump_int()
Yehuda Sadeh [Thu, 24 May 2012 20:03:45 +0000 (13:03 -0700)]
rgw: replace dump_format() with dump_int()

Cleanup, fixes issue #2469.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agoMerge branch 'stable'
Josh Durgin [Thu, 24 May 2012 16:47:41 +0000 (09:47 -0700)]
Merge branch 'stable'

13 years agolibrados, ObjectCacher: include limits.h for INT_MAX
Josh Durgin [Thu, 24 May 2012 16:43:23 +0000 (09:43 -0700)]
librados, ObjectCacher: include limits.h for INT_MAX

This was required to build on CentOS 6.2. I'm not sure why it worked
without it on Debian.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
13 years agorbd.py: Fix seemingly-random segfaults
Dan Mick [Thu, 24 May 2012 02:21:30 +0000 (19:21 -0700)]
rbd.py: Fix seemingly-random segfaults

Avoid resetting Image.closed until image is successfully opened.

Fixes: #2475
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
13 years agolibrados: Remove errant sha1
Dan Mick [Thu, 24 May 2012 02:18:48 +0000 (19:18 -0700)]
librados: Remove errant sha1

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
13 years agorbd.py doc: Fix markup on :class: references
Dan Mick [Thu, 24 May 2012 02:18:01 +0000 (19:18 -0700)]
rbd.py doc: Fix markup on :class: references

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
13 years agoMerge branch 'osd-mkfs'
Sage Weil [Wed, 23 May 2012 23:42:49 +0000 (16:42 -0700)]
Merge branch 'osd-mkfs'

Reviewed-by: Sam Just <sam.just@inktank.com>
13 years agoMerge remote-tracking branch 'gh/wip-mon-auth'
Sage Weil [Wed, 23 May 2012 23:41:57 +0000 (16:41 -0700)]
Merge remote-tracking branch 'gh/wip-mon-auth'

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agoMerge branch 'stable'
Sage Weil [Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)]
Merge branch 'stable'

13 years agofilestore: make read_fsid() out arg be a pointer
Sage Weil [Wed, 23 May 2012 23:24:36 +0000 (16:24 -0700)]
filestore: make read_fsid() out arg be a pointer

As per style guide.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: more informative fsid mkfs debug output
Sage Weil [Tue, 22 May 2012 18:45:57 +0000 (11:45 -0700)]
filestore: more informative fsid mkfs debug output

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosd: verify fsid whoami to match on repeat mkfs
Sage Weil [Tue, 22 May 2012 18:41:25 +0000 (11:41 -0700)]
osd: verify fsid whoami to match on repeat mkfs

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosd: require cluster fsid for mkfs
Sage Weil [Tue, 22 May 2012 18:39:44 +0000 (11:39 -0700)]
osd: require cluster fsid for mkfs

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosd: do not clobber existing key with --mkkey
Sage Weil [Sat, 19 May 2012 23:11:39 +0000 (16:11 -0700)]
osd: do not clobber existing key with --mkkey

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: mkfs: do not clobber exisiting journal if it has matching fsid
Sage Weil [Sat, 19 May 2012 22:59:59 +0000 (15:59 -0700)]
filestore: mkfs: do not clobber exisiting journal if it has matching fsid

If the journal is for *this* fs, do not clobber.  If it appears invalid in
any way, initialize it.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilejournal: add check() method
Sage Weil [Sat, 19 May 2012 22:58:32 +0000 (15:58 -0700)]
filejournal: add check() method

Check if a journal appears to be valid, where valid means the header is
intact and has a matching fsid.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: drop useless mkjournal error check
Sage Weil [Sat, 19 May 2012 22:45:00 +0000 (15:45 -0700)]
filestore: drop useless mkjournal error check

We don't care!

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: mkfs: less noise about leveldb creation
Sage Weil [Sat, 19 May 2012 22:42:59 +0000 (15:42 -0700)]
filestore: mkfs: less noise about leveldb creation

and make it clear that we didn't necessarily create it; it may have already
been there.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: mkfs: only create snap_0 if we created current_op_seq
Sage Weil [Sat, 19 May 2012 22:42:28 +0000 (15:42 -0700)]
filestore: mkfs: only create snap_0 if we created current_op_seq

We only need to create snap_0 if we just created current_op_seq and this is
a brand-new dir.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: fix misplaced #endif
Sage Weil [Wed, 23 May 2012 23:25:44 +0000 (16:25 -0700)]
filestore: fix misplaced #endif

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agodoc/api/s3/bucketops.rst Corrected heading.
John [Wed, 23 May 2012 23:12:06 +0000 (16:12 -0700)]
doc/api/s3/bucketops.rst Corrected heading.
doc/install/chef.rst  Added Sam's edits to the Chef install.

Signed-off-by: John <john@admin-host.(none)>
13 years agorgw: replace all bad use of formatter->dump_format()
Yehuda Sadeh [Wed, 23 May 2012 18:29:36 +0000 (11:29 -0700)]
rgw: replace all bad use of formatter->dump_format()

This fixes #2465. We should never ever use the dumped value
as the format. Never.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agodoc/api/s3 <-chipping away at objectops and clean up. Added Copy Object.
John [Wed, 23 May 2012 22:44:11 +0000 (15:44 -0700)]
doc/api/s3 <-chipping away at objectops and clean up. Added Copy Object.
doc/source <-fixed a typo, updates for installing on precise, rm $ from cmds
doc/start  <-replaced clone link with tarball link. Link to Ceph Source Code.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
13 years agomon: use temp access_{r,all,cmd} variables to simplify the checks
Sage Weil [Wed, 23 May 2012 21:03:47 +0000 (14:03 -0700)]
mon: use temp access_{r,all,cmd} variables to simplify the checks

Avoid duplicating the compound check all over the place.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: drop redundant get_allow_all() cap check
Sage Weil [Wed, 23 May 2012 20:49:40 +0000 (13:49 -0700)]
mon: drop redundant get_allow_all() cap check

check_privileges() already does this.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomonmap: return ENOENT from build_from_host_list when no mons
Sage Weil [Wed, 23 May 2012 18:25:46 +0000 (11:25 -0700)]
monmap: return ENOENT from build_from_host_list when no mons

Make sure we return an error when no monitors are parsed.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomonmap: ignore conf mon entries when -m is specified
Sage Weil [Wed, 23 May 2012 18:25:27 +0000 (11:25 -0700)]
monmap: ignore conf mon entries when -m is specified

Use -m <addrs> instead of conf mons (instead of combining them into a
single large search pool).

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agov0.47.2 v0.47.2
Sage Weil [Wed, 23 May 2012 16:00:53 +0000 (09:00 -0700)]
v0.47.2

13 years agoMakefile: do not install librgw.h
Sage Weil [Wed, 23 May 2012 17:52:12 +0000 (10:52 -0700)]
Makefile: do not install librgw.h

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agoUpdate ceph.spec for ceph-0.47
Alexandre Oliva [Tue, 22 May 2012 08:17:47 +0000 (05:17 -0300)]
Update ceph.spec for ceph-0.47

Add BuildRequires: libxml2-devel.
Move BuildRequires: libcurl-devel to a more proper place.

[libs3 and librgw.h bits of patch dropped -sw]

Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Signed-off-by: Sage Weil <sage@newdream.net>
13 years agolibs3: remove make install target
Yehuda Sadeh [Mon, 21 May 2012 21:32:22 +0000 (14:32 -0700)]
libs3: remove make install target

13 years agoMakefile.am: only append libs3 to SUBDIRS when needed
Yehuda Sadeh [Mon, 21 May 2012 21:20:24 +0000 (14:20 -0700)]
Makefile.am: only append libs3 to SUBDIRS when needed

We appended libs3 to SUBDIRS unconditionally, we only need that
when we actually want to compile it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agomonclient: sanity check on monmap size
Sage Weil [Wed, 23 May 2012 17:40:07 +0000 (10:40 -0700)]
monclient: sanity check on monmap size

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agomonmap: avoid dup addrs in generated initial monmap
Sage Weil [Wed, 23 May 2012 17:39:48 +0000 (10:39 -0700)]
monmap: avoid dup addrs in generated initial monmap

We were getting a dup addr from -m <foo> and ceph.conf.  Prefer the
ceph.conf name in this case.

Also check for dup names here just to be thorough (even though I don't
think that can come up currently).

Fixes: #2464
Signed-off-by: Sage Weil <sage@newdream.net>
13 years agomonmap: aseert addrs are unique on add(), calc_ranks()
Sage Weil [Wed, 23 May 2012 17:38:21 +0000 (10:38 -0700)]
monmap: aseert addrs are unique on add(), calc_ranks()

Signed-off-by: Sage Weil <sage@newdream.net>
13 years agodoc: librados: fix getxattr return code
Sage Weil [Wed, 23 May 2012 03:47:21 +0000 (20:47 -0700)]
doc: librados: fix getxattr return code

Fixes: #2391
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: restrict mon 'join' message/command
Sage Weil [Wed, 23 May 2012 01:29:52 +0000 (18:29 -0700)]
mon: restrict mon 'join' message/command

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: apply 'r' and 'w' caps to mon and pg commands
Sage Weil [Wed, 23 May 2012 01:27:47 +0000 (18:27 -0700)]
mon: apply 'r' and 'w' caps to mon and pg commands

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: apply 'r' and 'w' caps to mdsmap
Sage Weil [Wed, 23 May 2012 01:23:49 +0000 (18:23 -0700)]
mon: apply 'r' and 'w' caps to mdsmap

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: apply 'r' and 'w' caps to osdmap
Sage Weil [Wed, 23 May 2012 01:21:12 +0000 (18:21 -0700)]
mon: apply 'r' and 'w' caps to osdmap

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: allow health, status, log, etc. messages with 'r' cap
Sage Weil [Wed, 23 May 2012 01:17:37 +0000 (18:17 -0700)]
mon: allow health, status, log, etc. messages with 'r' cap

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: fix error messages
Sage Weil [Wed, 23 May 2012 01:17:17 +0000 (18:17 -0700)]
mon: fix error messages

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: push down 'auth ...' command auth checks
Sage Weil [Wed, 23 May 2012 00:59:22 +0000 (17:59 -0700)]
mon: push down 'auth ...' command auth checks

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: push down command auth checks to each command
Sage Weil [Wed, 23 May 2012 00:53:27 +0000 (17:53 -0700)]
mon: push down command auth checks to each command

Everything except 'fsid', which I figure is truly public information?

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: require admin privs to issue any monitor commands
Sage Weil [Wed, 23 May 2012 00:34:55 +0000 (17:34 -0700)]
mon: require admin privs to issue any monitor commands

This is overkill, but a first step before pushing caps enforcement down
into each subfunction that processes monitor commands.

Fixes: #2443
Signed-off-by: Sage Weil <sage@inktank.com>
13 years agovstart.sh: set HOSTNAME when -l is used
Sage Weil [Wed, 23 May 2012 01:17:48 +0000 (18:17 -0700)]
vstart.sh: set HOSTNAME when -l is used

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agomon: fix 'get-or-create-key'
Sage Weil [Wed, 23 May 2012 01:00:49 +0000 (18:00 -0700)]
mon: fix 'get-or-create-key'

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: leave existing current/
Sage Weil [Sat, 19 May 2012 22:38:45 +0000 (15:38 -0700)]
filestore: leave existing current/

If current exists, leave it be, but:

 * make sure it's a dir
 * check if it's a btrfs snapshot, and set btrfs_stable_commits if so

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: create but do not clobber current/commit_op_seq
Sage Weil [Sat, 19 May 2012 22:23:49 +0000 (15:23 -0700)]
filestore: create but do not clobber current/commit_op_seq

If it exists, preserve its value.  Otherwise, create and set it to 1.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: mkfs: only (re)set fsid if not already set
Sage Weil [Sat, 19 May 2012 22:03:56 +0000 (15:03 -0700)]
filestore: mkfs: only (re)set fsid if not already set

Only set fsid if it is not set.

Also, error out if it exists and does not match.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: pass target into read_fsid()
Sage Weil [Sat, 19 May 2012 21:58:35 +0000 (14:58 -0700)]
filestore: pass target into read_fsid()

Don't assume it should be read into this->fsid.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: mkfs: rename buf -> fsid_fn
Sage Weil [Sat, 19 May 2012 21:09:48 +0000 (14:09 -0700)]
filestore: mkfs: rename buf -> fsid_fn

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: always open/verify basedir; clean up error messages
Sage Weil [Sat, 19 May 2012 21:07:43 +0000 (14:07 -0700)]
filestore: always open/verify basedir; clean up error messages

Verify basedir exists immediately.
Clean up error output.
Clean up label names.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: do not wipe on mkfs
Sage Weil [Sat, 19 May 2012 21:03:58 +0000 (14:03 -0700)]
filestore: do not wipe on mkfs

Do not wipe out old content in the data dir.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agofilestore: remove unused 'filestore dev' option
Sage Weil [Sat, 19 May 2012 20:55:41 +0000 (13:55 -0700)]
filestore: remove unused 'filestore dev' option

Eons ago we would call mount/unmount on this, but it's been dead for a
while now.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosd: only (re)write_meta files if old content is incorrect
Sage Weil [Sat, 19 May 2012 20:54:13 +0000 (13:54 -0700)]
osd: only (re)write_meta files if old content is incorrect

Do nothing if the file already exists with the correct content.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoosd: only create superblock if not present
Sage Weil [Sat, 19 May 2012 20:51:29 +0000 (13:51 -0700)]
osd: only create superblock if not present

If it exists, leave it be.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMerge branch 'wip-quorum'
Sage Weil [Wed, 23 May 2012 00:13:28 +0000 (17:13 -0700)]
Merge branch 'wip-quorum'

13 years agodoc/config-cluster/chef.rst <-fixed an error in upload command.
John Wilkins [Wed, 23 May 2012 00:10:43 +0000 (17:10 -0700)]
doc/config-cluster/chef.rst <-fixed an error in upload command.
doc/config-cluster/deploying-ceph-conf.rst <-added sudo. required.
doc/config-cluster/deploying-ceph-with-mkcephfs.rst <-cd to /etc/ceph so keyring goes there.
doc/install/chef.rst <-added update and install opscode-keyring, and upgrade.
doc/install/debian.rst <-added ceph-common to the install

Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
13 years agoconfig: add --show-args option
Yehuda Sadeh [Tue, 22 May 2012 20:53:11 +0000 (13:53 -0700)]
config: add --show-args option

The --show-args dumps the arguments passed on the command line.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
13 years agoMerge branch 'stable'
Josh Durgin [Tue, 22 May 2012 19:54:09 +0000 (12:54 -0700)]
Merge branch 'stable'

13 years agoobjectcacher: fix infinite loop in flusher_entry
Sage Weil [Tue, 22 May 2012 00:18:35 +0000 (17:18 -0700)]
objectcacher: fix infinite loop in flusher_entry

The addition of accounting for simultaneous writers in
f3043fee3e22600cb4349072287842db129588eb could lead to an infinite
loop. This could happen because starting a flush doesn't decrease
dirty_waiters, only the number of dirty bytes (they change to tx). If
dirty_waiters is more than target_dirty, the loop would continue
forever while holding the object cacher lock, since the object cacher
lock is required by the write callbacks.

The extra while (!flusher_stop) loop is unnecessary, so remove it.
This means the flusher thread always releases the lock after starting
flushing, so progress can be made.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
13 years agoMerge branch 'master' of github.com:ceph/ceph
John Wilkins [Tue, 22 May 2012 16:54:06 +0000 (09:54 -0700)]
Merge branch 'master' of github.com:ceph/ceph

13 years agodoc/config-cluster/ceph-conf.rst <-Fixed some formatting issues.
John Wilkins [Tue, 22 May 2012 16:53:34 +0000 (09:53 -0700)]
doc/config-cluster/ceph-conf.rst <-Fixed some formatting issues.
doc/config-cluster/deploying-ceph-conf.rst <-minor edit.
doc/start/get-involved-in-the-ceph-community.rst <-removed $ from command line instruction.
doc/start/quick-start.rst <-added additional steps.

Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
13 years agomonmap: calc_ranks() on rename()
Sage Weil [Tue, 22 May 2012 14:05:36 +0000 (07:05 -0700)]
monmap: calc_ranks() on rename()

This is simpler than ensuring we track all the right invariants.

Signed-off-by: Sage Weil <sage@inktank.com>
13 years agoMerge branch 'wip-defensive-alloc'
Sage Weil [Tue, 22 May 2012 03:01:03 +0000 (20:01 -0700)]
Merge branch 'wip-defensive-alloc'

13 years agocrush: check reweight return value
Sage Weil [Tue, 22 May 2012 03:00:51 +0000 (20:00 -0700)]
crush: check reweight return value

Signed-off-by: Sage Weil <sage@inktank.com>