Commit Graph

54602 Commits

Author SHA1 Message Date
Gregory Farnum
e223d2eaff Merge pull request #9374 from batrick/i16024
client: use fh min readahead to enable readahead

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-06-12 14:36:51 -07:00
Gregory Farnum
b3364be590 Merge pull request #8739 from ukernel/wip-14271
mds,client: sort dentries in hash order

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-06-12 14:21:39 -07:00
Mykola Golub
9dd0487af9 Merge pull request #9640 from dillaman/wip-16235
librbd: recursive lock possible when disabling journaling

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-12 20:39:25 +03:00
Jason Dillaman
67f1370b84 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>
2016-06-12 08:06:19 -04:00
Mykola Golub
698242e743 qa/workunits/rbd: specify source path
otherwise it looks in $PATH for the script

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-06-11 20:30:32 +03:00
Kefu Chai
fb2667f3e1 Merge pull request #8436 from dreamhost/wip-python-prefix
python: Pass prefix/sbindir from autoconf to distutils.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-11 18:07:54 +08:00
Kefu Chai
9db46b0cb5 Merge pull request #9364 from H3C/H3C
osd: sparse_read offset may not be zero for ecpool

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-11 18:06:24 +08:00
Kefu Chai
73a90f02f8 Merge pull request #9387 from stiopaa1/osd_osd_constiter
osd/OSD.h: change iterator to const_iterator

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-06-11 18:05:08 +08:00
Kefu Chai
bbf72c254e Merge pull request #9508 from x11562/auth_rm
mon: fix typo of 'ceph auth rm'

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-06-11 18:04:04 +08:00
Kefu Chai
8d95f364af 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>
2016-06-11 17:59:23 +08:00
Patrick Donnelly
b5a0773259
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>
2016-06-10 18:02:31 -04:00
Sage Weil
efc9bf1dc0 Merge pull request #9637 from stiopaa1/osdc_ObjectCacher_deleteCopyAssign
osdc/ObjectCacher.h: delete copy constr and assign

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-10 17:36:11 -04:00
Patrick Donnelly
01c179bcce
client: use fh min readahead to enable readahead
The client was using the configured maximum readahead of 0 which was changed in
95ee699891. 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>
2016-06-10 17:33:13 -04:00
Patrick Donnelly
bee02a073f
client: update comment
Default was changed to unlimited in 11e4680e73.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-06-10 17:33:13 -04:00
Patrick Donnelly
b331d12a43
client: use layout.get_period() helper
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-06-10 17:33:13 -04:00
Matt Benjamin
8b5c1234c4 Merge pull request #9593 from Yan-waller/yj-hwip-rgwbasictype
rgw/basic_type: use the standard usage of string::npos

verified
2016-06-10 16:59:06 -04:00
Michal Jarzabek
b93e8b77d5 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>
2016-06-10 21:47:27 +01:00
Matt Benjamin
37b20e0f59 Merge pull request #9636 from linuxbox2/xio-entity
msg/xio: fix entity_addr_t encoding
2016-06-10 16:33:21 -04:00
Matt Benjamin
fa2ba6b646 Merge pull request #9625 from ceph/ldap-build
Allow building RGW with LDAP disabled

validated
2016-06-10 16:11:44 -04:00
Jason Dillaman
fb255e6c3c 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>
2016-06-10 15:55:22 -04:00
Matt Benjamin
3e1ac445a9 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>
2016-06-10 15:44:29 -04:00
Matt Benjamin
1467637437 cmake: fix mis-matched arguments to if warning
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-06-10 15:09:45 -04:00
Sage Weil
076e9874b9 Merge pull request #9534 from shehbazj/master
os/bluestore: benchmark Host Aware SMR Drives for linear writes
2016-06-10 14:46:38 -04:00
Sage Weil
973c63acdf Merge pull request #9615 from stiopaa1/osdc_objectCacher_removeUnneededPublic
osdc/ObjectCacher.h: remove public access specifier

