]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agotools/rbd: fix error message typo 7369/head
Mauricio Garavaglia [Wed, 27 Jan 2016 03:48:33 +0000 (00:48 -0300)]
tools/rbd: fix error message typo

Signed-off-by: Mauricio Garavaglia <mauriciogaravaglia@gmail.com>
9 years agoMerge pull request #7120 from zaitcev/wip-5073-update1 7318/head
Yehuda Sadeh [Tue, 26 Jan 2016 22:48:51 +0000 (14:48 -0800)]
Merge pull request #7120 from zaitcev/wip-5073-update1

rgw: fix up the use of tenant before it's available

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7366 from tchaikov/wip-cmake-snappy
Ali Maredia [Tue, 26 Jan 2016 18:26:34 +0000 (13:26 -0500)]
Merge pull request #7366 from tchaikov/wip-cmake-snappy

cmake: check for libsnappy in default path also

9 years agocmake: check for libsnappy in default path also 7366/head
Kefu Chai [Tue, 26 Jan 2016 13:07:04 +0000 (21:07 +0800)]
cmake: check for libsnappy in default path also

* some distros install libsnappy into /usr/lib/x86_64-linux-gnu
  which is completely resonable. but this directory is not listed
  in the Findsnappy.cmake.
* also add SNAPPY_ROOT_DIR, in case user install snappy in some
  other directory.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7304 from liewegas/wip-tcmalloc
Sage Weil [Tue, 26 Jan 2016 14:59:03 +0000 (09:59 -0500)]
Merge pull request #7304 from liewegas/wip-tcmalloc

osd: pass tcmalloc env through to daemon

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #7358 from chenyehua11692/master
Gregory Farnum [Tue, 26 Jan 2016 14:41:45 +0000 (06:41 -0800)]
Merge pull request #7358 from chenyehua11692/master

mds:judgment added to avoid the risk of visiting the NULL pointer

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoupstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through 7304/head
Sage Weil [Tue, 26 Jan 2016 13:43:15 +0000 (08:43 -0500)]
upstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomds:judgment added to avoid the risk of visting the NULL pointer 7358/head
Kongming Wu [Tue, 26 Jan 2016 02:45:52 +0000 (10:45 +0800)]
mds:judgment added to avoid the risk of visting the NULL pointer

Signed-off-by: chenyehua11692 chen.yehua@h3c.com
9 years agoMerge pull request #7251 from tchaikov/wip-rados-manpage
Sage Weil [Tue, 26 Jan 2016 02:28:09 +0000 (21:28 -0500)]
Merge pull request #7251 from tchaikov/wip-rados-manpage

doc: amend the rados.8

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7353 from renhwsky/renhw-wip-14473-2
Sage Weil [Tue, 26 Jan 2016 02:21:21 +0000 (21:21 -0500)]
Merge pull request #7353 from renhwsky/renhw-wip-14473-2

mon: fix locking in preinit error paths

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7321 from renhwsky/renhw-wip-14473
Sage Weil [Tue, 26 Jan 2016 02:20:27 +0000 (21:20 -0500)]
Merge pull request #7321 from renhwsky/renhw-wip-14473

mon: drop useless rank init assignment

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomon: drop useless rank init assignment 7321/head
huanwen ren [Tue, 26 Jan 2016 02:12:02 +0000 (10:12 +0800)]
mon: drop useless rank init assignment

drop useless rank init assignment

Fixes:14508
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoMerge pull request #7294 from branch-predictor/bp-buffer-spinlock
Sage Weil [Tue, 26 Jan 2016 02:05:32 +0000 (21:05 -0500)]
Merge pull request #7294 from branch-predictor/bp-buffer-spinlock

common/buffer: replace RWLock with spinlocks

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: song baisen <song.baisen@zte.com.cn>
9 years agoMerge pull request #7303 from cbodley/wip-tx-move
Sage Weil [Tue, 26 Jan 2016 02:04:21 +0000 (21:04 -0500)]
Merge pull request #7303 from cbodley/wip-tx-move

os/ObjectStore: add custom move operations for ObjectStore::Transaction

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7283 from xiexingguo/xxg-wip-14407
Sage Weil [Tue, 26 Jan 2016 01:59:35 +0000 (20:59 -0500)]
Merge pull request #7283 from xiexingguo/xxg-wip-14407

os/bluestore/kstore: fix nid overwritten logic

