]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agorgw: don't bother to call c_str() on strings passed to dump_string() 755/head
Yehuda Sadeh [Tue, 22 Oct 2013 19:10:57 +0000 (12:10 -0700)]
rgw: don't bother to call c_str() on strings passed to dump_string()

dump_string() also accepts const string reference.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: init src_bucket_name, src_object in the S3 handler
Yehuda Sadeh [Tue, 22 Oct 2013 01:02:32 +0000 (18:02 -0700)]
rgw: init src_bucket_name, src_object in the S3 handler

Be consistent and initialize these fields also in the S3 case.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: get rid of req_state.bucket_name
Yehuda Sadeh [Mon, 21 Oct 2013 21:45:59 +0000 (14:45 -0700)]
rgw: get rid of req_state.bucket_name

No need for this field, as we already have req_state.bucket_name_str.
This saves us some memory allocation / freeing through every request
processing.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: turn swift COPY into PUT
Yehuda Sadeh [Mon, 21 Oct 2013 21:17:12 +0000 (14:17 -0700)]
rgw: turn swift COPY into PUT

Fixes: #6606
The swift COPY operation is unique in a sense that it's a write
operation that has its destination not set by the URI target, but by a
different HTTP header. This is problematic as there are some hidden
assumptions in the code that the specified bucket/object in the URI is
the operation target. E.g., certain initialization functions, quota,
etc. Instead of creating a specialized code everywhere for this case
just turn it into a regular copy operation, that is, a PUT with
a specified copy source.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoMerge pull request #751 from ceph/wip-6603
Loic Dachary [Mon, 21 Oct 2013 18:20:37 +0000 (11:20 -0700)]
Merge pull request #751 from ceph/wip-6603

a couple trivial leaks

11 years agocommon/BackTrace: fix memory leak 751/head
Sage Weil [Mon, 21 Oct 2013 16:22:35 +0000 (09:22 -0700)]
common/BackTrace: fix memory leak

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/cmdparse: fix memory leak
Sage Weil [Mon, 21 Oct 2013 16:21:57 +0000 (09:21 -0700)]
common/cmdparse: fix memory leak

demangle is allocating with malloc() in this case.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #746 from ceph/wip-6582
Sage Weil [Sat, 19 Oct 2013 06:08:08 +0000 (23:08 -0700)]
Merge pull request #746 from ceph/wip-6582

Wip 6582

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoReplicatedPG: copy: conditionally requeue copy ops when cancelled 746/head
Greg Farnum [Fri, 18 Oct 2013 23:34:11 +0000 (16:34 -0700)]
ReplicatedPG: copy: conditionally requeue copy ops when cancelled

We may need to requeue copy ops which are cancelled as part of an acting
set change but don't change the primary. To support this, add a
"requeue" flag to cancel_copy_ops() and copy_ops(), as well as to
CopyResults. The CopyCallback is then responsible for requeuing (the
higher layers can't do so as they can't know which request actually
triggered the copy).

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoPG: add a requeue_op() function to complement requeue_ops().
Greg Farnum [Fri, 18 Oct 2013 23:24:27 +0000 (16:24 -0700)]
PG: add a requeue_op() function to complement requeue_ops().

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoMerge branch 'next'
Gary Lowell [Fri, 18 Oct 2013 01:51:16 +0000 (01:51 +0000)]
Merge branch 'next'

11 years agoMerge pull request #737 from xarses/6127
Josh Durgin [Fri, 18 Oct 2013 00:27:34 +0000 (17:27 -0700)]
Merge pull request #737 from xarses/6127

Add Redhat init script option
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoAdd Redhat init script option 737/head
Andrew Woodward [Thu, 17 Oct 2013 23:21:58 +0000 (16:21 -0700)]
Add Redhat init script option

Resolves: 6127
Signed-off-by: Andrew Woodward <awoodward@mirantis.com>
11 years agoMerge pull request #738 from ceph/wip-cache-crc
Sage Weil [Thu, 17 Oct 2013 23:52:29 +0000 (16:52 -0700)]
Merge pull request #738 from ceph/wip-cache-crc

fix cached crc, bug #6583

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agocommon/buffer: invalidate crc on zero, copy_in 738/head
Sage Weil [Thu, 17 Oct 2013 23:47:29 +0000 (16:47 -0700)]
common/buffer: invalidate crc on zero, copy_in

