]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoqa/workunits/rbd: specify source path 9645/head
Mykola Golub [Sat, 11 Jun 2016 17:01:31 +0000 (20:01 +0300)]
qa/workunits/rbd: specify source path

otherwise it looks in $PATH for the script

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #8436 from dreamhost/wip-python-prefix
Kefu Chai [Sat, 11 Jun 2016 10:07:54 +0000 (18:07 +0800)]
Merge pull request #8436 from dreamhost/wip-python-prefix

python: Pass prefix/sbindir from autoconf to distutils.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9364 from H3C/H3C
Kefu Chai [Sat, 11 Jun 2016 10:06:24 +0000 (18:06 +0800)]
Merge pull request #9364 from H3C/H3C

osd: sparse_read offset may not be zero for ecpool

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9387 from stiopaa1/osd_osd_constiter
Kefu Chai [Sat, 11 Jun 2016 10:05:08 +0000 (18:05 +0800)]
Merge pull request #9387 from stiopaa1/osd_osd_constiter

osd/OSD.h: change iterator to const_iterator

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9508 from x11562/auth_rm
Kefu Chai [Sat, 11 Jun 2016 10:04:04 +0000 (18:04 +0800)]
Merge pull request #9508 from x11562/auth_rm

mon: fix typo of 'ceph auth rm'

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9395 from tchaikov/wip-16010
Kefu Chai [Sat, 11 Jun 2016 09:59:23 +0000 (17:59 +0800)]
Merge pull request #9395 from tchaikov/wip-16010

buffer: handle integer underflow in iterator::copy(large_int, dest)

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9637 from stiopaa1/osdc_ObjectCacher_deleteCopyAssign
Sage Weil [Fri, 10 Jun 2016 21:36:11 +0000 (17:36 -0400)]
Merge pull request #9637 from stiopaa1/osdc_ObjectCacher_deleteCopyAssign

osdc/ObjectCacher.h: delete copy constr and assign

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9593 from Yan-waller/yj-hwip-rgwbasictype
Matt Benjamin [Fri, 10 Jun 2016 20:59:06 +0000 (16:59 -0400)]
Merge pull request #9593 from Yan-waller/yj-hwip-rgwbasictype

rgw/basic_type: use the standard usage of string::npos

verified

9 years agoosdc/ObjectCacher.h: delete copy constr and assign 9637/head
Michal Jarzabek [Fri, 10 Jun 2016 17:34:20 +0000 (18:34 +0100)]
osdc/ObjectCacher.h: delete copy constr and assign

Delete copy constructor and assignment operator, so the checking can
be moved from linking to compile time - as it was when the above
where only declared, but not defined.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9636 from linuxbox2/xio-entity
Matt Benjamin [Fri, 10 Jun 2016 20:33:21 +0000 (16:33 -0400)]
Merge pull request #9636 from linuxbox2/xio-entity

msg/xio: fix entity_addr_t encoding

9 years agoMerge pull request #9625 from ceph/ldap-build
Matt Benjamin [Fri, 10 Jun 2016 20:11:44 +0000 (16:11 -0400)]
Merge pull request #9625 from ceph/ldap-build

Allow building RGW with LDAP disabled

validated

9 years agoxio: fix build (entity_addr_t encoding) 9636/head
Matt Benjamin [Fri, 10 Jun 2016 19:44:29 +0000 (15:44 -0400)]
xio: fix build (entity_addr_t encoding)

Currently XioMessenger encodes an entity_addr_t in its wire header.
The new 'features' argument to entity_addr_t::encode should have
the actual XioMessenger::local_features value when actually encoding
(and some value otherwise).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocmake: fix mis-matched arguments to if warning
Matt Benjamin [Fri, 10 Jun 2016 19:09:45 +0000 (15:09 -0400)]
cmake:  fix mis-matched arguments to if warning

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agoMerge pull request #9534 from shehbazj/master
Sage Weil [Fri, 10 Jun 2016 18:46:38 +0000 (14:46 -0400)]
Merge pull request #9534 from shehbazj/master

os/bluestore: benchmark Host Aware SMR Drives for linear writes

