]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
11 years agoMerge pull request #1948 from steveftaylor/6700
Alfredo Deza [Thu, 12 Jun 2014 12:23:22 +0000 (08:23 -0400)]
Merge pull request #1948 from steveftaylor/6700

Fix for bug #6700

Reviewed-by: Alfredo Deza <alfredo.deza@inktank.com>
11 years agoMerge pull request #1937 from yuyuyu101/keyvaluestore-strip-size
Sage Weil [Thu, 12 Jun 2014 03:24:04 +0000 (20:24 -0700)]
Merge pull request #1937 from yuyuyu101/keyvaluestore-strip-size

Add strip size and set_alloc_hint op support for KeyValueStore

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agodoc: Made mention of "incomplete" status.
John Wilkins [Wed, 11 Jun 2014 23:11:47 +0000 (16:11 -0700)]
doc: Made mention of "incomplete" status.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoMerge pull request #1953 from ceph/wip-xattr-spillout
Gregory Farnum [Wed, 11 Jun 2014 21:59:25 +0000 (14:59 -0700)]
Merge pull request #1953 from ceph/wip-xattr-spillout

Enable and fix the existing xattr spillout code.

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1897 from somnathr/wip-sharded-threadpool
Gregory Farnum [Wed, 11 Jun 2014 21:29:55 +0000 (14:29 -0700)]
Merge pull request #1897 from somnathr/wip-sharded-threadpool

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
11 years agoqa: add an fsx run which turns on kernel debugging
Greg Farnum [Wed, 11 Jun 2014 20:40:48 +0000 (13:40 -0700)]
qa: add an fsx run which turns on kernel debugging

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoFileStore: remove the user_only param from _fgetattrs 1953/head
Greg Farnum [Tue, 20 May 2014 20:09:26 +0000 (13:09 -0700)]
FileStore: remove the user_only param from _fgetattrs

Nobody sets it to true, so remove it!

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoFileStore: remove user_only options from getattrs through the ObjectStore stack
Greg Farnum [Tue, 20 May 2014 18:07:45 +0000 (11:07 -0700)]
FileStore: remove user_only options from getattrs through the ObjectStore stack

This sort of awareness belongs at a higher level in the stack -- as
evidenced by nobody using the option at this level. Remove it from the
implementations and the interface

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoFileStore: do not use user_only in collection_getattrs
Greg Farnum [Tue, 20 May 2014 20:04:02 +0000 (13:04 -0700)]
FileStore: do not use user_only in collection_getattrs

There's no particular reason why any of the callers of collection_getattrs
want to avoid looking at Ceph's internal xattrs.
It looks like this flag (set in 1862ddd88548fd4609f4fa9715dbad42a84d3775) was
set this way by mistake.
And finally, we don't actually set xattrs on collections anymore, anyway.

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoFileStore: remove dead code
Greg Farnum [Thu, 24 Apr 2014 22:38:51 +0000 (15:38 -0700)]
FileStore: remove dead code

This case wasn't reachable when it was introduced, and it's still not.

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoFileStore: set XATTR_NO_SPILL_OUT when creating new files.
Greg Farnum [Thu, 24 Apr 2014 22:34:24 +0000 (15:34 -0700)]
FileStore: set XATTR_NO_SPILL_OUT when creating new files.

Fixes: #8205
Backport: firefly

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoFileStore: make _clone() copy spill out marker
Haomai Wang [Sat, 7 Jun 2014 06:32:23 +0000 (14:32 +0800)]
FileStore: make _clone() copy spill out marker

Previously we were not doing so, and that resulted in unpredictable loss
of xattrs from the client's perspective.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoAdd xattr test to ceph_test_objectstore
Haomai Wang [Fri, 6 Jun 2014 08:44:04 +0000 (16:44 +0800)]
Add xattr test to ceph_test_objectstore

Add xattr synthetic test to test ObjectStore xattr related interfaces.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
11 years agoPG: Added a const spg_t member to the PG class 1897/head
Somnath Roy [Wed, 11 Jun 2014 01:10:30 +0000 (18:10 -0700)]
PG: Added a const spg_t member to the PG class
The const spg_t member is been insantiated from constructor
and now get_pgid() can reference this to return a spg_t instance
without the need of pg_info (thus not requiring to acquire pg_lock).

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
11 years agodoc: Added a tip to install NTP when running multiple monitors.
John Wilkins [Wed, 11 Jun 2014 00:45:18 +0000 (17:45 -0700)]
doc: Added a tip to install NTP when running multiple monitors.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added additional background to address additional states.
John Wilkins [Wed, 11 Jun 2014 00:44:02 +0000 (17:44 -0700)]
doc: Added additional background to address additional states.