This does not capture users who

 - calc a crc
 - use c_str() to modify the buffer content
 - (re)calc a crc

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/buffer: fix crc_map types
Sage Weil [Thu, 17 Oct 2013 23:46:10 +0000 (16:46 -0700)]
common/buffer: fix crc_map types

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/buffer: drop unused fields
Sage Weil [Thu, 17 Oct 2013 23:36:20 +0000 (16:36 -0700)]
common/buffer: drop unused fields

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoqa/workunits/rest/test.py: fix mds {add,remove}_data_pool test
Sage Weil [Thu, 17 Oct 2013 21:38:37 +0000 (14:38 -0700)]
qa/workunits/rest/test.py: fix mds {add,remove}_data_pool test

Arg name changed from poolid to pool in e2602c54.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agodoc/release-notes: link ot the changelog
Sage Weil [Thu, 17 Oct 2013 20:25:59 +0000 (13:25 -0700)]
doc/release-notes: link ot the changelog

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agodoc/release-notes: v0.61.9
Sage Weil [Thu, 17 Oct 2013 20:15:23 +0000 (13:15 -0700)]
doc/release-notes: v0.61.9

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMakefile: fix /sbin vs /usr/sbin behavior
Sage Weil [Thu, 17 Oct 2013 19:06:26 +0000 (12:06 -0700)]
Makefile: fix /sbin vs /usr/sbin behavior

Instead of telling configure to put things in /sbin, explicitly put the
two important items (mkcephfs and mount.fuse.ceph) in /sbin via an
automake rule.  This unbreaks FreeBSD 9.1 and probably others.

Based on patches originally from Alan Somers <asomers@gmail.com>, modified
for the current Makefile structure and applied to the specfile too.

Fixes: #6456
Signed-off-by: Sage Weil <sage@inktank.com>
Tested-by: Alan Somers <asomers@gmail.com>
11 years agoOSD: check for splitting when processing recover/backfill reservations
Samuel Just [Wed, 16 Oct 2013 17:07:37 +0000 (10:07 -0700)]
OSD: check for splitting when processing recover/backfill reservations

Fixes: 6565
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #691 from ceph/wip-dirfrag
Gregory Farnum [Thu, 17 Oct 2013 15:35:38 +0000 (08:35 -0700)]
Merge pull request #691 from ceph/wip-dirfrag

Reviewed-by: Greg Farnum <greg@inktank.com>
Partly-Reviewed-by: Sage Weil <sage@inktank.com>
11 years agov0.71 v0.71
Gary Lowell [Thu, 17 Oct 2013 09:19:36 +0000 (09:19 +0000)]
v0.71

11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Thu, 17 Oct 2013 04:04:01 +0000 (21:04 -0700)]
Merge remote-tracking branch 'gh/next'