http://pulpito.ceph.com/sage-2016-01-25_07:39:08-rados-wip-sage-testing2---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7267 from liewegas/wip-fiemap
Sage Weil [Tue, 26 Jan 2016 01:58:37 +0000 (20:58 -0500)]
Merge pull request #7267 from liewegas/wip-fiemap

osd: drop fiemap len=0 magic

http://pulpito.ceph.com/sage-2016-01-25_07:39:08-rados-wip-sage-testing2---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agomon: fix locking in preinit error paths 7353/head
renhwztetecs [Tue, 26 Jan 2016 01:51:16 +0000 (09:51 +0800)]
mon: fix locking in preinit error paths

fix locking in preinit error paths

Fixes: #14473
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agoMerge pull request #7314 from tchaikov/wip-fix-cmake
Casey Bodley [Mon, 25 Jan 2016 14:55:26 +0000 (09:55 -0500)]
Merge pull request #7314 from tchaikov/wip-fix-cmake

cmake: let ceph-client-debug link with tcmalloc

9 years agoMerge pull request #7331 from XinzeChi/wip-RepModify-bytes-written
Kefu Chai [Mon, 25 Jan 2016 13:33:58 +0000 (21:33 +0800)]
Merge pull request #7331 from XinzeChi/wip-RepModify-bytes-written

osd: delete useless bytes_written defined in RepModify

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7342 from tchaikov/wip-fix-ceph-dencoder
Loic Dachary [Mon, 25 Jan 2016 08:59:14 +0000 (15:59 +0700)]
Merge pull request #7342 from tchaikov/wip-fix-ceph-dencoder

os/bluestore: fix bluestore_wal_transaction_t encoding test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoos/bluestore: fix bluestore_wal_transaction_t encoding test 7342/head
Kefu Chai [Mon, 25 Jan 2016 07:08:02 +0000 (15:08 +0800)]
os/bluestore: fix bluestore_wal_transaction_t encoding test

bluestore_wal_op_t::op is encoded/dumped but it is not
initialized in its ctor. so set it to 0 in its ctor. 0 is not an
valid op though, but it helps with debugging and testing.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7315 from tchaikov/wip-kill-warnings
Loic Dachary [Mon, 25 Jan 2016 06:20:08 +0000 (13:20 +0700)]
Merge pull request #7315 from tchaikov/wip-kill-warnings

Wip kill warnings

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7284 from ceph/wip-make-remove-libedit
Loic Dachary [Mon, 25 Jan 2016 06:15:48 +0000 (13:15 +0700)]
Merge pull request #7284 from ceph/wip-make-remove-libedit

makefile: remove libedit from libclient.la

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd: delete useless bytes_written defined in RepModify 7331/head
Xinze Chi [Sat, 23 Jan 2016 02:20:06 +0000 (10:20 +0800)]
osd: delete useless bytes_written defined in RepModify

this would avoid calling encode function.

Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agoMerge pull request #7301 from oritwas/wip-14375
Yehuda Sadeh [Fri, 22 Jan 2016 21:33:26 +0000 (13:33 -0800)]
Merge pull request #7301 from oritwas/wip-14375

rgw: fix subuser rm command failure

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7327 from igrcic/master
John Wilkins [Fri, 22 Jan 2016 19:09:38 +0000 (11:09 -0800)]
Merge pull request #7327 from igrcic/master

doc: Fixes a CRUSH map step take argument

Reviewed-by: John Wilkins <jowilkin@redhat.com>
9 years agodoc: Fixes a CRUSH map step take argument 7327/head
Ivan Grcic [Fri, 22 Jan 2016 17:58:03 +0000 (18:58 +0100)]
doc: Fixes a CRUSH map step take argument

Signed-off-by: Ivan Grcic <igrcic@gmail.com>
9 years agoos: add custom move ctor/assignment for Transaction 7303/head
Casey Bodley [Thu, 21 Jan 2016 15:02:39 +0000 (10:02 -0500)]
os: add custom move ctor/assignment for Transaction

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoos: add custom move ctor/assignment for TransactionData
Casey Bodley [Wed, 20 Jan 2016 22:18:08 +0000 (17:18 -0500)]
os: add custom move ctor/assignment for TransactionData

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoos: Transaction sets default values to avoid duplication in ctors
Casey Bodley [Thu, 21 Jan 2016 14:45:05 +0000 (09:45 -0500)]
os: Transaction sets default values to avoid duplication in ctors

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoos: move Transaction ctors closer to member variables
Casey Bodley [Thu, 21 Jan 2016 14:42:06 +0000 (09:42 -0500)]
os: move Transaction ctors closer to member variables

