]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Yehuda Sadeh [Fri, 1 Jun 2012 00:04:00 +0000 (17:04 -0700)]
test_stress_watch: exercise watch/unwatch/close from second client
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Sage Weil [Thu, 31 May 2012 05:16:03 +0000 (22:16 -0700)]
osd: ack pending notify when unwatching
If an unwatch crosses paths with a notify, we currently force the notifier
to keep waiting. Instead, implicitly ack any notify when we unwatch.
Fixes: #2491
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Thu, 31 May 2012 03:38:22 +0000 (20:38 -0700)]
Merge remote branch 'gh/wip-admin'
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Dan Mick [Wed, 30 May 2012 23:48:37 +0000 (16:48 -0700)]
librbd: Simplify timing init
Remove possibility of set_start_time before set_ictx error
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Dan Mick [Wed, 30 May 2012 23:15:45 +0000 (16:15 -0700)]
librbd: Add latency (elapsed-time) stats for rbd operations
Fixes: #2408
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Yehuda Sadeh [Wed, 30 May 2012 22:40:39 +0000 (15:40 -0700)]
rgw: put_bucket_info does not override attrs
This fixes #2487. When writing bucket info we just
wrote the object content, and were overriding any
attrs that object contained (that is -- corrupted
the ACLs).
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Yehuda Sadeh [Wed, 30 May 2012 22:28:19 +0000 (15:28 -0700)]
rgw: return default policy if policy attr is broken
In case the policy attr on object/bucket is broken
return a default policy, in which the owner is set
as the bucket owner.
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Sage Weil [Wed, 30 May 2012 18:02:36 +0000 (11:02 -0700)]
Merge remote-tracking branch 'gh/stable'
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>
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>
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>
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>
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>
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>
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>
Sage Weil [Tue, 29 May 2012 20:29:49 +0000 (13:29 -0700)]
admin_socket: fix unittest
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 29 May 2012 19:10:22 +0000 (12:10 -0700)]
log: add log flush, dump_recent, reopen admin socket commands
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 29 May 2012 19:07:58 +0000 (12:07 -0700)]
config: add 'set_config <var> <val>' admin socket command
Signed-off-by: Sage Weil <sage@inktank.com>
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>
Sage Weil [Tue, 29 May 2012 17:11:43 +0000 (10:11 -0700)]
config: add 'show_config' admin socket command
Signed-off-by: Sage Weil <sage@inktank.com>
Sage Weil [Tue, 29 May 2012 18:05:51 +0000 (11:05 -0700)]
admin_socket: initialize explicitly on startup; disallow changes
There is an annoying dependency between the config lock and the admin
socket lock due to the fact that we initialize (or reinitialize) the socket
via a config observer.
Instead, explicitly initialize on startup. Do not allow the admin socket
location to be changed at runtime.
Signed-off-by: Sage Weil <sage@inktank.com>
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>
Sage Weil [Tue, 29 May 2012 17:09:31 +0000 (10:09 -0700)]
cephcontext: generalize admin socket hook
We'll process non-perfcounter commands too.
Signed-off-by: Sage Weil <sage@inktank.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Josh Durgin [Thu, 24 May 2012 16:47:41 +0000 (09:47 -0700)]
Merge branch 'stable'
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>
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>
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>
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>
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>
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>
Sage Weil [Wed, 23 May 2012 23:41:14 +0000 (16:41 -0700)]
Merge branch 'stable'
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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)>
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>
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>
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>
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>
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>
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>
Sage Weil [Wed, 23 May 2012 16:00:53 +0000 (09:00 -0700)]
v0.47.2
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>
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>
Yehuda Sadeh [Mon, 21 May 2012 21:32:22 +0000 (14:32 -0700)]
libs3: remove make install target
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>