9 years agoMerge pull request #9615 from stiopaa1/osdc_objectCacher_removeUnneededPublic
Sage Weil [Fri, 10 Jun 2016 18:42:57 +0000 (14:42 -0400)]
Merge pull request #9615 from stiopaa1/osdc_objectCacher_removeUnneededPublic

osdc/ObjectCacher.h: remove public access specifier

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoAllow building RGW with LDAP disabled 9625/head
Daniel Gryniewicz [Fri, 10 Jun 2016 15:33:56 +0000 (11:33 -0400)]
Allow building RGW with LDAP disabled

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoMerge pull request #8718 from stiopaa1/avoid_copying_for_loop
Matt Benjamin [Fri, 10 Jun 2016 17:57:16 +0000 (13:57 -0400)]
Merge pull request #8718 from stiopaa1/avoid_copying_for_loop

rgw/rgw_op.cc: avoid copying in for loops

I'm going with, if it compiles, it must be correct (because const).

9 years agoMerge pull request #9622 from ceph/wip-ceph-disk-test
Kefu Chai [Fri, 10 Jun 2016 16:34:49 +0000 (00:34 +0800)]
Merge pull request #9622 from ceph/wip-ceph-disk-test

cmake, test: enable ceph-disk.sh to run with cmake

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #9515 from liewegas/wip-kraken-defaults
Samuel Just [Fri, 10 Jun 2016 15:06:21 +0000 (08:06 -0700)]
Merge pull request #9515 from liewegas/wip-kraken-defaults

default to async messenger, wpq

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agotest: ceph-disk.sh: use ceph-helper.sh helpers 9622/head
Kefu Chai [Thu, 9 Jun 2016 08:03:21 +0000 (16:03 +0800)]
test: ceph-disk.sh: use ceph-helper.sh helpers

so we can use the utlitiy functions offered by ceph-helper.sh, and enable
cmake to run this test.

* ceph-disk/tests/ceph-disk.sh: it checks ../ for the executables for which
  fixtures are set up. but this assumption does not hold when we are using
  cmake for out-of-source build. so we need to pass the build directory to
  ceph-disk.sh. ${CEPH_BIN} is used for this purpose in this change, it is
  ".." by default, so this change is backward compatible. and one can run
  tox without setting up the ${CEPH_BIN} env variable.
* ceph-disk/test-requirements.txt: bump up tox to 2.0+
  in the case of "make check", both cmake and automake pass ${CEPH_BIN} env
  variables to the "make check" tests, so we can simpy pass it down via tox.ini's
  "passenv" setting. per
  https://testrun.org/tox/latest/example/basic.html#passing-down-environment-variables,
  this feature was introduce in tox 2.0. so bump up the minimum required
  tox version to 2.0 in ceph-disk/test-requirements.txt.
* ceph-disk/tox.ini: pass CEPH_BIN, CEPH_BIN, and CEPH_ROOT down to ceph-disk.sh

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: respect CEPH_*_VIRTUALENV when running run-tox-ceph-*
Kefu Chai [Thu, 9 Jun 2016 06:41:08 +0000 (14:41 +0800)]
cmake: respect CEPH_*_VIRTUALENV when running run-tox-ceph-*

so ceph-{detect-init,disk}/run-tox.sh is able to pick it up

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9621 from dillaman/wip-16229
Mykola Golub [Fri, 10 Jun 2016 13:59:25 +0000 (16:59 +0300)]
Merge pull request #9621 from dillaman/wip-16229

rbd-mirror: do not propagate deletions when pool unavailable

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9619 from dillaman/wip-16197
Mykola Golub [Fri, 10 Jun 2016 13:44:19 +0000 (16:44 +0300)]
Merge pull request #9619 from dillaman/wip-16197

test: improve rbd-mirror test case coverage

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9616 from liewegas/wip-osd-markdown-test
Sage Weil [Fri, 10 Jun 2016 13:41:34 +0000 (09:41 -0400)]
Merge pull request #9616 from liewegas/wip-osd-markdown-test

test/osd/osd-markdown: make test more reliable

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoqa/workunits/rbd: additional rbd-mirror stress tests 9619/head
Jason Dillaman [Thu, 9 Jun 2016 20:23:52 +0000 (16:23 -0400)]
qa/workunits/rbd: additional rbd-mirror stress tests

