]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agodoc: Use write_full for C++ example 1926/head
Kevin Dalley [Thu, 5 Jun 2014 23:48:21 +0000 (16:48 -0700)]
doc: Use write_full for C++ example
Latest version of librados uses write_full when writing entire object.

Should the documentation mention that the method "write" used to serve
this function.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agoMerge pull request #1859 from ceph/wip-multipartition
Sage Weil [Thu, 5 Jun 2014 19:08:33 +0000 (12:08 -0700)]
Merge pull request #1859 from ceph/wip-multipartition

ceph-disk: Enable creating multiple osds per dev

Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Thu, 5 Jun 2014 19:03:00 +0000 (12:03 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agoMerge pull request #1925 from ceph/wip-i386-atomic
Samuel Just [Thu, 5 Jun 2014 19:02:33 +0000 (12:02 -0700)]
Merge pull request #1925 from ceph/wip-i386-atomic

fix i386 atomic64_t

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoinclude/atomic: make 32-bit atomic64_t unsigned 1924/head 1925/head
Sage Weil [Thu, 5 Jun 2014 17:43:16 +0000 (10:43 -0700)]
include/atomic: make 32-bit atomic64_t unsigned

This fixes

In file included from test/perf_counters.cc:19:0:
./common/perf_counters.h: In member function ‘std::pair PerfCounters::perf_counter_data_any_d::read_avg() const’:
warning: ./common/perf_counters.h:156:36: comparison between signed and unsigned integer expressions [-Wsign-compare]
} while (avgcount2.read() != count);
^

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoceph-objectstore-test: fix warning in collect_metadata test
Sage Weil [Thu, 5 Jun 2014 18:56:58 +0000 (11:56 -0700)]
ceph-objectstore-test: fix warning in collect_metadata test

In file included from test/objectstore/store_test.cc:33:0:
../src/gtest/include/gtest/gtest.h: In function ‘testing::AssertionResult testing::internal::CmpHelperNE(const char*, const char*, const T1&, const T2&) [with T1 = long unsigned int, T2 = int]’:
test/objectstore/store_test.cc:82:5: instantiated from here
warning: ../src/gtest/include/gtest/gtest.h:1379:1: comparison between signed and unsigned integer expressions [-Wsign-compare]

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1918 from ceph/wip-da-SCA-20140604
Sage Weil [Thu, 5 Jun 2014 00:32:51 +0000 (17:32 -0700)]
Merge pull request #1918 from ceph/wip-da-SCA-20140604

Some new fixes for gcc and cppcheck warnings/issues

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1582 from yuyuyu101/omap-cache
Samuel Just [Wed, 4 Jun 2014 23:03:05 +0000 (16:03 -0700)]
Merge pull request #1582 from yuyuyu101/omap-cache

Add header cache to DBObjectMap

Reveiewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1865 from dachary/wip-8254
Samuel Just [Wed, 4 Jun 2014 23:01:43 +0000 (16:01 -0700)]
Merge pull request #1865 from dachary/wip-8254

osd: convert shard_id_t  from uint8_t to struct + merge shard_t into it

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1917 from ceph/wip-da-update-libs3
Loic Dachary [Wed, 4 Jun 2014 22:42:25 +0000 (00:42 +0200)]
Merge pull request #1917 from ceph/wip-da-update-libs3

libs3: update to latest git master of ceph/libs3

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agokv_flat_btree_async.cc: remove consecutive break after return 1918/head
Danny Al-Gaaf [Wed, 4 Jun 2014 22:34:08 +0000 (00:34 +0200)]
kv_flat_btree_async.cc: remove consecutive break after return

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoJournalScanner.cc: catch exception by reference
Danny Al-Gaaf [Wed, 4 Jun 2014 22:30:03 +0000 (00:30 +0200)]
JournalScanner.cc: catch exception by reference

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoKeyValueStore.cc: silence gcc -Wunused-variable
Danny Al-Gaaf [Wed, 4 Jun 2014 22:13:57 +0000 (00:13 +0200)]
KeyValueStore.cc: silence gcc -Wunused-variable