Covers 1-node cluster issues, fewer OSDs than replicas, and
active + clean + inconsistent states in greater detail.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agodoc: Added background discussion to clock settings.
John Wilkins [Wed, 11 Jun 2014 00:42:21 +0000 (17:42 -0700)]
doc: Added background discussion to clock settings.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoOSD: The thread pool variable name changed
Somnath Roy [Tue, 10 Jun 2014 23:43:26 +0000 (16:43 -0700)]
OSD: The thread pool variable name changed
The variable names are more meaningful now. op_tp -> osd_tp and
op_sharded_tp -> osd_op_tp

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
11 years agoShardedTP: The config option changed
Somnath Roy [Tue, 10 Jun 2014 23:02:52 +0000 (16:02 -0700)]
ShardedTP: The config option changed
The config option for sharded threadpool is changed to
osd_op_num_threads_per_shard instead of osd_op_num_sharded_pool_threads.
Along with osd_op_num_shards this will be much more user friendly while
configuring the number of op threads for the osd.

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
11 years agoShardedTP: Changes related to conforming to Ceph coding guidelines
Somnath Roy [Tue, 10 Jun 2014 22:24:47 +0000 (15:24 -0700)]
ShardedTP: Changes related to conforming to Ceph coding guidelines

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
11 years agodoc: Fixed typo.
John Wilkins [Tue, 10 Jun 2014 19:20:43 +0000 (12:20 -0700)]
doc: Fixed typo.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
11 years agoFix for bug #6700 1948/head
Steve Taylor [Tue, 10 Jun 2014 18:42:55 +0000 (12:42 -0600)]
Fix for bug #6700

When preparing OSD disks with colocated journals, the intialization process
fails when using dmcrypt. The kernel fails to re-read the partition table after
the storage partition is created because the journal partition is already in use
by dmcrypt. This fix unmaps the journal partition from dmcrypt and allows the
partition table to be read.

Signed-off-by: Stephen F Taylor <steveftaylor@gmail.com>
11 years agoMerge pull request #1945 from dachary/wip-warnings
Loic Dachary [Tue, 10 Jun 2014 08:31:07 +0000 (10:31 +0200)]
Merge pull request #1945 from dachary/wip-warnings

tests: fix signess warning

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
11 years agofix compilation warnings 1945/head
Loic Dachary [Mon, 9 Jun 2014 21:29:17 +0000 (23:29 +0200)]
fix compilation warnings

Signed-off-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1872 from ceph/wip-reweight-tree
Sage Weil [Mon, 9 Jun 2014 12:29:20 +0000 (05:29 -0700)]
Merge pull request #1872 from ceph/wip-reweight-tree

mon: add 'osd crush reweight-tree ...'

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
11 years agoMerge pull request #1940 from vshankar/doc-fix
Loic Dachary [Mon, 9 Jun 2014 11:16:46 +0000 (13:16 +0200)]
Merge pull request #1940 from vshankar/doc-fix

doc: fix typo in erasure coding section

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agodoc: fix typo in erasure coding section 1940/head
Venky Shankar [Mon, 9 Jun 2014 09:27:59 +0000 (14:57 +0530)]
doc: fix typo in erasure coding section

Signed-off-by: Venky Shankar <vshankar@redhat.com>
11 years agoMerge pull request #1936 from ceph/wip-8554
Loic Dachary [Mon, 9 Jun 2014 09:10:03 +0000 (11:10 +0200)]
Merge pull request #1936 from ceph/wip-8554

init-ceph: continue after failure doing osd data mount

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoAdd upper limit to the write size of set_alloc_hint in KeyValueStore 1937/head
Haomai Wang [Sun, 8 Jun 2014 04:27:03 +0000 (12:27 +0800)]
Add upper limit to the write size of set_alloc_hint in KeyValueStore

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
11 years agoinit-ceph: continue after failure doing osd data mount 1936/head
Sage Weil [Mon, 9 Jun 2014 03:18:49 +0000 (20:18 -0700)]
init-ceph: continue after failure doing osd data mount

If we are starting many daemons and hit an error, we normally note it and
move on.  Do the same when doing the pre-mount step.

Fixes: #8554
Signed-off-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1913 from sahid/dist
Loic Dachary [Sun, 8 Jun 2014 22:02:41 +0000 (00:02 +0200)]
Merge pull request #1913 from sahid/dist