Fixes: http://tracker.ceph.com/issues/16197
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agovstart: add --nolockdep option
Jason Dillaman [Thu, 9 Jun 2016 21:14:36 +0000 (17:14 -0400)]
vstart: add --nolockdep option

rbd-mirror stress test cases need a way to disable lockdep when
initiated in a vstart environment.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9618 from dillaman/wip-16226
Mykola Golub [Fri, 10 Jun 2016 13:38:56 +0000 (16:38 +0300)]
Merge pull request #9618 from dillaman/wip-16226

rbd-mirror: fix deletion propagation edge cases

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9620 from trociny/rbd-mirror-error-formatting
Jason Dillaman [Fri, 10 Jun 2016 13:36:40 +0000 (09:36 -0400)]
Merge pull request #9620 from trociny/rbd-mirror-error-formatting

rbd-mirror: fix error message formatting

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9464 from vumrao/wip-vumrao-15807
Jason Dillaman [Fri, 10 Jun 2016 13:35:15 +0000 (09:35 -0400)]
Merge pull request #9464 from vumrao/wip-vumrao-15807

rbd: add error message "snapshot is already protected"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: do not propagate deletions when pool unavailable 9621/head
Jason Dillaman [Fri, 10 Jun 2016 12:15:19 +0000 (08:15 -0400)]
rbd-mirror: do not propagate deletions when pool unavailable

Fixes: http://tracker.ceph.com/issues/16229
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9420 from weiqiaomiao/wqm-wip-rgw-fixmemleak
Casey Bodley [Fri, 10 Jun 2016 12:30:07 +0000 (08:30 -0400)]
Merge pull request #9420 from weiqiaomiao/wqm-wip-rgw-fixmemleak

rgw:fix data sync memory leaks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorbd-mirror: fix error messages formatting 9620/head
Mykola Golub [Fri, 10 Jun 2016 11:04:04 +0000 (14:04 +0300)]
rbd-mirror: fix error messages formatting

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #8386 from ukernel/wip-monntbyfsname
John Spray [Fri, 10 Jun 2016 09:50:59 +0000 (10:50 +0100)]
Merge pull request #8386 from ukernel/wip-monntbyfsname

client: mount non-default filesystem by name

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agorbd-mirror: image deleter properly handles multiple snapshots 9618/head
Jason Dillaman [Fri, 10 Jun 2016 04:12:06 +0000 (00:12 -0400)]
rbd-mirror: image deleter properly handles multiple snapshots

Fixes: http://tracker.ceph.com/issues/16226
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: propagate deletions even if image replayer is stopped
Jason Dillaman [Fri, 10 Jun 2016 02:32:33 +0000 (22:32 -0400)]
rbd-mirror: propagate deletions even if image replayer is stopped

If an image deletion which causes the replayer to stop (due to an error)
before the deletion is detected, the deletion should still occur.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoqa/workunits/rbd: improve deletion propagation test case
Jason Dillaman [Fri, 10 Jun 2016 01:14:27 +0000 (21:14 -0400)]
qa/workunits/rbd: improve deletion propagation test case

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agomessages: fix MFSMap::get_type_name() 8386/head
Yan, Zheng [Wed, 6 Apr 2016 13:32:44 +0000 (21:32 +0800)]
messages: fix MFSMap::get_type_name()

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoclient: mount non-default filesystem by name
Yan, Zheng [Wed, 6 Apr 2016 13:11:46 +0000 (21:11 +0800)]
client: mount non-default filesystem by name

To mount non-default filesytem, user needs to provide mds namespace ID.
This is inconvenience.

This patch makes user be able to mount filesystem by name. To do this,
client first subscribes to FSMapUser. Subscribe to mdsmap.<ID> after
knowning ID of the filesystem.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMDSMonitor: handle fsmap.user subscription
Yan, Zheng [Wed, 6 Apr 2016 13:08:00 +0000 (21:08 +0800)]
MDSMonitor: handle fsmap.user subscription

return FSMap data that are visiable to normal users.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomessages: add MFSMapUser
Yan, Zheng [Wed, 6 Apr 2016 12:59:22 +0000 (20:59 +0800)]
messages: add MFSMapUser