Don't assign return value of i.get_length() to a variable until
they are really used. Added comment on what is the intention of
the variables.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoMemStore.cc: silence gcc -Wunused-variable
Danny Al-Gaaf [Wed, 4 Jun 2014 22:12:01 +0000 (00:12 +0200)]
MemStore.cc: silence gcc -Wunused-variable

Don't assign return value of i.get_length() to a variable until
they are really used. Added comment on what is the intention of
the variables.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoRevert "Remove unused variables in MemStore.cc"
Sage Weil [Wed, 4 Jun 2014 22:07:17 +0000 (15:07 -0700)]
Revert "Remove unused variables in MemStore.cc"

This reverts commit 307ba481a2705338560ecb557741d459706bdeb6.

The get_* methods have side effects!

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoRevert "Remove unused variables in KeyValueStore.cc"
Sage Weil [Wed, 4 Jun 2014 22:06:59 +0000 (15:06 -0700)]
Revert "Remove unused variables in KeyValueStore.cc"

This reverts commit 23b657c704865b33aa2e0e39995712c1f583c24d.

The get_* methods have side-effects!

11 years agoos/KeyValueStore.cc: fix possible null pointer deref warning
Danny Al-Gaaf [Wed, 4 Jun 2014 21:36:07 +0000 (23:36 +0200)]
os/KeyValueStore.cc: fix possible null pointer deref warning

Add assert check for header->header and remove redundant 'if'
check for header again later.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agolibrbd/internal.cc: check earlier for null pointer
Danny Al-Gaaf [Wed, 4 Jun 2014 21:22:18 +0000 (23:22 +0200)]
librbd/internal.cc: check earlier for null pointer

Fix potential null ponter deref, move check for 'order != NULL'
to the beginning of the function to prevent a) deref in ldout() call
and b) to leave function as early as possible if check fails.

[src/librbd/internal.cc:843] -> [src/librbd/internal.cc:865]: (warning)
 Possible null pointer dereference: order - otherwise it is redundant
 to check it against null.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agotest/librbd/fsx.c: fix gcc warning
Danny Al-Gaaf [Wed, 4 Jun 2014 21:10:42 +0000 (23:10 +0200)]
test/librbd/fsx.c: fix gcc warning

Initialize pointer with NULL before call posix_memalign() to fix
gcc warning:

test/librbd/fsx.c:1402:13: warning: ‘temp_buf’ may be used
 uninitialized in this function [-Wmaybe-uninitialized]
  if ((ret = ops->read(&cur_ctx, 0, file_info.st_size, temp_buf)) < 0) {
             ^
test/librbd/fsx.c:1398:13: warning: ‘good_buf’ may be used
 uninitialized in this function [-Wmaybe-uninitialized]
  if ((ret = pread(fd, good_buf, file_info.st_size, 0)) < 0) {

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agolibs3: update to latest git master of ceph/libs3 1917/head
Danny Al-Gaaf [Wed, 4 Jun 2014 20:38:17 +0000 (22:38 +0200)]
libs3: update to latest git master of ceph/libs3

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agocommon/addr_parsing.c: fix realloc memory leak
Danny Al-Gaaf [Wed, 4 Jun 2014 20:33:51 +0000 (22:33 +0200)]
common/addr_parsing.c: fix realloc memory leak

Fix handling of realloc. If realloc() fails it returns NULL, assigning
the return value of realloc() directly to the pointer without checking
for the result will lead to a memory leak in error case.

Use a temporary pointer to hold the result of realloc(). In error case
print error and exit, otherwise assign it to the pointer we want to realloc.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoMerge pull request #1916 from sahid/unused
Loic Dachary [Wed, 4 Jun 2014 20:03:53 +0000 (22:03 +0200)]
Merge pull request #1916 from sahid/unused

Remove unused variables on MemStore.cc and KeyValueStore.cc

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agodaemon_config.cc: add some more asserts
Danny Al-Gaaf [Wed, 4 Jun 2014 19:44:13 +0000 (21:44 +0200)]
daemon_config.cc: add some more asserts

Add assert checks for some more set_val() calls to fix cppcheck issue
"Variable 'ret' is reassigned a value before the old one has been used"

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
11 years agoMerge pull request #1914 from ceph/wip-autotools-dummy
Dan Mick [Wed, 4 Jun 2014 18:28:25 +0000 (11:28 -0700)]
Merge pull request #1914 from ceph/wip-autotools-dummy

automake: add dummy.cc to fix 'make tags'

Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agoRemove unused variables in KeyValueStore.cc 1916/head
Sahid Orentino Ferdjaoui [Wed, 4 Jun 2014 15:40:47 +0000 (17:40 +0200)]
Remove unused variables in KeyValueStore.cc

Removes two unused variables expected_object_size and
expected_write_size in KeyValueStore.cc

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoRemove unused variables in MemStore.cc
Sahid Orentino Ferdjaoui [Wed, 4 Jun 2014 15:38:39 +0000 (17:38 +0200)]
Remove unused variables in MemStore.cc

Removes two unused variables expected_object_size and
expected_write_size in MemStore.cc

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoautomake: add dummy.cc to fix 'make tags' 1914/head
Ilya Dryomov [Wed, 4 Jun 2014 13:34:06 +0000 (17:34 +0400)]
automake: add dummy.cc to fix 'make tags'

Commit 421e6c561704 ("test_librbd_fsx: add krbd mode support") added
a requirement for ceph_test_librbd_fsx to be linked with a C++ linker.
Implement it in a way that doesn't break 'make tags'.

Fixes: #8530
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoMerge pull request #1889 from sahid/master
Loic Dachary [Wed, 4 Jun 2014 12:19:47 +0000 (14:19 +0200)]
Merge pull request #1889 from sahid/master

trim dead code and add tests in bloom_filters

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agobloom_filter, add test to validate assignement operator 1889/head
Sahid Orentino Ferdjaoui [Mon, 2 Jun 2014 09:53:33 +0000 (11:53 +0200)]
bloom_filter, add test to validate assignement operator

Adds a test to ensure the good behavior of the
operator assignement.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agobloom_filter, remove unecessary operators
Sahid Orentino Ferdjaoui [Fri, 30 May 2014 13:04:34 +0000 (15:04 +0200)]
bloom_filter, remove unecessary operators

Removes 3 not used operators (intersect, union,
and diff) since after use those methods fpp and is_full are
corrupted.

Fixes: #8476
Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agobloom_filter, add assertion to test validate element_count()
Sahid Orentino Ferdjaoui [Mon, 19 May 2014 18:32:50 +0000 (20:32 +0200)]
bloom_filter, add assertion to test validate element_count()

Adds to TEST(BloomFilter, Basic) a new assertion
to verify the good behavior of the method 'element_count()'.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoMerge pull request #1907 from ceph/wip-8311
Josh Durgin [Tue, 3 Jun 2014 23:22:20 +0000 (16:22 -0700)]
Merge pull request #1907 from ceph/wip-8311

rgw: if extra data pool name is empty, use data pool name instead

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1896 from ceph/wip-8452
Josh Durgin [Tue, 3 Jun 2014 23:06:01 +0000 (16:06 -0700)]
Merge pull request #1896 from ceph/wip-8452

rgw: fetch object attrs on multipart completion

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1906 from ceph/wip-runxfstests
Josh Durgin [Tue, 3 Jun 2014 22:53:52 +0000 (15:53 -0700)]
Merge pull request #1906 from ceph/wip-runxfstests

wip-runxfstests

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1869 from ceph/wip-pybind-timeout
Josh Durgin [Tue, 3 Jun 2014 22:32:38 +0000 (15:32 -0700)]
Merge pull request #1869 from ceph/wip-pybind-timeout

pybind/rados: Fix timeouts for small t

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoMerge pull request #1910 from ceph/wip-8447
Loic Dachary [Tue, 3 Jun 2014 19:27:08 +0000 (21:27 +0200)]
Merge pull request #1910 from ceph/wip-8447

librados: simplify/fix rados_pool_list bounds checks

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agolibrados: simplify/fix rados_pool_list bounds checks 1910/head
Sage Weil [Tue, 3 Jun 2014 18:45:20 +0000 (11:45 -0700)]
librados: simplify/fix rados_pool_list bounds checks

We were not breaking out of the loop when we filled up the buffer unless
we happened to do so on a pool name boundary.  This means that len would
roll over (it was unsigned).  In my case, I was not able to reproduce
anything particularly bad since (I think) the strncpy was interpreting the
large unsigned value as signed, but in any case this fixes it, simplifies
the arithmetic, and adds a simple test.

- use a single 'rl' value for the amount of buffer space we want to
  consume
- use this to check that there is room and also as the strncat length
- rely on the initial memset to ensure that the trailing 0 is in place.

Fixes: #8447
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1909 from dachary/wip-8514-documentation
John Wilkins [Tue, 3 Jun 2014 16:43:35 +0000 (09:43 -0700)]
Merge pull request #1909 from dachary/wip-8514-documentation

doc: fix osd pool create and add osd erasure-code-profile

11 years agoMerge pull request #1908 from jdurgin/wip-librbd-license-header
Gregory Farnum [Tue, 3 Jun 2014 16:28:28 +0000 (09:28 -0700)]
Merge pull request #1908 from jdurgin/wip-librbd-license-header

librbd: clarify license header to say LGPL

Everybody who has contributed has already explicitly agreed to relicense RBD to LGPL...except for me, and I am granting it now.

Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agodocumentation: add osd erasure-code-profile {set,rm,get,ls} 1909/head
Loic Dachary [Tue, 3 Jun 2014 11:47:51 +0000 (13:47 +0200)]
documentation: add osd erasure-code-profile {set,rm,get,ls}

And a link from rados/operations.

http://tracker.ceph.com/issues/8514 Fixes: #8514

Reported-by: Kenneth Waegeman <Kenneth.Waegeman@UGent.be>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agodocumentation: update osd pool create erasure
Loic Dachary [Tue, 3 Jun 2014 11:05:19 +0000 (13:05 +0200)]
documentation: update osd pool create erasure

The properties are replaced with erasure code profiles. Remove the
reference to properties and the documentation of each erasure-code
related property.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agodoc: fix 'rbd map' example
Ilya Dryomov [Tue, 3 Jun 2014 10:32:21 +0000 (14:32 +0400)]
doc: fix 'rbd map' example

Looks like 'foo' is a leftover, see commit ea9fc87d8996 ("doc: Removed
foo.  Apparently myimage was added and foo not removed.").

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 3 Jun 2014 05:24:48 +0000 (22:24 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agodoc/release-notes: v0.81
Sage Weil [Tue, 3 Jun 2014 05:24:33 +0000 (22:24 -0700)]
doc/release-notes: v0.81

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agolibrbd: clarify license header 1908/head
Josh Durgin [Tue, 3 Jun 2014 00:34:50 +0000 (17:34 -0700)]
librbd: clarify license header

These were meant to say LGPL, but a typo was propagated and it
referred to the non-existent GPL2.1, and also to COPYING which
correctly indicated these files were LGPL2.1.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoRadosClient: Avoid the DispatchQueue for OSD responses.
sushma [Wed, 28 May 2014 22:27:54 +0000 (15:27 -0700)]
RadosClient: Avoid the DispatchQueue for OSD responses.

Prior to this change, reader thread puts the response on the DispatchQueue
and Dispatcher thread would call librados callbacks (C_aio_Ack, C_Safe_Cond).
The single DispatchQueue and Dispatcher thread (per client) would become
a bottleneck with multiple OSDs in the cluster.
Similar to fast-dispatch changes on the OSD, DispatchQueue/thread are removed
and librados internal callbacks will be called from reader thread context.

Signed-off-by: Sushma Gurram <sushma.gurram@sandisk.com>
Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agodoc: Updated monitor output and added usage calc explanations.
John Wilkins [Mon, 2 Jun 2014 23:03:31 +0000 (16:03 -0700)]
doc: Updated monitor output and added usage calc explanations.

Fixes: #4948
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added usage for pool quotas.
John Wilkins [Mon, 2 Jun 2014 22:31:45 +0000 (15:31 -0700)]
doc: Added usage for pool quotas.

Fixes: #5653
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added more discussion of new CRUSH types.
John Wilkins [Mon, 2 Jun 2014 21:40:27 +0000 (14:40 -0700)]
doc: Added more discussion of new CRUSH types.

Fixes: #7727
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added a section for ceph df.
John Wilkins [Mon, 2 Jun 2014 19:21:42 +0000 (12:21 -0700)]
doc: Added a section for ceph df.

Fixes: #8281
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years ago0.81 v0.81
Jenkins [Mon, 2 Jun 2014 18:37:27 +0000 (18:37 +0000)]
0.81

11 years agodoc: Updated packages to reference firefly.
John Wilkins [Mon, 2 Jun 2014 18:28:22 +0000 (11:28 -0700)]
doc: Updated packages to reference firefly.

Fixes: #8466
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoMerge pull request #1887 from rossturk/wip-rturkfonts
John Wilkins [Mon, 2 Jun 2014 18:06:36 +0000 (11:06 -0700)]
Merge pull request #1887 from rossturk/wip-rturkfonts

doc: remove Apex Sans from generated doc HTML

11 years agoMerge pull request #1885 from nereocystis/rados-bench-man
John Wilkins [Mon, 2 Jun 2014 18:05:34 +0000 (11:05 -0700)]
Merge pull request #1885 from nereocystis/rados-bench-man

doc: Improve man page for bench

11 years agoMerge pull request #1857 from ceph/wip-8265
Sage Weil [Mon, 2 Jun 2014 17:45:05 +0000 (10:45 -0700)]
Merge pull request #1857 from ceph/wip-8265

#8265: config: make int parser accept K, M, G, T, P suffix and scale value accordingly

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1902 from dachary/wip-copyright-notices
Sage Weil [Mon, 2 Jun 2014 16:10:11 +0000 (09:10 -0700)]
Merge pull request #1902 from dachary/wip-copyright-notices

erasure-code: Ceph distributed storage system

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoqa: add run_xfstests_krbd.sh wrapper 1906/head
Ilya Dryomov [Tue, 27 May 2014 14:35:36 +0000 (18:35 +0400)]
qa: add run_xfstests_krbd.sh wrapper

As run_xfstests.sh does no longer accept test lists, wrap it to provide
an expunge file with a list of tests we want to skip for krbd runs.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoqa: catch up with xfstests changes
Ilya Dryomov [Tue, 27 May 2014 14:35:36 +0000 (18:35 +0400)]
qa: catch up with xfstests changes

Back in 2013 xfstests were rearranged, which also changed the way
./check parses test lists.  Catch up with those changes.  Note that
tests can no longer be listed in ranges, we only accept individual
tests and test groups (e.g. -g quick).

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoqa: cp run_xfstests.sh run_xfstests-obsolete.sh
Ilya Dryomov [Fri, 30 May 2014 09:37:04 +0000 (13:37 +0400)]
qa: cp run_xfstests.sh run_xfstests-obsolete.sh

run_xfstests.sh is going to be updated in the next commit to be able to
drive newer xfstests.  Among other things, the new xfstests proper
doesn't support listing tests in ranges, which is what the qemu wrapper
(run_xfstests_qemu.sh) relies on.  So keep a copy of the old
run_xfstests.sh around until the qemu vm image is regenerated and the
up-to-date exclusion list for that kernel is shaken out.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoerasure-code: Ceph distributed storage system 1902/head
Loic Dachary [Sat, 31 May 2014 19:00:36 +0000 (21:00 +0200)]
erasure-code: Ceph distributed storage system

instead of Ceph - scalable distributed file system in the copyright notices

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoscripts/run-coverity: don't explicitly specify tool version
Sage Weil [Sat, 31 May 2014 15:13:48 +0000 (08:13 -0700)]
scripts/run-coverity: don't explicitly specify tool version

Rely on a symlink instead.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1901 from dachary/wip-erasure-code-concat
Loic Dachary [Sat, 31 May 2014 11:58:49 +0000 (13:58 +0200)]
Merge pull request #1901 from dachary/wip-erasure-code-concat

erasure-code: make decode_concat virtual

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
11 years agoMerge pull request #1900 from dachary/wip-ostream
Loic Dachary [Sat, 31 May 2014 11:57:11 +0000 (13:57 +0200)]
Merge pull request #1900 from dachary/wip-ostream

common: s/stringstream/ostream/ in str_map

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
11 years agoerasure-code: make decode_concat virtual 1901/head
Loic Dachary [Thu, 16 Jan 2014 12:58:21 +0000 (13:58 +0100)]
erasure-code: make decode_concat virtual

So that a plugin can provide a more efficient implementation.

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1898 from dhxgit/master
Loic Dachary [Sat, 31 May 2014 11:20:25 +0000 (13:20 +0200)]
Merge pull request #1898 from dhxgit/master

Update INSTALL to mention the submodules/recursive

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agocommon: s/stringstream/ostream/ in str_map 1900/head
Loic Dachary [Mon, 13 Jan 2014 16:54:08 +0000 (17:54 +0100)]
common: s/stringstream/ostream/ in str_map

There is no need to specialize more than ostream : it only makes it
impossible to use cerr or cout as a parameter to str_map.

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoUpdate INSTALL to mention the submodules/recursive 1898/head
Dominik Hannen [Sat, 31 May 2014 09:22:41 +0000 (11:22 +0200)]
Update INSTALL to mention the submodules/recursive

Signed-off-by: Dominik Hannen <cantares1+github@gmail.com>
11 years agoMerge pull request #1895 from ceph/wip-sock-cmp
Loic Dachary [Sat, 31 May 2014 08:27:44 +0000 (10:27 +0200)]
Merge pull request #1895 from ceph/wip-sock-cmp

msg: remove comparison operators for sockaddr_storage

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agomsg: remove comparison operators for sockaddr_storage 1895/head
Sage Weil [Fri, 30 May 2014 23:26:25 +0000 (16:26 -0700)]
msg: remove comparison operators for sockaddr_storage

We don't need these at all, it turns out.

Signed-off-by: Sage Weil <sage@inktank.com>
11 years agorgw: fetch object attrs on multipart completion 1896/head
Yehuda Sadeh [Fri, 30 May 2014 23:17:47 +0000 (16:17 -0700)]
rgw: fetch object attrs on multipart completion

Fixes: #8452
Backport: firefly
This fixes a regression following a code cleanup.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agorgw: if extra data pool name is empty, use data pool name instead 1907/head
Yehuda Sadeh [Fri, 30 May 2014 21:47:25 +0000 (14:47 -0700)]
rgw: if extra data pool name is empty, use data pool name instead

Fixes: #8311
An empty pool name could be used as the extra data pool.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
11 years agoqa/workunits/cephtool: test setting options using SI units 1857/head
Joao Eduardo Luis [Fri, 23 May 2014 16:02:23 +0000 (17:02 +0100)]
qa/workunits/cephtool: test setting options using SI units

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agocommon/config.cc: allow integer values to be parsed as SI units
Joao Eduardo Luis [Fri, 23 May 2014 16:01:38 +0000 (17:01 +0100)]
common/config.cc: allow integer values to be parsed as SI units

We are allowing this for all and any integer values; that is, OPT_INT,
OPT_LONGLONG, OPT_U32 and OPT_U64.

It's on the user to use appropriate units.  For instance, the user should
not use 'E(xabyte)' when setting a signed int, and use his best judgment
when setting options that, for instance, ought to receive seconds.

Fixes: 8265
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agotest/strtol.cc: Test 'strict_strtosi()'
Joao Eduardo Luis [Fri, 23 May 2014 15:52:08 +0000 (16:52 +0100)]
test/strtol.cc: Test 'strict_strtosi()'

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agocommon/strtol.cc: strict_strtosi() converts str with SI units to uint64_t
Joao Eduardo Luis [Fri, 23 May 2014 15:51:37 +0000 (16:51 +0100)]
common/strtol.cc: strict_strtosi() converts str with SI units to uint64_t

Accepts values with a suffix (B, K, M, G, T, P, E) and returns the
appropriate byte value.

E.g., 10B = 10, while 10K = 10240.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Fri, 30 May 2014 17:13:59 +0000 (10:13 -0700)]
Merge remote-tracking branch 'gh/next'

11 years agorgw: calc md5 and compare if user provided appropriate header
Yehuda Sadeh [Fri, 23 May 2014 21:58:54 +0000 (14:58 -0700)]
rgw: calc md5 and compare if user provided appropriate header

Fixes: #8436
Backport: firefly

This was broken in ddc2e1a8e39a5c6b9b224c3eebd1c0e762ca5782. The fix
resurrects and old check that was dropped.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1888 from ceph/wip-8472
Loic Dachary [Fri, 30 May 2014 08:03:04 +0000 (10:03 +0200)]
Merge pull request #1888 from ceph/wip-8472

msg_types.h: Don't use strncmp for comparing sockaddr_in.

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agomsg_types.h: Don't use strncmp for comparing sockaddr_in. 1888/head
Dan Mick [Thu, 29 May 2014 23:20:01 +0000 (16:20 -0700)]
msg_types.h: Don't use strncmp for comparing sockaddr_in.

Fixes: #8472
Signed-off-by: Dan Mick <dan.mick@inktank.com>
11 years agodoc: Improve man page for rados bench 1885/head
Kevin Dalley [Thu, 29 May 2014 23:03:50 +0000 (16:03 -0700)]
doc: Improve man page for rados bench

Add information about seq and rand for bench. Also mention
--no-cleanup option.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agoMerge pull request #1886 from nereocystis/pools-doc
Loic Dachary [Thu, 29 May 2014 22:08:16 +0000 (00:08 +0200)]
Merge pull request #1886 from nereocystis/pools-doc

doc: update pools documentation

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agodoc: update pools documentation 1886/head
Kevin Dalley [Thu, 29 May 2014 21:56:06 +0000 (14:56 -0700)]
doc: update pools documentation

set=>get in "Get Pool Values"
grep for 'replicated size', not 'rep size'

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agodoc: Improve man page for bench
Kevin Dalley [Thu, 29 May 2014 21:28:47 +0000 (14:28 -0700)]
doc: Improve man page for bench

Add information about seq and rand for bench. Also mention
--no-cleanup option.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agoosd: replace shard_t usage with shard_id_t 1865/head
Loic Dachary [Thu, 29 May 2014 20:57:29 +0000 (22:57 +0200)]
osd: replace shard_t usage with shard_id_t

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoosd: explicit shard_id_t() and NO_SHARD
Loic Dachary [Wed, 28 May 2014 13:43:32 +0000 (15:43 +0200)]
osd: explicit shard_id_t() and NO_SHARD

Whenever an integer needs to be converted in a shard_id_t,
replace the implicit conversion with an explicit call to the
constructor.

Replace all ghobject_t::NO_SHARD and ghobject_t::no_shard() with
shard_id_t::NO_SHARD

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoosd: loop over uint8_t instead of shard_id_t
Loic Dachary [Wed, 28 May 2014 13:36:57 +0000 (15:36 +0200)]
osd: loop over uint8_t instead of shard_id_t

When looping in the range [0,number of shards[ using a uint8_t variable
which is an integer instead of shard_id_t. The alternative would be
define the ++ operator on shard_id_t but since the two are used
interchangeably in a number of places, that seems unnecessary.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1884 from nereocystis/glossary-rados
John Wilkins [Thu, 29 May 2014 21:12:40 +0000 (14:12 -0700)]
Merge pull request #1884 from nereocystis/glossary-rados

doc: Define RADOS in glossary

11 years agoosd: factorize shard_id_t/shard_t into a struct
Loic Dachary [Thu, 29 May 2014 21:11:48 +0000 (23:11 +0200)]
osd: factorize shard_id_t/shard_t into a struct

The struct contains a single uint8_t and is preferred to control
conversions that would otherwise be implicit. There is no difference
between shard_id_t and shard_t. The definition is moved in
include/types.h so it is available to both hobject.h and osd_types.h

http://tracker.ceph.com/issues/8254 Fixes: #8254

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agodoc: Define RADOS in glossary 1884/head
Kevin Dalley [Thu, 29 May 2014 21:03:30 +0000 (14:03 -0700)]
doc: Define RADOS in glossary

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
11 years agodoc: Added osd pool default size setting example.
John Wilkins [Thu, 29 May 2014 20:22:52 +0000 (13:22 -0700)]
doc: Added osd pool default size setting example.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Moved redundant text out of quick-common.
John Wilkins [Thu, 29 May 2014 20:22:18 +0000 (13:22 -0700)]
doc: Moved redundant text out of quick-common.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agocommon: WRITE_{EQ,CMP}_OPERATORS_1
Loic Dachary [Wed, 28 May 2014 12:53:47 +0000 (14:53 +0200)]
common: WRITE_{EQ,CMP}_OPERATORS_1

For when a struct is defined to encapsulate a single value and get
control over implicit conversions that would otherwise be impossible
with typedef.

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1882 from ceph/wip-8465
Samuel Just [Thu, 29 May 2014 19:27:48 +0000 (12:27 -0700)]
Merge pull request #1882 from ceph/wip-8465

osd: fix bad is_active() assert in share_map()

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1840 from yuyuyu101/wip-8381
Samuel Just [Thu, 29 May 2014 19:25:50 +0000 (12:25 -0700)]
Merge pull request #1840 from yuyuyu101/wip-8381

Fix set_alloc_hint op cause KeyValueStore crash problem

Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoMerge pull request #1874 from ceph/wip-8292
Sage Weil [Thu, 29 May 2014 18:24:47 +0000 (11:24 -0700)]
Merge pull request #1874 from ceph/wip-8292

better error reporting on incompatible device requirements

Reviewed-by: Dan Mick <dan.mick@inktank.com>
11 years agoosd: fix bad is_active() assert in share_map() 1882/head
Sage Weil [Thu, 29 May 2014 18:10:18 +0000 (11:10 -0700)]
osd: fix bad is_active() assert in share_map()

We may be is_stopping() here if we are racing with shutdown().

Fixes: #8465
Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1880 from ailzhang/patch-1
Sage Weil [Thu, 29 May 2014 17:42:10 +0000 (10:42 -0700)]
Merge pull request #1880 from ailzhang/patch-1

rest-api: key missing for per "rx" and "rwx"

Backport: firefly
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1847 from ceph/wip-8259
Sage Weil [Thu, 29 May 2014 17:40:39 +0000 (10:40 -0700)]
Merge pull request #1847 from ceph/wip-8259

README, Makefile: make install-deps easier

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1860 from ceph/wip-filestore
Sage Weil [Thu, 29 May 2014 17:37:23 +0000 (10:37 -0700)]
Merge pull request #1860 from ceph/wip-filestore

osd: filestore backend improvements

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1864 from dachary/wip-filestore 1860/head
Sage Weil [Thu, 29 May 2014 17:26:17 +0000 (10:26 -0700)]
Merge pull request #1864 from dachary/wip-filestore

unit tests for #1860