Populate AUTHORS and ChangeLog for a distributed package

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agoMerge pull request #1934 from sahid/patch-1
Sage Weil [Sat, 7 Jun 2014 16:22:22 +0000 (09:22 -0700)]
Merge pull request #1934 from sahid/patch-1

Fix two typos with "dependencies"

11 years agoAdd set_alloc_hint test to ceph_test_objectstore
Haomai Wang [Sat, 7 Jun 2014 10:27:25 +0000 (18:27 +0800)]
Add set_alloc_hint test to ceph_test_objectstore

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
11 years agoMake KeyValueStore support set_alloc_hint op
Haomai Wang [Sat, 7 Jun 2014 10:57:29 +0000 (18:57 +0800)]
Make KeyValueStore support set_alloc_hint op

Add a new config let KeyValueStore support configurable strip size.
set_alloc_hint op can affect the strip size of the specified object
and the expect write size will become the strip size of the object.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
11 years agodoc: Fixes spelling errors on README 1934/head
Sahid Orentino Ferdjaoui [Fri, 6 Jun 2014 20:34:35 +0000 (22:34 +0200)]
doc: Fixes spelling errors on README

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoMerge pull request #1899 from yuyuyu101/kvstore-osd-perf
Sage Weil [Sat, 7 Jun 2014 06:16:12 +0000 (23:16 -0700)]
Merge pull request #1899 from yuyuyu101/kvstore-osd-perf

Make KeyValueStore support "ceph osd perf" command

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1912 from yuyuyu101/keyvaluestore-sparse-read-bug
Sage Weil [Sat, 7 Jun 2014 06:12:22 +0000 (23:12 -0700)]
Merge pull request #1912 from yuyuyu101/keyvaluestore-sparse-read-bug

Fix keyvaluestore fiemap bug

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge branch 'wip-libradosstriper'
Josh Durgin [Sat, 7 Jun 2014 01:13:11 +0000 (18:13 -0700)]
Merge branch 'wip-libradosstriper'

https://github.com/ceph/ceph/pull/1186

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
11 years agoAdded RPM and debian packaging for libradosstriper, creating a new package called...
Sebastien Ponce [Mon, 26 May 2014 14:31:08 +0000 (16:31 +0200)]
Added RPM and debian packaging for libradosstriper, creating a new package called libradosstriper1

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoAdded unit test suite for the Rados striping API.
Sebastien Ponce [Thu, 6 Feb 2014 10:38:44 +0000 (11:38 +0100)]
Added unit test suite for the Rados striping API.

This includes tests for standard io and asynchronous io, similar to what is tested in the rados tests.
In addition, it includes in depth tests of the striping itself.

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoImplementation of the radosstriper interface.
Sebastien Ponce [Thu, 5 Jun 2014 15:17:40 +0000 (17:17 +0200)]
Implementation of the radosstriper interface.

The user facing API is implemented in libradosstriper.cc and the backend in RadosStriperImpl.cc.
Details on how the code works are given in a comment at the top of RadosStriperImple.cc

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoMerge pull request #1926 from nereocystis/librados-write-full
John Wilkins [Fri, 6 Jun 2014 21:33:38 +0000 (14:33 -0700)]
Merge pull request #1926 from nereocystis/librados-write-full

doc: Use write_full for C++ example

11 years agoMerge pull request #1935 from ceph/wip-flag-known-redirs
Sage Weil [Fri, 6 Jun 2014 21:16:36 +0000 (14:16 -0700)]
Merge pull request #1935 from ceph/wip-flag-known-redirs

osdc/Objecter: mark all ops as known-if-redirected

Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoosdc/Objecter: mark all ops as known-if-redirected 1935/head
Greg Farnum [Fri, 6 Jun 2014 20:45:49 +0000 (13:45 -0700)]
osdc/Objecter: mark all ops as known-if-redirected

Signed-off-by: Greg Farnum <greg@inktank.com>
11 years agoMerge pull request #1891 from ceph/wip-8380-b
Sage Weil [Fri, 6 Jun 2014 20:20:12 +0000 (13:20 -0700)]
Merge pull request #1891 from ceph/wip-8380-b

osdc/Objecter: flag ops that have been redirected

11 years agoMerge pull request #1930 from ceph/wip-set-extsize-fix
Sage Weil [Fri, 6 Jun 2014 17:50:58 +0000 (10:50 -0700)]
Merge pull request #1930 from ceph/wip-set-extsize-fix

Wip set extsize fix