For mon clients that subscribe to 'fsmap.user'

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomds: add FSMapUser
Yan, Zheng [Wed, 6 Apr 2016 12:50:54 +0000 (20:50 +0800)]
mds: add FSMapUser

FSMapUser is compact version of FSMap, it includes FSMap data that are
visiable to normal users.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #9617 from liewegas/wip-fix-ec-min-size-test
Loic Dachary [Thu, 9 Jun 2016 22:57:51 +0000 (00:57 +0200)]
Merge pull request #9617 from liewegas/wip-fix-ec-min-size-test

test/mon/misc: fix pool set test given new default ec k

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest/mon/misc: fix pool set test given new default ec k 9617/head
Sage Weil [Thu, 9 Jun 2016 21:09:58 +0000 (17:09 -0400)]
test/mon/misc: fix pool set test given new default ec k

k is no longer min_size by default; adjust test accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agotest/osd/osd-markdown: make test more reliable 9616/head
Sage Weil [Thu, 9 Jun 2016 21:04:38 +0000 (17:04 -0400)]
test/osd/osd-markdown: make test more reliable

This can fail if the osd hasn't gotten the map for the
last time it was marked down and come back up.  This
should make this test much more reliable (fewer false
positives).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/ObjectCacher.h: remove public access specifier 9615/head
Michal Jarzabek [Thu, 9 Jun 2016 17:33:54 +0000 (18:33 +0100)]
osdc/ObjectCacher.h: remove public access specifier

This is duplicated 3 times, so can be removed.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9594 from dillaman/wip-16165
Mykola Golub [Thu, 9 Jun 2016 20:34:11 +0000 (23:34 +0300)]
Merge pull request #9594 from dillaman/wip-16165

rbd-mirror: fix journal shut down ordering

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9598 from dillaman/wip-16196
Mykola Golub [Thu, 9 Jun 2016 18:23:34 +0000 (21:23 +0300)]
Merge pull request #9598 from dillaman/wip-16196

rbd-mirror: refresh image after creating sync point

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9433 from jbernard/master
Jason Dillaman [Thu, 9 Jun 2016 17:38:56 +0000 (13:38 -0400)]
Merge pull request #9433 from jbernard/master

librbd: refresh image if needed in mirror functions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9538 from chhabaramesh/master
Sage Weil [Thu, 9 Jun 2016 13:44:48 +0000 (09:44 -0400)]
Merge pull request #9538 from chhabaramesh/master

os/bluestore: Unaligned device length and Correct alloc size fix for BitMap allocator

9 years agoMerge pull request #9600 from stiopaa1/osdc_objectcacher_moveCwritecommit
Sage Weil [Thu, 9 Jun 2016 13:41:11 +0000 (09:41 -0400)]
Merge pull request #9600 from stiopaa1/osdc_objectcacher_moveCwritecommit

osdc/ObjectCacher.h: move classes to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9596 from liewegas/wip-statfs
Sage Weil [Thu, 9 Jun 2016 13:15:57 +0000 (09:15 -0400)]
Merge pull request #9596 from liewegas/wip-statfs

os: fix statfs for filestore and fusestore

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9597 from dillaman/wip-cls_rbd-encoding
Mykola Golub [Thu, 9 Jun 2016 13:15:07 +0000 (16:15 +0300)]
Merge pull request #9597 from dillaman/wip-cls_rbd-encoding

cls_rbd: encode entity_addr_t with features

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #8779 from ukernel/wip-cephfs-rstat
John Spray [Thu, 9 Jun 2016 10:43:52 +0000 (11:43 +0100)]
Merge pull request #8779 from ukernel/wip-cephfs-rstat

mds: fix rstat bugs

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8780 from ukernel/wip-renew-caps
John Spray [Thu, 9 Jun 2016 10:30:01 +0000 (11:30 +0100)]
Merge pull request #8780 from ukernel/wip-renew-caps