this makes it easier to update constructors when adding/removing fields

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agotest: add unit test for Transaction move/copy
Casey Bodley [Wed, 20 Jan 2016 22:17:39 +0000 (17:17 -0500)]
test: add unit test for Transaction move/copy

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: fix up the use of tenant before it's available 7120/head
Pete Zaitcev [Wed, 6 Jan 2016 07:02:11 +0000 (00:02 -0700)]
rgw: fix up the use of tenant before it's available

A big problem that cropped up with the multi-tenancy as it
went in was that it used tenant to initialize bucket names
before tenant was actually available by parsing a token.
Thus, although multi-tenancy worked, accessing anything across
tenants was actually impossible. This patch fixes that oversight.
Unfortunately, a new method postauth_init() was needed for it.

We also fix small bugs:

 - validate_tenant_name() used a proper-looking C++ but was
   incorrect. We simply use C for now, which may be not as
   pretty but is correct.

 - We now make a distinction between empty tenant syntax that
   means "the logged-in tenant" ("bucket") and the syntax
   that means "the legacy compatibility tenant with no name
   (":bucket").

 - We make rgw_make_bucket_entry_name() more robust against
   empty inputs. It's not used for work, but produces odd-looking
   debugging logs.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
9 years agoMerge pull request #7317 from dmick/master
Yehuda Sadeh [Thu, 21 Jan 2016 23:38:05 +0000 (15:38 -0800)]
Merge pull request #7317 from dmick/master

configure.ac: make "--with-librocksdb-static" default to 'check'

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoconfigure.ac: make "--with-librocksdb-static" default to 'check' 7317/head
Dan Mick [Thu, 21 Jan 2016 18:56:50 +0000 (10:56 -0800)]
configure.ac: make "--with-librocksdb-static" default to 'check'

Fixes: #14463
Signed-off-by: Dan Mick <dan.mick@redhat.com>
9 years agolibrbd: fixed "hidden" virtual methods 7315/head
Kefu Chai [Thu, 21 Jan 2016 17:40:26 +0000 (09:40 -0800)]
librbd: fixed "hidden" virtual methods

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: let ceph-client-debug link with tcmalloc 7314/head
Kefu Chai [Thu, 21 Jan 2016 17:37:55 +0000 (01:37 +0800)]
cmake: let ceph-client-debug link with tcmalloc