Backport: firefly
Reviewed-by: Sage Weil <sage@inktank.com>
11 years agoMerge pull request #1922 from ceph/wip-os-rename
Sage Weil [Fri, 6 Jun 2014 16:19:16 +0000 (09:19 -0700)]
Merge pull request #1922 from ceph/wip-os-rename

os: rename get_*() -> decode_*()

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoXfsFileStoreBackend: call ioctl(XFS_IOC_FSSETXATTR) less often 1930/head
Ilya Dryomov [Thu, 5 Jun 2014 06:08:42 +0000 (10:08 +0400)]
XfsFileStoreBackend: call ioctl(XFS_IOC_FSSETXATTR) less often

No need to call ioctl(XFS_IOC_FSSETXATTR) if extsize is already set to
the value we want or if any extents are allocated - XFS will refuse to
change extsize in that's the case.

Fixes: #8241
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoXfsFileStoreBackend: nuke redundant goto in set_extsize()
Ilya Dryomov [Thu, 5 Jun 2014 06:08:41 +0000 (10:08 +0400)]
XfsFileStoreBackend: nuke redundant goto in set_extsize()

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
11 years agoMerge pull request #1928 from nereocystis/pool-pg-fix-spelling
Loic Dachary [Fri, 6 Jun 2014 07:52:34 +0000 (09:52 +0200)]
Merge pull request #1928 from nereocystis/pool-pg-fix-spelling

doc: Descrption => Description

Reviewed-by: Loic Dachary <loic@dachary.org>
11 years agodoc: Descrption => Description 1928/head
Kevin Dalley [Fri, 6 Jun 2014 00:10:42 +0000 (17:10 -0700)]
doc: Descrption => Description
Correct spelling error.

Signed-off-by: Kevin Dalley <kevin@kelphead.org>
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 agoAdded a striper interface on top of rados called radosstriper.
Sebastien Ponce [Tue, 4 Feb 2014 16:38:37 +0000 (17:38 +0100)]
Added a striper interface on top of rados called radosstriper.

This interface allows to manipulate striped objects stored in a rados cluster with a standard open/read/write/stat/close/remove API.
Asynchronous APIs are also provided for data transfers and both C and C++ APIs are present.

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoCompleted librados documentation of rados_write_op_cmpxattr and rados_read_op_cmpxatt...
Sebastien Ponce [Wed, 26 Mar 2014 11:34:41 +0000 (12:34 +0100)]
Completed librados documentation of rados_write_op_cmpxattr and rados_read_op_cmpxattr concerning their error reporting

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoAdded const qualifiers for the layout argument of file_to_extents and object_truncate...
Sebastien Ponce [Wed, 26 Mar 2014 11:35:32 +0000 (12:35 +0100)]
Added const qualifiers for the layout argument of file_to_extents and object_truncate_size

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoFixed usage of rhel_version in spec file : it should have been rhel
Sebastien Ponce [Tue, 27 May 2014 09:03:48 +0000 (11:03 +0200)]
Fixed usage of rhel_version in spec file : it should have been rhel

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoFixed missing include of assert.h in RWLock interface
Sebastien Ponce [Tue, 20 May 2014 15:58:20 +0000 (17:58 +0200)]
Fixed missing include of assert.h in RWLock interface

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoExtracted RadosXattrIter from librados.cc into independent .h anc .cc files.
Sebastien Ponce [Thu, 23 Jan 2014 10:08:51 +0000 (11:08 +0100)]
Extracted RadosXattrIter from librados.cc into independent .h anc .cc files.
This makes this interface usable by clients of librados.

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
11 years agoos: rename get_*() -> decode_*() 1922/head
Sage Weil [Thu, 5 Jun 2014 16:19:05 +0000 (09:19 -0700)]
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>
11 years agoPopulate ChangeLog when distribute 1913/head
Sahid Orentino Ferdjaoui [Thu, 5 Jun 2014 15:32:10 +0000 (17:32 +0200)]
Populate ChangeLog when distribute

Generates ChangeLog from git history for a
distributed package.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
11 years agoPopulate AUTHORS when distribute
Sahid Orentino Ferdjaoui [Thu, 5 Jun 2014 15:31:08 +0000 (17:31 +0200)]
Populate AUTHORS when distribute

Adds a complete list of contributors in a
distributed package.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.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 agoFix keyvaluestore fiemap bug 1912/head
Haomai Wang [Wed, 4 Jun 2014 04:58:07 +0000 (12:58 +0800)]
Fix keyvaluestore fiemap bug

The result of fiemap is wrong and the offset get from
"StripObjectMap::file_to_extents" need to multiply by sequence number

Signed-off-by: Haomai Wang <haomaiwang@gmail.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>