client: renew caps for read/write if mds session got killed.

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agocorrect allocation block size for bluestore and bluefs 9538/head
Ramesh Chander [Tue, 7 Jun 2016 07:32:53 +0000 (00:32 -0700)]
correct allocation block size for bluestore and bluefs

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoremove truncation of unaligned blocks at init
Ramesh Chander [Mon, 6 Jun 2016 17:26:44 +0000 (10:26 -0700)]
remove truncation of unaligned blocks at init

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #9443 from vishalkanaujia/master
John Spray [Thu, 9 Jun 2016 09:48:58 +0000 (10:48 +0100)]
Merge pull request #9443 from vishalkanaujia/master

mds: Removed tmap fetch code from Cdir

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9536 from xiexingguo/xxg-wip-fix-prdwrv
John Spray [Thu, 9 Jun 2016 09:48:14 +0000 (10:48 +0100)]
Merge pull request #9536 from xiexingguo/xxg-wip-fix-prdwrv

client: fix sanity check of preadv/pwritev

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9523 from liewegas/wip-pg-to-osds
John Spray [Thu, 9 Jun 2016 09:46:07 +0000 (10:46 +0100)]
Merge pull request #9523 from liewegas/wip-pg-to-osds

osd/OSDMap: pg_to_osds -> pg_to_raw_osds, fix libcephfs caller to get acting osds

Reviewed-by: Song Baisen <song.baisen@zte.com.cn>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9507 from xiexingguo/xxg-wip-fix-mdsutility
John Spray [Thu, 9 Jun 2016 09:43:41 +0000 (10:43 +0100)]
Merge pull request #9507 from xiexingguo/xxg-wip-fix-mdsutility

tools/cephfs: fix message leak; add flush for dump cmd

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #8890 from ukernel/wip-15634
John Spray [Thu, 9 Jun 2016 09:36:43 +0000 (10:36 +0100)]
Merge pull request #8890 from ukernel/wip-15634

client: enable fuse_use_invalidate_cb by default

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9509 from ukernel/wip-16137
John Spray [Thu, 9 Jun 2016 09:36:02 +0000 (10:36 +0100)]
Merge pull request #9509 from ukernel/wip-16137

client: skip executing async invalidates while umounting

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9541 from renhwztetecs/renhw-wip-rbd
Jason Dillaman [Thu, 9 Jun 2016 01:06:28 +0000 (21:06 -0400)]
Merge pull request #9541 from renhwztetecs/renhw-wip-rbd

rbd: cleanup unnecessary switch breaks

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoosdc/ObjectCacher.h: move classes to cc file 9600/head
Michal Jarzabek [Wed, 8 Jun 2016 22:16:01 +0000 (23:16 +0100)]
osdc/ObjectCacher.h: move classes to cc file

Move C_WriteCommit and C_WaitForWrite to cc file.

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoMerge pull request #9595 from tchaikov/wip-librados-do-not-return-local-ref
Samuel Just [Wed, 8 Jun 2016 21:54:06 +0000 (14:54 -0700)]
Merge pull request #9595 from tchaikov/wip-librados-do-not-return-local-ref

librados: get_pool_name() should not return ref of a local variable

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agorbd-mirror: refresh image after creating sync point snapshot 9598/head
Jason Dillaman [Wed, 8 Jun 2016 16:49:04 +0000 (12:49 -0400)]
rbd-mirror: refresh image after creating sync point snapshot

Fixes: http://tracker.ceph.com/issues/16196
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: consistently use dout/derr for debug logging
Jason Dillaman [Wed, 8 Jun 2016 16:03:33 +0000 (12:03 -0400)]
rbd-mirror: consistently use dout/derr for debug logging

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8830 from trociny/wip-rbd-mirror-bootstrap-cancel
Jason Dillaman [Wed, 8 Jun 2016 21:08:51 +0000 (17:08 -0400)]
Merge pull request #8830 from trociny/wip-rbd-mirror-bootstrap-cancel

rbd-mirror: support bootstrap canceling

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_rbd: encode entity_addr_t with features 9597/head
Jason Dillaman [Wed, 8 Jun 2016 19:15:58 +0000 (15:15 -0400)]
cls_rbd: encode entity_addr_t with features

mirror_image_status_get method call currently fails with EIO

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoosd/osd_types: fix description of store_statfs_t::available field 9596/head
Sage Weil [Wed, 8 Jun 2016 19:10:56 +0000 (15:10 -0400)]
osd/osd_types: fix description of store_statfs_t::available field