11 years ago.gitignore: ceph-kvstore-tool
Sage Weil [Wed, 16 Oct 2013 21:23:13 +0000 (14:23 -0700)]
.gitignore: ceph-kvstore-tool

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Wed, 16 Oct 2013 21:13:03 +0000 (14:13 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agodebian, specfile: fix ceph-kvstore-tool packaging
Sage Weil [Wed, 16 Oct 2013 20:59:00 +0000 (13:59 -0700)]
debian, specfile: fix ceph-kvstore-tool packaging

See da69fa09c8274585225471c68c1acc788a3881f4

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #732 from ceph/wip-kvstore-tool
Sage Weil [Wed, 16 Oct 2013 20:35:07 +0000 (13:35 -0700)]
Merge pull request #732 from ceph/wip-kvstore-tool

tools: ceph-kvstore-tool: Access & manipulate leveldb store using the KeyValueDB interface

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoceph-kvstore-tool: copy one leveldb store to some other place 732/head
Joao Eduardo Luis [Sun, 13 Oct 2013 12:45:43 +0000 (13:45 +0100)]
ceph-kvstore-tool: copy one leveldb store to some other place

Iterates over the provided source store's keys and copies them to the
provided destination store.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoceph-kvstore-tool: calc store crc
Joao Eduardo Luis [Sun, 13 Oct 2013 12:44:29 +0000 (13:44 +0100)]
ceph-kvstore-tool: calc store crc

Reuse 'list()' function to traverse the store and calc not only version's
crcs, but also calc the store's crc.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #655 from ceph/wip-cache-crc
Sage Weil [Wed, 16 Oct 2013 19:54:41 +0000 (12:54 -0700)]
Merge pull request #655 from ceph/wip-cache-crc

buffer: cache crc values in buffer::raw

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agotools: move 'test_store_tool' to 'tools/ceph-kvstore-tool'
Joao Eduardo Luis [Sun, 13 Oct 2013 12:40:57 +0000 (13:40 +0100)]
tools: move 'test_store_tool' to 'tools/ceph-kvstore-tool'

ceph-kvstore-tool allows for lower-level access to leveldb stores.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #709 from ceph/wip-filerecover
Gregory Farnum [Wed, 16 Oct 2013 18:13:35 +0000 (11:13 -0700)]
Merge pull request #709 from ceph/wip-filerecover

This patch prevents us from inadvertently reducing sparse file sizes during recovery.
We also reduce some code duplication by using eval() directly in do_file_recover()
instead of reproducing the parts we care about.

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agocommon/buffer: behave when cached crc stats don't start at 0 655/head
Sage Weil [Wed, 16 Oct 2013 17:58:31 +0000 (10:58 -0700)]
common/buffer: behave when cached crc stats don't start at 0

In particular, this helps when we set CEPH_BUFFER_TRACK=true

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #724 from ceph/wip-4047
Josh Durgin [Wed, 16 Oct 2013 16:56:35 +0000 (09:56 -0700)]
Merge pull request #724 from ceph/wip-4047

cls_rbd: do not make noise in osd log on rbd removal

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agocrc32c: expand unit test
Yehuda Sadeh [Fri, 4 Oct 2013 23:45:11 +0000 (16:45 -0700)]
crc32c: expand unit test

Verify crc on a buffer range, and on a NULL buffer (with various
sizes).

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agosctp_crc32c: fix crc calculation in the NULL buffer case
Yehuda Sadeh [Fri, 4 Oct 2013 23:43:38 +0000 (16:43 -0700)]
sctp_crc32c: fix crc calculation in the NULL buffer case

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agocrc32c: add a special case crc32c NULL buffer handling
Yehuda Sadeh [Fri, 4 Oct 2013 21:19:24 +0000 (14:19 -0700)]
crc32c: add a special case crc32c NULL buffer handling

Adding a special case crc32c NULL buffer handling for the intel assembly
code.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agocommon/buffer: pass NULL buffer instead of a zero-filled one
Sage Weil [Sat, 28 Sep 2013 04:07:17 +0000 (21:07 -0700)]
common/buffer: pass NULL buffer instead of a zero-filled one

This is about 2x faster on my box using the sctp code.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/crc32c: document interface
Sage Weil [Sat, 28 Sep 2013 04:05:27 +0000 (21:05 -0700)]
common/crc32c: document interface

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/crc32c_intel_baseline: accept null data buffer
Sage Weil [Sat, 28 Sep 2013 04:03:28 +0000 (21:03 -0700)]
common/crc32c_intel_baseline: accept null data buffer

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/sctp_crc32: accept NULL buffer pointer
Sage Weil [Sat, 28 Sep 2013 04:03:06 +0000 (21:03 -0700)]
common/sctp_crc32: accept NULL buffer pointer

If we get NULL we behave as if it were a zero-filled buffer.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/buffer: explicitly init zbuf to zeros
Sage Weil [Fri, 27 Sep 2013 22:29:18 +0000 (15:29 -0700)]
common/buffer: explicitly init zbuf to zeros

This might not be necessary?

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/buffer: add crc caching performance test
Sage Weil [Fri, 27 Sep 2013 22:29:13 +0000 (15:29 -0700)]
common/buffer: add crc caching performance test

On my old box:
 - matching cached values is a big win (free), obviously
 - the adjustment is the same speed as redoing the calculation.  this
   is probably because the data is already in L1/L2 cache; we still
   save memory bandwidth.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/buffer: instrument utilization of cached crcs
Sage Weil [Fri, 27 Sep 2013 22:29:06 +0000 (15:29 -0700)]
common/buffer: instrument utilization of cached crcs

This is similar to the alloc tracking, but I've added a method to let
you enable it easily (in this case, from the unit test).

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon/buffer: cache crcs in buffer::raw
Sage Weil [Tue, 10 Sep 2013 01:18:26 +0000 (18:18 -0700)]
common/buffer: cache crcs in buffer::raw

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoinclude: add Spinlock
Sage Weil [Thu, 12 Sep 2013 01:00:09 +0000 (18:00 -0700)]
include: add Spinlock

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocls_rbd: do not make noise in osd log on rbd removal 724/head
Sage Weil [Wed, 16 Oct 2013 00:55:32 +0000 (17:55 -0700)]
cls_rbd: do not make noise in osd log on rbd removal

ubuntu@burnupi06:~$ tail -f /var/log/ceph/ceph-osd.1.log
2013-02-07 17:00:30.565749 7fdb09e6b700 0 <cls> cls/rbd/cls_rbd.cc:1615: error reading id for name 'sds': -2
2013-02-07 17:00:30.566301 7fdb0a66c700 0 <cls> cls/rbd/cls_rbd.cc:1521: error reading name to id mapping: -2
2013-02-07 17:03:54.085700 7fdb0a66c700 0 <cls> cls/rbd/cls_rbd.cc:1615: error reading id for name 'sdfsd': -2
2013-02-07 17:03:54.086143 7fdb09e6b700 0 <cls> cls/rbd/cls_rbd.cc:1521: error reading name to id mapping: -2

Fixes: #4047
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #728 from ceph/wip-6059
athanatos [Wed, 16 Oct 2013 00:15:16 +0000 (17:15 -0700)]
Merge pull request #728 from ceph/wip-6059

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
11 years agoMerge pull request #729 from ceph/wip-5716
Josh Durgin [Wed, 16 Oct 2013 00:09:10 +0000 (17:09 -0700)]
Merge pull request #729 from ceph/wip-5716

rgw: gracefully handle bad root pool names

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agotest_ceph_argparse: fix typo
Sage Weil [Tue, 15 Oct 2013 23:50:05 +0000 (16:50 -0700)]
test_ceph_argparse: fix typo

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agotest_ceph_argparse: fix mds {add,remove}_data_pool tests
Sage Weil [Tue, 15 Oct 2013 23:48:53 +0000 (16:48 -0700)]
test_ceph_argparse: fix mds {add,remove}_data_pool tests

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agocommon: fix non-daemon init
Sage Weil [Tue, 15 Oct 2013 23:32:32 +0000 (16:32 -0700)]
common: fix non-daemon init

In commit 4f403c26dc0048ad63e20d20369fa86bfb31c50e we broke the general
non-daemon case.

Also make a note in the release notes.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agotest/filestore/run_seed_to.sh: avoid obsolete --filestore-xattr-use-omap
Sage Weil [Tue, 15 Oct 2013 23:00:26 +0000 (16:00 -0700)]
test/filestore/run_seed_to.sh: avoid obsolete --filestore-xattr-use-omap

This option no longer exists.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMonCommands: note that pg dump options don't work in plaintext
Greg Farnum [Tue, 15 Oct 2013 22:45:05 +0000 (15:45 -0700)]
MonCommands: note that pg dump options don't work in plaintext

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agorgw: gracefully handle bad root pool names 729/head
Yehuda Sadeh [Tue, 15 Oct 2013 23:05:14 +0000 (16:05 -0700)]
rgw: gracefully handle bad root pool names

Fixes: #5716
When invalid root pools specified (don't start with a period) we return
with an error instead of asserting.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoceph_test_rados: fix snap remove vs rollback fix
Sage Weil [Tue, 15 Oct 2013 22:50:16 +0000 (15:50 -0700)]
ceph_test_rados: fix snap remove vs rollback fix

In commit 55d279b98553ba4542219b126fc7159b20b18b1f we tried to fix a race
between rollback and snap removal, but got the logic wrong: we need to
prevent *snap removal* on in-use snaps, not prevent multiple rollbacks on
the same snap.

Fixes: #6254 (again)
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoos/LevelDBStore: handle deletion race when checking store size
Sage Weil [Tue, 15 Oct 2013 22:39:04 +0000 (15:39 -0700)]
os/LevelDBStore: handle deletion race when checking store size

This fixes the fix in 64774e5792f136df2bc78db686440fc2f3a7643f which mixed
up the return value and errno.

Fixes: #6550
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agotest/librados/cmd: fix compile error
Sage Weil [Tue, 15 Oct 2013 22:27:19 +0000 (15:27 -0700)]
test/librados/cmd: fix compile error

From commit f0805cb61fccf9ffaa905b8477a131b4d46379fa.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoReplicatedPG: remove the other backfill related flushes 728/head
Samuel Just [Fri, 4 Oct 2013 05:00:46 +0000 (22:00 -0700)]
ReplicatedPG: remove the other backfill related flushes

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoRadosModel: send racing read on write
Samuel Just [Tue, 8 Oct 2013 02:03:23 +0000 (19:03 -0700)]
RadosModel: send racing read on write

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoReplicatedPG: block reads on an object until the write is committed
Samuel Just [Fri, 4 Oct 2013 06:20:07 +0000 (23:20 -0700)]
ReplicatedPG: block reads on an object until the write is committed

Signed-off-by: Samuel Just <sam.just@inktank.com>
11 years agoOSD: ping tphandle during pg removal
Samuel Just [Tue, 15 Oct 2013 20:11:29 +0000 (13:11 -0700)]
OSD: ping tphandle during pg removal

Fixes: #6528
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #687 from ceph/wip-pool
Sage Weil [Tue, 15 Oct 2013 22:09:09 +0000 (15:09 -0700)]
Merge pull request #687 from ceph/wip-pool

mon: make 'mon {add,remove}_data_pool ...' take pool name or id

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #718 from ceph/wip-6553
Sage Weil [Tue, 15 Oct 2013 22:04:41 +0000 (15:04 -0700)]
Merge pull request #718 from ceph/wip-6553

rgw: fix authenticated users acl group check

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #723 from ceph/wip-6334
Sage Weil [Tue, 15 Oct 2013 22:03:50 +0000 (15:03 -0700)]
Merge pull request #723 from ceph/wip-6334

common: don't do special things for unprivileged daemons

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agocommon: don't do special things for unprivileged daemons 723/head
Sage Weil [Tue, 15 Oct 2013 21:35:20 +0000 (14:35 -0700)]
common: don't do special things for unprivileged daemons

We generally do want an admin socket and log, and people usually run these
as root.  This is more confusing than useful.

Fixes: #6334
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomon, osd: send leveldb log to /dev/null by default
Sage Weil [Tue, 15 Oct 2013 21:04:24 +0000 (14:04 -0700)]
mon, osd: send leveldb log to /dev/null by default

Fixes: #5175
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #542 from ceph/wip-6122
Sage Weil [Tue, 15 Oct 2013 20:46:25 +0000 (13:46 -0700)]
Merge pull request #542 from ceph/wip-6122

test/librados/cmd.cc: tolerate thrashing on pg_command tests

11 years agodoc: Update from user feedback. Needed to enable S3/Keystone.
John Wilkins [Tue, 15 Oct 2013 20:38:48 +0000 (13:38 -0700)]
doc: Update from user feedback. Needed to enable S3/Keystone.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoos/FileStore: fix fiemap double-free(s)
Alan Somers [Tue, 15 Oct 2013 20:26:13 +0000 (13:26 -0700)]
os/FileStore: fix fiemap double-free(s)

If GenericFileStoreBackend::do_fiemap returns anything other than 0, then
fiemap will not be allocated. However,
GenericFileStoreBackend::detect_features will free fiemap regardless,
triggering an assertion in tcmalloc. The attached patch will fix the bug
by only freeing fiemap when necessary.

In my case, do_fiemap returns -ENOSYS because fiemap is not implemented
on FreeBSD. However, this bug could also happen on Linux when do_fiemap
returns -ENOMEM.

Fixes: #6504
Signed-off-by: Alan Somers <asomers@gmail.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoceph-dencoder: select_generated() should properly validate its input
Alan Somers [Tue, 15 Oct 2013 20:06:06 +0000 (13:06 -0700)]
ceph-dencoder: select_generated() should properly validate its input

If m_list.size() == 0, then calling select_generated(0) will result in
uninitialized data being assigned to m_object, which will cause a segfault
down the road. This patch fixes that.

To Reproduce:
$ ceph-dencoder type MWatchNotify select_test 0 encode decode
Segmentation fault (core dumped)

After the patch:
$ ./ceph-dencoder type MWatchNotify select_test 0 encode decode
error: invalid id for generated object
$ echo $?
1

Fixes: #6510
Signed-off-by: Alan Somers <asomers@gmail.com>
11 years agovstart.sh: create dev/ automatically
Sage Weil [Tue, 15 Oct 2013 19:52:57 +0000 (12:52 -0700)]
vstart.sh: create dev/ automatically

Otherwise you have to explicitly create it on a new checkout.

Also mkdir -p for consistency, tho it's not needed if dev/ is already
there.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agorgw: change default log level
Yehuda Sadeh [Tue, 15 Oct 2013 17:55:07 +0000 (10:55 -0700)]
rgw: change default log level

Fixes: #6554
Backport: cuttlefish, dumpling
Default log level was just too high, bring it down a bit.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #720 from liewegas/wip-6521
Sage Weil [Tue, 15 Oct 2013 19:16:26 +0000 (12:16 -0700)]
Merge pull request #720 from liewegas/wip-6521

mon/PGMonitor: set floor below which we do not warn about objects/pg

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agomon/PGMonitor: set floor below which we do not warn about objects/pg 720/head
Sage Weil [Tue, 15 Oct 2013 18:22:16 +0000 (11:22 -0700)]
mon/PGMonitor: set floor below which we do not warn about objects/pg

If a cluster has very few objects, do not generate warnings when the
objects/pg for a pool diverges from the cluster average.  This avoids
spurious errors when you have a relatively empty cluster and a lone pool
with a modest number of objects is too far off the (mostly meaningless)
cluster-wide average.

Also include a per-pool min so we ignore mostly-empty pools.

Fixes: #6521
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #706 from ceph/wip-6059
Sage Weil [Tue, 15 Oct 2013 17:27:56 +0000 (10:27 -0700)]
Merge pull request #706 from ceph/wip-6059

Wip 6059

Partly-reviewed-by: Greg Farnum <greg@inktank.com>
Partly-reviewed-by: Sage Weil <sage@inktank.com>
11 years agorgw: fix authenticated users acl group check 718/head
Yehuda Sadeh [Tue, 15 Oct 2013 17:20:48 +0000 (10:20 -0700)]
rgw: fix authenticated users acl group check

Fixes: #6553
Backport: bobtail, cuttlefish, dumpling
Authenticated users group acl bit was not working correctly. Check to
test whether user is anonymous was wrong.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoMerge pull request #717 from dachary/master
Sage Weil [Tue, 15 Oct 2013 17:12:07 +0000 (10:12 -0700)]
Merge pull request #717 from dachary/master

mon: osd pool set syntax relaxed, modify unit tests

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agomon: osd pool set syntax relaxed, modify unit tests 717/head
Loic Dachary [Tue, 15 Oct 2013 17:03:25 +0000 (19:03 +0200)]
mon: osd pool set syntax relaxed, modify unit tests

The argument is no longer restricted to a numerical value. Another
variable was added ( hashpspool ) check that it is a valid variable.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #596 from ceph/wip-6147
Sage Weil [Tue, 15 Oct 2013 00:06:48 +0000 (17:06 -0700)]
Merge pull request #596 from ceph/wip-6147

mon: keep track of per-pool stats

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 15 Oct 2013 00:06:13 +0000 (17:06 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agoceph.spec.in: do not list ceph-rest-api twice; add missing cls_hello files
huangjun [Tue, 15 Oct 2013 00:02:23 +0000 (17:02 -0700)]
ceph.spec.in: do not list ceph-rest-api twice; add missing cls_hello files

Reported-by: hjwsm1989@gmail.com
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #712 from ceph/wip-mon-pool-set
Sage Weil [Mon, 14 Oct 2013 23:56:41 +0000 (16:56 -0700)]
Merge pull request #712 from ceph/wip-mon-pool-set

rework ceph osd pool set <pool> <field> <val>

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoosd/osd_types: generalize pg_pool_t::get_flags_string() 712/head
Sage Weil [Mon, 14 Oct 2013 23:54:07 +0000 (16:54 -0700)]
osd/osd_types: generalize pg_pool_t::get_flags_string()

This way the method doesn't have to be modified when new flags are added.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agomon: OSDMonitor: add 'osd pool stats' command 596/head
Joao Eduardo Luis [Wed, 2 Oct 2013 01:06:42 +0000 (02:06 +0100)]
mon: OSDMonitor: add 'osd pool stats' command

Fixes: #6147
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: PGMap: rework client IO rate calc and output
Joao Eduardo Luis [Thu, 3 Oct 2013 00:09:16 +0000 (01:09 +0100)]
mon: PGMap: rework client IO rate calc and output

Create a function so we can use the same format when outputting per-pool
stats

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: PGMap: reuse existing summary functions to output pool stats
Joao Eduardo Luis [Thu, 3 Oct 2013 00:08:07 +0000 (01:08 +0100)]
mon: PGMap: reuse existing summary functions to output pool stats

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agomon: PGMap: keep track of per-pool stats deltas
Joao Eduardo Luis [Mon, 14 Oct 2013 23:51:30 +0000 (00:51 +0100)]
mon: PGMap: keep track of per-pool stats deltas

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #694 from grosskur/fix-rpm-junit4
Sage Weil [Mon, 14 Oct 2013 23:48:17 +0000 (16:48 -0700)]
Merge pull request #694 from grosskur/fix-rpm-junit4

ceph.spec.in: Always depend on junit4 (fixes bug #6216)

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agomon: make 'mon {add,remove}_data_pool ...' take pool name or id 687/head
Sage Weil [Mon, 14 Oct 2013 23:46:58 +0000 (16:46 -0700)]
mon: make 'mon {add,remove}_data_pool ...' take pool name or id

Take either a pool name or an id.  Fix up the tests accordingly.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge branch 'wip-rgw-quota'
Yehuda Sadeh [Mon, 14 Oct 2013 21:14:17 +0000 (14:14 -0700)]
Merge branch 'wip-rgw-quota'

Conflicts:
src/test/cli/radosgw-admin/help.t

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: swift update obj metadata also add generic attrs
Yehuda Sadeh [Fri, 4 Oct 2013 20:00:26 +0000 (13:00 -0700)]
rgw: swift update obj metadata also add generic attrs

Fixes: #6462
We were missing the generic attributes when we updated the object
metadata (operation that only exists in the swift api).

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoMerge pull request #711 from ceph/wip-objecter-errors
Gregory Farnum [Mon, 14 Oct 2013 18:22:53 +0000 (11:22 -0700)]
Merge pull request #711 from ceph/wip-objecter-errors

These two patches fix several completion Contexts which are inappropriately setting the Op rval to zero.

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoSignalHandler: fix infinite loop on BSD systems
Alan Somers [Tue, 8 Oct 2013 22:24:00 +0000 (15:24 -0700)]
SignalHandler: fix infinite loop on BSD systems

SignalHandler::entry shouldn't poll for POLLOUT, because it never actually
writes to the pipes in question. Polling for POLLOUT causes poll(2) to
immediately return, so the function spins the CPU and never blocks. Remove
the POLLOUT flag, unnecessarily introduced in commit
8e4a78f169eda716c7d6811cb6db5c757dc67207 when switching from select() to poll().

This fixes the problem on FreeBSD and doesn't break anything (AFAICT) on
Linux. Tested on FreeBSD 9.1 amd64 and Ubuntu Server 13.04 amd64.

Fixes: #6492
Signed-off-by: Alan Somers <asomers@gmail.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agodoc: Removed underscore for consistency.
John Wilkins [Mon, 14 Oct 2013 17:31:51 +0000 (10:31 -0700)]
doc: Removed underscore for consistency.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoMerge pull request #713 from dachary/master
John Wilkins [Mon, 14 Oct 2013 17:27:52 +0000 (10:27 -0700)]
Merge pull request #713 from dachary/master

doc: disable cephx requires auth_supported = none

11 years agoradosgw-admin: add --quota-scope param to usage 707/head
Yehuda Sadeh [Mon, 14 Oct 2013 17:26:49 +0000 (10:26 -0700)]
radosgw-admin: add --quota-scope param to usage

and also look at it when setting quota on a bucket.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoMerge pull request #708 from ceph/wip-truncate2
Gregory Farnum [Mon, 14 Oct 2013 16:32:53 +0000 (09:32 -0700)]
Merge pull request #708 from ceph/wip-truncate2

Reviewed-by: Greg Farnum <greg@inktank.com>