to fix the link problem of
libcephfs.so.1.0.0: undefined reference to `IsHeapProfilerRunning'
when tcmalloc is used and profiler header is detected.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotest/objectstore: fix unused variable warnings
Kefu Chai [Thu, 21 Jan 2016 17:37:58 +0000 (09:37 -0800)]
test/objectstore: fix unused variable warnings

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7310 from trociny/fix-rbd-replay-eof
Jason Dillaman [Thu, 21 Jan 2016 14:05:31 +0000 (09:05 -0500)]
Merge pull request #7310 from trociny/fix-rbd-replay-eof

rbd-replay: handle EOF gracefully

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-replay: handle EOF gracefully 7310/head
Mykola Golub [Thu, 21 Jan 2016 11:45:42 +0000 (13:45 +0200)]
rbd-replay: handle EOF gracefully

Fixes: #14452
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #7292 from tchaikov/wip-submittingpatches
Kefu Chai [Thu, 21 Jan 2016 13:10:53 +0000 (21:10 +0800)]
Merge pull request #7292 from tchaikov/wip-submittingpatches

doc: revise SubmittingPatches

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
9 years agoMerge pull request #7263 from theanalyst/vstart/update-opts
Kefu Chai [Thu, 21 Jan 2016 13:01:07 +0000 (21:01 +0800)]
Merge pull request #7263 from theanalyst/vstart/update-opts

vstart: update help with a few more commandline opts

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: vstart update a few commandline switches 7263/head
Abhishek Lekshmanan [Mon, 18 Jan 2016 10:57:42 +0000 (11:57 +0100)]
doc: vstart update a few commandline switches

Add a few more available commandline switches to vstart quickstart
documentation

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #7240 from cxwshawn/org-fix
Loic Dachary [Thu, 21 Jan 2016 12:46:14 +0000 (19:46 +0700)]
Merge pull request #7240 from cxwshawn/org-fix

organizationmap: modify org mail info.

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoSubmittingPatches: rebase to resolve conflicts 7292/head
Kefu Chai [Thu, 21 Jan 2016 04:52:54 +0000 (12:52 +0800)]
SubmittingPatches: rebase to resolve conflicts

pull request is not supposed to contain merge commits

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: sending kernel patches to mailing list
Kefu Chai [Thu, 21 Jan 2016 04:41:03 +0000 (12:41 +0800)]
SubmittingPatches: sending kernel patches to mailing list

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: add doc for commit title
Kefu Chai [Wed, 20 Jan 2016 08:54:57 +0000 (16:54 +0800)]
SubmittingPatches: add doc for commit title

explain that we need a prefix in the commit title

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: add doc for "Fixes:" tag
Kefu Chai [Wed, 20 Jan 2016 08:23:04 +0000 (16:23 +0800)]
SubmittingPatches: add doc for "Fixes:" tag

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoSubmittingPatches: update with reST syntax
Kefu Chai [Wed, 20 Jan 2016 05:40:01 +0000 (13:40 +0800)]
SubmittingPatches: update with reST syntax

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7293 from xiexingguo/xxg-wip-14436
Sage Weil [Thu, 21 Jan 2016 01:36:53 +0000 (20:36 -0500)]
Merge pull request #7293 from xiexingguo/xxg-wip-14436

os/bluestore: fix assert

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoinit-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through
Sage Weil [Wed, 20 Jan 2016 23:36:08 +0000 (18:36 -0500)]
init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

..when set in the sysconfig/default file.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7197 from ceph/wip-kill-warnings
Sage Weil [Wed, 20 Jan 2016 23:16:55 +0000 (18:16 -0500)]
Merge pull request #7197 from ceph/wip-kill-warnings

build: fix warnings

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7232 from lzhng2000/master
Sage Weil [Wed, 20 Jan 2016 23:16:17 +0000 (18:16 -0500)]
Merge pull request #7232 from lzhng2000/master

cls/cls_rbd: pass string by reference

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7242 from xiexingguo/xxg-wip-14370
Sage Weil [Wed, 20 Jan 2016 23:15:44 +0000 (18:15 -0500)]
Merge pull request #7242 from xiexingguo/xxg-wip-14370

os/memstore: drain finisher first before we really begin a umount-process
os/bluestore: drain wal_wq on replay error

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7247 from ifed01/wip-14383
Sage Weil [Wed, 20 Jan 2016 23:13:43 +0000 (18:13 -0500)]
Merge pull request #7247 from ifed01/wip-14383

os/bluestore: use intrusive_ptr for Dir

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7254 from guangyy/wip-counter
Sage Weil [Wed, 20 Jan 2016 23:13:00 +0000 (18:13 -0500)]
Merge pull request #7254 from guangyy/wip-counter

common: change the type of counter total/unhealthy_workers

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7255 from yuyuyu101/wip-14386
Sage Weil [Wed, 20 Jan 2016 23:12:25 +0000 (18:12 -0500)]
Merge pull request #7255 from yuyuyu101/wip-14386

msg/async: fix send closed local_connection message problem

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Wed, 20 Jan 2016 21:49:12 +0000 (16:49 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #7300 from ceph/wip-cmake
Casey Bodley [Wed, 20 Jan 2016 21:12:45 +0000 (16:12 -0500)]
Merge pull request #7300 from ceph/wip-cmake

cmake: test_build_libcephfs needs ${ALLOC_LIBS}

9 years agorgw: fix subuser rm command failure 7301/head
Orit Wasserman [Wed, 20 Jan 2016 16:24:38 +0000 (17:24 +0100)]
rgw: fix subuser rm command failure

Fixes: 14375
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agocmake: test_build_libcephfs needs ${ALLOC_LIBS} 7300/head
Ali Maredia [Wed, 20 Jan 2016 19:41:28 +0000 (14:41 -0500)]
cmake: test_build_libcephfs needs ${ALLOC_LIBS}

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #7231 from renhwsky/renhw-wip-14369
Kefu Chai [Wed, 20 Jan 2016 13:18:28 +0000 (21:18 +0800)]
Merge pull request #7231 from renhwsky/renhw-wip-14369

osd: remove unused OSDMap::set_weightf()

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoBlueStore/StupidAllocator: fix assert 7293/head
xie xingguo [Wed, 20 Jan 2016 09:28:02 +0000 (17:28 +0800)]
BlueStore/StupidAllocator: fix assert

Fixes: #14436
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7164 from flaf/master
Kefu Chai [Wed, 20 Jan 2016 08:37:50 +0000 (16:37 +0800)]
Merge pull request #7164 from flaf/master

doc: fix "mon osd down out subtree limit" option name

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix "mon osd down out subtree limit" option name 7164/head
lafont [Sat, 9 Jan 2016 04:38:25 +0000 (05:38 +0100)]
doc: fix "mon osd down out subtree limit" option name

The name of the parameter `mon osd down out subtree limit`
was incorrect (with `downout` instead of `down out`).
Furthermore, the description seemed to me a little bit
ambiguous.

Signed-off-by: François Lafont <francois.lafont@ac-versailles.fr>
9 years agoBlueStore: fix rename logic 7283/head
xie xingguo [Wed, 20 Jan 2016 03:41:50 +0000 (11:41 +0800)]
BlueStore: fix rename logic

Avoid creating a new destination object in advance, which is unnecessary and less efficient.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: fix rename logic
xie xingguo [Wed, 20 Jan 2016 03:35:33 +0000 (11:35 +0800)]
kstore: fix rename logic

Avoid creating a new destination onode in advance, which is unnecessary and less efficient.

Fixes: #14433
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agodoc: rename SubmittingPatches to SubmittingPatches.rst
Kefu Chai [Wed, 20 Jan 2016 05:28:36 +0000 (13:28 +0800)]
doc: rename SubmittingPatches to SubmittingPatches.rst

for better reading experience

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7246 from ukernel/jewel-14377
Gregory Farnum [Wed, 20 Jan 2016 02:24:34 +0000 (18:24 -0800)]
Merge pull request #7246 from ukernel/jewel-14377

ceph_test_libcephfs: tolerate duplicated entries in readdir

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6205 from jcsp/wip-volume-client
Gregory Farnum [Wed, 20 Jan 2016 02:21:23 +0000 (18:21 -0800)]
Merge pull request #6205 from jcsp/wip-volume-client

pybind: add ceph_volume_client interface for Manila and similar frameworks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7229 from david-z/wip-master-fix-failling-to-cache-pressure
Gregory Farnum [Wed, 20 Jan 2016 02:19:56 +0000 (18:19 -0800)]
Merge pull request #7229 from david-z/wip-master-fix-failling-to-cache-pressure

ceph-fuse: fix double decreasing the count to trim caps

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7209 from ukernel/jewel-11517
Gregory Farnum [Wed, 20 Jan 2016 02:17:23 +0000 (18:17 -0800)]
Merge pull request #7209 from ukernel/jewel-11517

client: check if Fh is readable when processing a read

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7199 from ukernel/jewel-14254
Gregory Farnum [Wed, 20 Jan 2016 02:13:58 +0000 (18:13 -0800)]
Merge pull request #7199 from ukernel/jewel-14254

mds: fix client cap/message replay order on restart

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7279 from zaitcev/wip-5073-subuser
Yehuda Sadeh [Wed, 20 Jan 2016 00:46:17 +0000 (16:46 -0800)]
Merge pull request #7279 from zaitcev/wip-5073-subuser

rgw: Parse --subuser better

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'origin/jewel'
Josh Durgin [Tue, 19 Jan 2016 21:44:31 +0000 (13:44 -0800)]
Merge remote-tracking branch 'origin/jewel'

9 years agoMerge pull request #6496 from ceph/wip-fs-snaptests
Gregory Farnum [Tue, 19 Jan 2016 19:38:15 +0000 (11:38 -0800)]
Merge pull request #6496 from ceph/wip-fs-snaptests

qa/workunits/snaps: move snap tests into fs sub-directory

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #6868 from H3C/wip-11642-cephfuse-useage
Gregory Farnum [Tue, 19 Jan 2016 19:37:21 +0000 (11:37 -0800)]
Merge pull request #6868 from H3C/wip-11642-cephfuse-useage

ceph-fuse:print usage information when no parameter specified

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7270 from cbodley/wip-cmake-execinfo
Orit Wasserman [Tue, 19 Jan 2016 18:20:19 +0000 (19:20 +0100)]
Merge pull request #7270 from cbodley/wip-cmake-execinfo

cmake: add missing check for HAVE_EXECINFO_H

9 years agoMerge pull request #7280 from zaitcev/wip-5073-update2
Yehuda Sadeh [Tue, 19 Jan 2016 17:55:57 +0000 (09:55 -0800)]
Merge pull request #7280 from zaitcev/wip-5073-update2

rgw: Drop a debugging message

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: Parse --subuser better 7279/head
Pete Zaitcev [Tue, 19 Jan 2016 06:44:42 +0000 (23:44 -0700)]
rgw: Parse --subuser better

This fixes a funny message "ERROR: 'tenant$user != tenant$user'"
in case --subuser='tenant$user' is supplied.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
9 years agorgw: Drop a debugging message 7280/head
Pete Zaitcev [Tue, 19 Jan 2016 06:48:11 +0000 (23:48 -0700)]
rgw: Drop a debugging message

A P3-tagged message escaped upstream.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
9 years agomakefile: remove dependency on libedit 7284/head
Kefu Chai [Tue, 19 Jan 2016 13:08:24 +0000 (21:08 +0800)]
makefile: remove dependency on libedit

turns out we are not using it anymore

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7274 from dillaman/wip-helgrind-race-jewel
Josh Durgin [Tue, 19 Jan 2016 11:47:16 +0000 (06:47 -0500)]
Merge pull request #7274 from dillaman/wip-helgrind-race-jewel

helgrind: additional race conditionslibrbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoBlueStore: fix typo
xie xingguo [Tue, 19 Jan 2016 06:42:08 +0000 (14:42 +0800)]
BlueStore: fix typo

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoBlueStore: fix dest onode process logic of clone_range
xie xingguo [Tue, 19 Jan 2016 10:57:22 +0000 (18:57 +0800)]
BlueStore: fix dest onode process logic of clone_range

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoBlueStore: fix dest onode process logic of clone
xie xingguo [Tue, 19 Jan 2016 10:55:25 +0000 (18:55 +0800)]
BlueStore: fix dest onode process logic of clone

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoBlueStore: fix nid overwritten of write/zero
xie xingguo [Tue, 19 Jan 2016 10:43:19 +0000 (18:43 +0800)]
BlueStore: fix nid overwritten of write/zero

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: fix typo
xie xingguo [Tue, 19 Jan 2016 06:38:37 +0000 (14:38 +0800)]
kstore: fix typo

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: fix fsid validation logic during mkfs
xie xingguo [Tue, 19 Jan 2016 03:34:09 +0000 (11:34 +0800)]
kstore: fix fsid validation logic during mkfs

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: fix dest onode process logic of clone_range
xie xingguo [Tue, 19 Jan 2016 10:31:02 +0000 (18:31 +0800)]
kstore: fix dest onode process logic of clone_range

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: fix dest onode process logic of clone
xie xingguo [Tue, 19 Jan 2016 10:27:00 +0000 (18:27 +0800)]
kstore: fix dest onode process logic of clone

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: fix nid overwritten of write/zero
xie xingguo [Tue, 19 Jan 2016 10:17:17 +0000 (18:17 +0800)]
kstore: fix nid overwritten of write/zero

Fixes: #14407
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agolibrbd: missing lock on state transition 7274/head
Jason Dillaman [Mon, 18 Jan 2016 22:53:00 +0000 (17:53 -0500)]
librbd: missing lock on state transition

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agohelgrind: annotate false-positive race conditions
Jason Dillaman [Mon, 18 Jan 2016 22:52:51 +0000 (17:52 -0500)]
helgrind: annotate false-positive race conditions

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7272 from dillaman/wip-14385-jewel
Josh Durgin [Mon, 18 Jan 2016 22:30:48 +0000 (17:30 -0500)]
Merge pull request #7272 from dillaman/wip-14385-jewel

qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOSlibrbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7019 from dillaman/wip-14006
Josh Durgin [Mon, 18 Jan 2016 22:09:05 +0000 (17:09 -0500)]
Merge pull request #7019 from dillaman/wip-14006

librbd: journal replay should honor inter-event dependencies

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoqa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS 7272/head
Jason Dillaman [Mon, 18 Jan 2016 20:57:43 +0000 (15:57 -0500)]
qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS

Fixes: #14385
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocmake: add missing check for HAVE_EXECINFO_H 7270/head
Casey Bodley [Mon, 18 Jan 2016 18:47:28 +0000 (13:47 -0500)]
cmake: add missing check for HAVE_EXECINFO_H

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7265 from ceph/wip-14397-disable-xfs-extsize
Sage Weil [Mon, 18 Jan 2016 19:11:21 +0000 (14:11 -0500)]
Merge pull request #7265 from ceph/wip-14397-disable-xfs-extsize

osd: disable filestore_xfs_extsize by default

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/memstore: no magic len=0 to fiemap 7267/head
Sage Weil [Mon, 18 Jan 2016 17:50:00 +0000 (12:50 -0500)]
os/memstore: no magic len=0 to fiemap

Signed-off-by: Sage Weil <sage@redhat.com>