It's bytes, not blocks.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/filestore: fix statfs
Sage Weil [Wed, 8 Jun 2016 19:02:55 +0000 (15:02 -0400)]
os/filestore: fix statfs

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/FuseStore: fix statfs
Sage Weil [Wed, 8 Jun 2016 19:02:14 +0000 (15:02 -0400)]
os/FuseStore: fix statfs

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9386 from tchaikov/wip-bye-py2.6
Loic Dachary [Wed, 8 Jun 2016 18:44:49 +0000 (20:44 +0200)]
Merge pull request #9386 from tchaikov/wip-bye-py2.6

ceph-detect-init,ceph-disk: drop support of py2.6

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #9476 from ceph/wip-no-unittests-in-deb
Kefu Chai [Wed, 8 Jun 2016 17:52:28 +0000 (01:52 +0800)]
Merge pull request #9476 from ceph/wip-no-unittests-in-deb

packaging: do not package unused unittests in deb

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9475 from tchaikov/wip-debian
Sage Weil [Wed, 8 Jun 2016 16:43:50 +0000 (12:43 -0400)]
Merge pull request #9475 from tchaikov/wip-debian

debian: package compressor plugins and silence dpkg-shlibdeps warnings

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9315 from ShiqiCooperation/master
Kefu Chai [Wed, 8 Jun 2016 16:34:36 +0000 (00:34 +0800)]
Merge pull request #9315 from ShiqiCooperation/master

mon: remove unused local variable "proposal_bl"

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agolibrados: get_pool_name() should not return ref of a local variable 9595/head
Kefu Chai [Wed, 8 Jun 2016 16:04:44 +0000 (00:04 +0800)]
librados: get_pool_name() should not return ref of a local variable

was introduced by 1a44e6f

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9023 from dillaman/wip-15791
Mykola Golub [Wed, 8 Jun 2016 15:22:17 +0000 (18:22 +0300)]
Merge pull request #9023 from dillaman/wip-15791

librbd: journal IO error results in failed assertion in AioCompletion

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9440 from dillaman/wip-16114
Mykola Golub [Wed, 8 Jun 2016 15:21:16 +0000 (18:21 +0300)]
Merge pull request #9440 from dillaman/wip-16114

librbd: prevent error messages when journal externally disabled

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9573 from tchaikov/wip-cmake-rocksdb
Casey Bodley [Wed, 8 Jun 2016 15:10:13 +0000 (11:10 -0400)]
Merge pull request #9573 from tchaikov/wip-cmake-rocksdb

cmake: fix rocksdb linkage with jemalloc installed but not enabled

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agolibrbd: quickly check for duplicate snap name upon create 9594/head
Jason Dillaman [Wed, 8 Jun 2016 14:12:04 +0000 (10:12 -0400)]
librbd: quickly check for duplicate snap name upon create

During journal replay, quickly check for a duplicate snap name
before allocating a snapshot sequence from the OSDs and
reverting due to the duplicate name.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: stop external replayer before closing remote journaler
Jason Dillaman [Tue, 7 Jun 2016 18:45:16 +0000 (14:45 -0400)]
rbd-mirror: stop external replayer before closing remote journaler

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrbd: stop journal recorder before starting external replay
Jason Dillaman [Tue, 7 Jun 2016 16:42:52 +0000 (12:42 -0400)]
librbd: stop journal recorder before starting external replay

Fixes: http://tracker.ceph.com/issues/16165
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8008 from cernceph/dvanders_minsize
Yuri Weinstein [Wed, 8 Jun 2016 14:34:04 +0000 (07:34 -0700)]
Merge pull request #8008 from cernceph/dvanders_minsize

mon: default ec min_size to k+1

Dan van der Ster <daniel.vanderster@cern.ch>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8789 from vuhuong/wip-msgr-flex-prop-list
Yuri Weinstein [Wed, 8 Jun 2016 14:30:17 +0000 (07:30 -0700)]
Merge pull request #8789 from vuhuong/wip-msgr-flex-prop-list

msgr,xio: flexible Messenger::create options

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9184 from liewegas/wip-addr-work
Yuri Weinstein [Wed, 8 Jun 2016 14:26:50 +0000 (07:26 -0700)]
Merge pull request #9184 from liewegas/wip-addr-work

