Commit Graph

33871 Commits

Author SHA1 Message Date
Sage Weil
3b44f08f56 Merge pull request #1922 from ceph/wip-os-rename
os: rename get_*() -> decode_*()

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
2014-06-06 09:19:16 -07:00
Loic Dachary
e25e33e2dd Merge pull request #1928 from nereocystis/pool-pg-fix-spelling
doc: Descrption => Description

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-06-06 09:52:34 +02:00
Kevin Dalley
e31d3fe024 doc: Descrption => Description
Correct spelling error.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
2014-06-05 17:10:42 -07:00
Sage Weil
624ae21833 Merge pull request #1859 from ceph/wip-multipartition
ceph-disk: Enable creating multiple osds per dev

Reviewed-by: Dan Mick <dan.mick@inktank.com>
2014-06-05 12:08:33 -07:00
Sage Weil
a63ee3793d Merge remote-tracking branch 'gh/next' 2014-06-05 12:03:00 -07:00
Samuel Just
16e2ed0da8 Merge pull request #1925 from ceph/wip-i386-atomic
fix i386 atomic64_t

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-06-05 12:02:33 -07:00
Sage Weil
2081c992bb 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>
2014-06-05 11:59:31 -07:00
Sage Weil
64e99d81a8 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>
2014-06-05 11:58:47 -07:00
Sage Weil
aede83281f os: rename get_*() -> decode_*()
These methods have side-effects: they move the decode iterator *and*
return a value.  Rename them to avoid confusion with typical get_*
accessors.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-06-05 09:19:05 -07:00
Sage Weil
7c2c8da218 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>
2014-06-04 17:32:51 -07:00
Samuel Just
3261caadc6 Merge pull request #1582 from yuyuyu101/omap-cache
Add header cache to DBObjectMap

Reveiewed-by: Samuel Just <sam.just@inktank.com>
2014-06-04 16:03:05 -07:00
Samuel Just
f3b8ebedf1 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>
2014-06-04 16:01:43 -07:00
Loic Dachary
8464a0c685 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>
2014-06-05 00:42:25 +02:00
Danny Al-Gaaf
59d727de2c kv_flat_btree_async.cc: remove consecutive break after return
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-06-05 00:34:08 +02:00
Danny Al-Gaaf
82f5df4553 JournalScanner.cc: catch exception by reference
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-06-05 00:30:03 +02:00
Danny Al-Gaaf
53533ee998 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>
2014-06-05 00:13:57 +02:00
Danny Al-Gaaf
e24213ed26 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>
2014-06-05 00:12:01 +02:00
Sage Weil
51abf200ba Revert "Remove unused variables in MemStore.cc"
This reverts commit 307ba481a2.

The get_* methods have side effects!

Signed-off-by: Sage Weil <sage@inktank.com>
2014-06-04 15:07:17 -07:00
Sage Weil
a325e3ecb9 Revert "Remove unused variables in KeyValueStore.cc"
This reverts commit 23b657c704.

The get_* methods have side-effects!
2014-06-04 15:06:59 -07:00
Danny Al-Gaaf
cac902e3d3 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>
2014-06-04 23:36:07 +02:00
Danny Al-Gaaf
3ee3e66a95 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>
2014-06-04 23:22:18 +02:00
Danny Al-Gaaf
f17a9633fc 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>
2014-06-04 23:10:42 +02:00
Danny Al-Gaaf
f31e4c8358 libs3: update to latest git master of ceph/libs3
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2014-06-04 22:38:17 +02:00
Danny Al-Gaaf
18c07ec5a3 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>
2014-06-04 22:33:51 +02:00
Loic Dachary
0b35e61bb1 Merge pull request #1916 from sahid/unused
Remove unused variables on MemStore.cc and KeyValueStore.cc

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-06-04 22:03:53 +02:00
Danny Al-Gaaf
5f86652663 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>
2014-06-04 21:44:13 +02:00
Dan Mick
7f35532bb8 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>
2014-06-04 11:28:25 -07:00
Sahid Orentino Ferdjaoui
23b657c704 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>
2014-06-04 17:41:42 +02:00
Sahid Orentino Ferdjaoui
307ba481a2 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>
2014-06-04 17:41:32 +02:00
Ilya Dryomov
5185a368c3 automake: add dummy.cc to fix 'make tags'
Commit 421e6c5617 ("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>
2014-06-04 17:52:56 +04:00
Loic Dachary
d4415cb8d1 Merge pull request #1889 from sahid/master
trim dead code and add tests in bloom_filters

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-06-04 14:19:47 +02:00
Sahid Orentino Ferdjaoui
35509d2741 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>
2014-06-04 12:11:20 +02:00
Sahid Orentino Ferdjaoui
c50f85ea07 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>
2014-06-04 12:11:19 +02:00
Sahid Orentino Ferdjaoui
90cc6dd66d 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>
2014-06-04 12:11:19 +02:00
Josh Durgin
6d5ab09411 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>
2014-06-03 16:22:20 -07:00
Josh Durgin
8d002e9f92 Merge pull request #1896 from ceph/wip-8452
rgw: fetch object attrs on multipart completion

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-06-03 16:06:01 -07:00
Josh Durgin
d52239d020 Merge pull request #1906 from ceph/wip-runxfstests
wip-runxfstests

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-06-03 15:53:52 -07:00
Josh Durgin
765ab804c8 Merge pull request #1869 from ceph/wip-pybind-timeout
pybind/rados: Fix timeouts for small t

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-06-03 15:32:38 -07:00
Loic Dachary
1bbebb5483 Merge pull request #1910 from ceph/wip-8447
librados: simplify/fix rados_pool_list bounds checks

Reviewed-by: Loic Dachary <loic@dachary.org>
2014-06-03 21:27:08 +02:00
Sage Weil
3ec32a6bb1 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>
2014-06-03 11:45:20 -07:00
John Wilkins
3d0c2498f7 Merge pull request #1909 from dachary/wip-8514-documentation
doc: fix osd pool create and add osd erasure-code-profile
2014-06-03 09:43:35 -07:00
Gregory Farnum
eb63015b48 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>
2014-06-03 09:28:28 -07:00
Loic Dachary
5569d40bb4 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>
2014-06-03 14:53:56 +02:00
Loic Dachary
8ff4edda73 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>
2014-06-03 13:47:32 +02:00
Ilya Dryomov
22bc886ac5 doc: fix 'rbd map' example
Looks like 'foo' is a leftover, see commit ea9fc87d89 ("doc: Removed
foo.  Apparently myimage was added and foo not removed.").

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
2014-06-03 14:32:21 +04:00
Sage Weil
4951244726 Merge remote-tracking branch 'gh/next' 2014-06-02 22:24:48 -07:00
Sage Weil
4f834fa8ef doc/release-notes: v0.81
Signed-off-by: Sage Weil <sage@inktank.com>
2014-06-02 22:24:42 -07:00
Josh Durgin
f4e81d32e3 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>
2014-06-02 17:34:56 -07:00
sushma
884a6b374a 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>
2014-06-02 16:29:43 -07:00
John Wilkins
0cc9ade824 doc: Updated monitor output and added usage calc explanations.
Fixes: #4948

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-06-02 16:03:31 -07:00