]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoserver: avoid duplicated call to utime_t 9681/head
xie xingguo [Tue, 14 Jun 2016 11:59:41 +0000 (19:59 +0800)]
server: avoid duplicated call to utime_t

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomds/SessionMap: avoid potential memory leak
xie xingguo [Tue, 14 Jun 2016 02:52:15 +0000 (10:52 +0800)]
mds/SessionMap: avoid potential memory leak

This is safer and clean.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agomds/SessionMap: explicitly require importing_count to be postive
xie xingguo [Tue, 14 Jun 2016 02:24:28 +0000 (10:24 +0800)]
mds/SessionMap: explicitly require importing_count to be postive

The importing_count is of type int, thus it can go underflow and
assert(importing_count) can still return false positive while it
should not supposed to do so.

Also this can make the assert itself more sensitive, e.g., can
catch underflow errors.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoserver: remove redundant semicolon
xie xingguo [Tue, 14 Jun 2016 01:43:58 +0000 (09:43 +0800)]
server: remove redundant semicolon

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoserver: set terminating_sessions flag correctly
xie xingguo [Tue, 14 Jun 2016 01:11:15 +0000 (09:11 +0800)]
server: set terminating_sessions flag correctly

So caller won't do this multiple times.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #9484 from jmunhoz/aws4-streaming
Matt Benjamin [Mon, 13 Jun 2016 20:47:27 +0000 (16:47 -0400)]
Merge pull request #9484 from jmunhoz/aws4-streaming

rgw: aws4: add STREAMING-AWS4-HMAC-SHA256-PAYLOAD support

verified (by hand)

9 years agoMerge pull request #9664 from dillaman/wip-16253
Mykola Golub [Mon, 13 Jun 2016 15:58:30 +0000 (18:58 +0300)]
Merge pull request #9664 from dillaman/wip-16253

rbd-mirror: do not re-use image id from mirror directory if creating image

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9588 from renhwztetecs/renhw-wip-mdsboot
John Spray [Mon, 13 Jun 2016 14:08:06 +0000 (15:08 +0100)]
Merge pull request #9588 from renhwztetecs/renhw-wip-mdsboot

mds: Ignore create_root_inode's access value

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9502 from tchaikov/wip-buffer-noexcept
Kefu Chai [Mon, 13 Jun 2016 13:49:41 +0000 (21:49 +0800)]
Merge pull request #9502 from tchaikov/wip-buffer-noexcept

common/buffer: add noexcept to ensure move ctor is used

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9658 from runsisi/ss-wip-fix-rbd-mirror-doc
Jason Dillaman [Mon, 13 Jun 2016 13:29:12 +0000 (09:29 -0400)]
Merge pull request #9658 from runsisi/ss-wip-fix-rbd-mirror-doc

doc: fix typo for rbd-mirroring

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9657 from dillaman/wip-16235
Mykola Golub [Mon, 13 Jun 2016 10:42:52 +0000 (13:42 +0300)]
Merge pull request #9657 from dillaman/wip-16235

librbd: avoid holding owner_lock waiting for exclusive lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9661 from dillaman/wip-16248
Mykola Golub [Mon, 13 Jun 2016 10:41:56 +0000 (13:41 +0300)]
Merge pull request #9661 from dillaman/wip-16248

qa/workunits: ensure replay has started before checking position

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agorbd-mirror: reset local image id when creating new image 9664/head
Jason Dillaman [Mon, 13 Jun 2016 06:09:00 +0000 (02:09 -0400)]
rbd-mirror: reset local image id when creating new image

Fixes: http://tracker.ceph.com/issues/16253
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: handle an attempt to delete a non-mirrored image
Jason Dillaman [Mon, 13 Jun 2016 06:07:54 +0000 (02:07 -0400)]
rbd-mirror: handle an attempt to delete a non-mirrored image

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agocls_rbd: disallow setting an empty mirror image entry to disabling
Jason Dillaman [Mon, 13 Jun 2016 06:03:29 +0000 (02:03 -0400)]
cls_rbd: disallow setting an empty mirror image entry to disabling

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9642 from yuyuyu101/wip-16237
Haomai Wang [Mon, 13 Jun 2016 05:35:59 +0000 (13:35 +0800)]
Merge pull request #9642 from yuyuyu101/wip-16237

msg/async/AsyncConnection: make verify auth callback without connection lock

Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agoMerge pull request #9213 from stiopaa1/replicatedpg_movetoforward
Kefu Chai [Mon, 13 Jun 2016 05:09:21 +0000 (13:09 +0800)]
Merge pull request #9213 from stiopaa1/replicatedpg_movetoforward

osd/ReplicatedPG.h: remove incorrect use of move

Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6967 from majianpeng/osd-full-skip-readop
Kefu Chai [Mon, 13 Jun 2016 05:05:49 +0000 (13:05 +0800)]
Merge pull request #6967 from majianpeng/osd-full-skip-readop

osd: bypass readonly ops when osd full.

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8913 from vumrao/wip-vumrao-15704
Kefu Chai [Mon, 13 Jun 2016 05:01:44 +0000 (13:01 +0800)]
Merge pull request #8913 from vumrao/wip-vumrao-15704