msg: encode entity_addr_t with features

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9486 from ifed01/wip-bluestore-stats3
Sage Weil [Wed, 8 Jun 2016 14:24:33 +0000 (10:24 -0400)]
Merge pull request #9486 from ifed01/wip-bluestore-stats3

os/bluestore: add per-store allocation/compression statistics

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9314 from xiexingguo/xxg-wip-fix-radosclient
Yuri Weinstein [Wed, 8 Jun 2016 14:21:58 +0000 (07:21 -0700)]
Merge pull request #9314 from xiexingguo/xxg-wip-fix-radosclient

RadosClient: reduce cpu burning; fix message leak

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9413 from stiopaa1/common_simplecache_addMove
Yuri Weinstein [Wed, 8 Jun 2016 14:20:42 +0000 (07:20 -0700)]
Merge pull request #9413 from stiopaa1/common_simplecache_addMove

common/simple_cache.hpp: add std::move

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9414 from branch-predictor/bp-no-invalidate-new-ptr
Yuri Weinstein [Wed, 8 Jun 2016 14:19:08 +0000 (07:19 -0700)]
Merge pull request #9414 from branch-predictor/bp-no-invalidate-new-ptr

buffer: don't invalidate crc cache of new ptr before zeroing it

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoos/BlueStore: Adds improved per-store statistics including compression ones. 9486/head
Igor Fedotov [Mon, 6 Jun 2016 16:06:48 +0000 (19:06 +0300)]
os/BlueStore: Adds improved per-store statistics including compression ones.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #9487 from ceph/wip_control_compiler_diagnostic_colors
Casey Bodley [Wed, 8 Jun 2016 14:09:47 +0000 (10:09 -0400)]
Merge pull request #9487 from ceph/wip_control_compiler_diagnostic_colors

Allows developers to turn on diagnostic colors for compiler output when stderr is not a terminal

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoos/BlueStore: Fixes fake blob length after put_ref removes all the extents
Igor Fedotov [Mon, 6 Jun 2016 15:01:15 +0000 (18:01 +0300)]
os/BlueStore: Fixes fake blob length after put_ref removes all the extents

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/BlueStore: Adding compressed_length field to blob and fixing corresponding issues...
Igor Fedotov [Mon, 6 Jun 2016 14:57:47 +0000 (17:57 +0300)]
os/BlueStore: Adding compressed_length field to blob and fixing corresponding issues at read path

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/ObjectStore: Refactor ObjectStore::statfs method to return extended statistics
Igor Fedotov [Mon, 6 Jun 2016 14:43:39 +0000 (17:43 +0300)]
os/ObjectStore: Refactor ObjectStore::statfs method to return extended statistics

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoosd/OSDMap: rename pg_to_osds -> pg_to_raw_osds 9523/head
Sage Weil [Mon, 6 Jun 2016 16:16:08 +0000 (12:16 -0400)]
osd/OSDMap: rename pg_to_osds -> pg_to_raw_osds

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoclient: return acting, not raw, osds
Sage Weil [Mon, 6 Jun 2016 16:15:51 +0000 (12:15 -0400)]
client: return acting, not raw, osds

Reported-by: song baisen <song.baisen@zte.com.cn>
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9412 from Yan-waller/yj-hwip-rgwfixglobalinit
Orit Wasserman [Wed, 8 Jun 2016 08:05:08 +0000 (10:05 +0200)]
Merge pull request #9412 from Yan-waller/yj-hwip-rgwfixglobalinit

rgw/init: add errno and remove some unnecessary temporary variables.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #9331 from stiopaa1/common_workQueue_addOverride
Kefu Chai [Wed, 8 Jun 2016 06:48:58 +0000 (14:48 +0800)]
Merge pull request #9331 from stiopaa1/common_workQueue_addOverride

common/WorkQueue.h: add override to virtual func

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9389 from badone/wip-releases-table-plus-jewel
Kefu Chai [Wed, 8 Jun 2016 06:45:10 +0000 (14:45 +0800)]
Merge pull request #9389 from badone/wip-releases-table-plus-jewel

doc: Add Jewel header to releases table

Reviewed-by: Kefu Chai <kchai@redhat.com>