Reviewed-by: Sage Weil <sage@redhat.com>
2016-06-10 14:42:57 -04:00
Daniel Gryniewicz
38abfcb5d0 Allow building RGW with LDAP disabled
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2016-06-10 14:17:13 -04:00
Matt Benjamin
193d0bf14a 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).
2016-06-10 13:57:16 -04:00
Kefu Chai
8353e39bef 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>
2016-06-11 00:34:49 +08:00
Samuel Just
4ae038fb53 Merge pull request #9515 from liewegas/wip-kraken-defaults
default to async messenger, wpq

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-06-10 08:06:21 -07:00
Kefu Chai
ad3253de81 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>
2016-06-10 14:16:00 +00:00
Kefu Chai
58ddae49cc 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>
2016-06-10 14:16:00 +00:00
Mykola Golub
25d9639946 Merge pull request #9621 from dillaman/wip-16229
rbd-mirror: do not propagate deletions when pool unavailable

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-10 16:59:25 +03:00
Mykola Golub
30d3d84da6 Merge pull request #9619 from dillaman/wip-16197
test: improve rbd-mirror test case coverage

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-10 16:44:19 +03:00
Sage Weil
efc1c5f7b4 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>
2016-06-10 09:41:34 -04:00
Jason Dillaman
db3e583a5f qa/workunits/rbd: additional rbd-mirror stress tests
Fixes: http://tracker.ceph.com/issues/16197
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-10 09:40:34 -04:00
Jason Dillaman
d5eec7b2f4 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>
2016-06-10 09:40:34 -04:00
Mykola Golub
cf186eacf1 Merge pull request #9618 from dillaman/wip-16226
rbd-mirror: fix deletion propagation edge cases

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-06-10 16:38:56 +03:00
Jason Dillaman
55b3cf6913 Merge pull request #9620 from trociny/rbd-mirror-error-formatting
rbd-mirror: fix error message formatting

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-06-10 09:36:40 -04:00
Jason Dillaman
5226db9d31 Merge pull request #9464 from vumrao/wip-vumrao-15807
rbd: add error message "snapshot is already protected"

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-06-10 09:35:15 -04:00
Jason Dillaman
d321634414 rbd-mirror: do not propagate deletions when pool unavailable
Fixes: http://tracker.ceph.com/issues/16229
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-10 09:08:46 -04:00
Casey Bodley
db7a636e12 Merge pull request #9420 from weiqiaomiao/wqm-wip-rgw-fixmemleak
rgw:fix data sync memory leaks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-06-10 08:30:07 -04:00
Mykola Golub
2af72480d9 rbd-mirror: fix error messages formatting
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-06-10 14:04:04 +03:00
John Spray
90ab9ca925 Merge pull request #8386 from ukernel/wip-monntbyfsname
client: mount non-default filesystem by name

Reviewed-by: John Spray <john.spray@redhat.com>
2016-06-10 10:50:59 +01:00
Jason Dillaman
d72a8cb67f rbd-mirror: image deleter properly handles multiple snapshots
Fixes: http://tracker.ceph.com/issues/16226
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-10 00:15:27 -04:00
Jason Dillaman
a0c526a237 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>
2016-06-10 00:15:27 -04:00
Jason Dillaman
de15b198cd qa/workunits/rbd: improve deletion propagation test case
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-06-10 00:15:20 -04:00
Yan, Zheng
e07839f8cf messages: fix MFSMap::get_type_name()
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-06-10 09:30:20 +08:00
Yan, Zheng
53c2255f20 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>
2016-06-10 09:30:20 +08:00
Yan, Zheng
049debf74f MDSMonitor: handle fsmap.user subscription
return FSMap data that are visiable to normal users.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-06-10 09:30:19 +08:00
Yan, Zheng
4276042edc messages: add MFSMapUser
For mon clients that subscribe to 'fsmap.user'

Signed-off-by: Yan, Zheng <zyan@redhat.com>
2016-06-10 09:25:07 +08:00
Yan, Zheng
92d7b659ec 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>
2016-06-10 09:25:06 +08:00