rados: Add cleanup message with time to rados bench output

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agoqa/workunits: ensure replay has started before checking position 9661/head
Jason Dillaman [Mon, 13 Jun 2016 04:19:37 +0000 (00:19 -0400)]
qa/workunits: ensure replay has started before checking position

Fixes: http://tracker.ceph.com/issues/16248
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agodoc: fix typo for rbd-mirroring 9658/head
runsisi [Mon, 13 Jun 2016 02:04:07 +0000 (10:04 +0800)]
doc: fix typo for rbd-mirroring

Signed-off-by: runsisi <runsisi@zte.com.cn>
9 years agolibrbd: avoid holding owner_lock waiting for exclusive lock 9657/head
Jason Dillaman [Mon, 13 Jun 2016 01:42:59 +0000 (21:42 -0400)]
librbd: avoid holding owner_lock waiting for exclusive lock

Fixes: http://tracker.ceph.com/issues/16235
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #9374 from batrick/i16024
Gregory Farnum [Sun, 12 Jun 2016 21:36:51 +0000 (14:36 -0700)]
Merge pull request #9374 from batrick/i16024

client: use fh min readahead to enable readahead

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8739 from ukernel/wip-14271
Gregory Farnum [Sun, 12 Jun 2016 21:21:39 +0000 (14:21 -0700)]
Merge pull request #8739 from ukernel/wip-14271

mds,client: sort dentries in hash order

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #9640 from dillaman/wip-16235
Mykola Golub [Sun, 12 Jun 2016 17:39:25 +0000 (20:39 +0300)]
Merge pull request #9640 from dillaman/wip-16235

librbd: recursive lock possible when disabling journaling

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #9645 from trociny/rbd-mirror-teuthology-fix
Jason Dillaman [Sun, 12 Jun 2016 12:06:19 +0000 (08:06 -0400)]
Merge pull request #9645 from trociny/rbd-mirror-teuthology-fix

qa/workunits/rbd: specify source path for rbd-mirror helper functions

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agomds/MDSRank: Ignore create_root_inode's access value 9588/head
huanwen ren [Sun, 12 Jun 2016 06:58:29 +0000 (14:58 +0800)]
mds/MDSRank: Ignore create_root_inode's access value

add (void), Ignore create_root_inode's access value

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
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 agomsg/async/AsyncConnection: make verify auth callback without connection lock 9642/head
Haomai Wang [Sat, 11 Jun 2016 05:39:23 +0000 (13:39 +0800)]
msg/async/AsyncConnection: make verify auth callback without connection lock

Fixes: http://tracker.ceph.com/issues/16237
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoclient: move readahead ref get/put to obj constr 9374/head
Patrick Donnelly [Fri, 10 Jun 2016 21:33:04 +0000 (17:33 -0400)]
client: move readahead ref get/put to obj constr

The readahead context was incrementing the file handle reference count but only
decreasing in finish which is not called if readahead is a no-op.

This fixes a bug caught in testing where readahead was causing inode to become
disconnected:

    2016-06-10 19:46:48.953018 7f2a4351be80  1 client.4125 dump_inode: DISCONNECTED inode 10000000502 #10000000502 ref 110000000502.head(faked_ino=2307 ref=1 ll_ref=0 cap_refs={1024=0,2048=0,4096=0,8192=0} open={1=0,2=0} mode=100666 size=4194304/0 mtime=2016-06-10 19:29:45.107417 caps=-(0=pAsLsXsFscr) objectset[10000000502 ts 2/4012653 objects 0 dirty_or_tx 0] 0x7f2a24300d00)
    2016-06-10 19:46:48.953032 7f2a4351be80  2 client.4125 cache still has 0+155 items, waiting (for caps to release?)

Signed-off-by: Patrick Donnelly <pdonnell@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 agoclient: use fh min readahead to enable readahead
Patrick Donnelly [Thu, 26 May 2016 20:32:58 +0000 (16:32 -0400)]
client: use fh min readahead to enable readahead

The client was using the configured maximum readahead of 0 which was changed in
95ee69989129750fddce6a3b5644238c4b88ed74. This prevented readahead from ever
running (without setting a different default from 0).

Fixes: http://tracker.ceph.com/issues/16024
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
9 years agoclient: update comment
Patrick Donnelly [Fri, 27 May 2016 15:43:31 +0000 (11:43 -0400)]
client: update comment

Default was changed to unlimited in 11e4680e7394e6e02612441c964e05207b97737b.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
9 years agoclient: use layout.get_period() helper
Patrick Donnelly [Thu, 26 May 2016 19:08:52 +0000 (15:08 -0400)]
client: use layout.get_period() helper

Signed-off-by: Patrick Donnelly <pdonnell@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 agolibrbd: recursive lock possible when disabling journaling 9640/head
Jason Dillaman [Fri, 10 Jun 2016 19:44:26 +0000 (15:44 -0400)]
librbd: recursive lock possible when disabling journaling

If pool-level mirroring is enabled, deleting the journal
could cause a deadlock attempting to delete remote peer
sync-point snapshots.

Fixes: http://tracker.ceph.com/issues/16235
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
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>