Commit Graph

38274 Commits

Author SHA1 Message Date
Josh Durgin
896c8899ac Merge remote-tracking branch 'origin/wip-10271' into next
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-16 14:33:59 -08:00
Sage Weil
bed740bbd0 Merge pull request #3342 from ceph/wip-10311
rgw: only keep track for cleanup of rados objects that were written

Reviewed-by: Ray Lv <xiangyulv@gmail.com>
2015-01-15 21:45:56 -08:00
Sage Weil
80473f6385 os/FileJournal: Fix journal write fail, align for direct io
when config journal_zero_on_create true, osd mkfs will fail when zeroing journal.
journal open with O_DIRECT, buf should align with blocksize.

Backport: giant, firefly, dumpling
Signed-off-by: Xie Rui <875016668@qq.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-15 11:20:18 -08:00
Jerry7X
cc0dba5261 mon: encode stashed monmap with all features
latest_monmap that we stash is only used locally--the encoded bl is never shared. Which means we should just use CEPH_FEATURES_ALL all of the time.

Fixes: #5203
Backport: giant, firefly
Signed-off-by: Xie Rui <875016668@qq.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-15 11:13:17 -08:00
Sage Weil
5c8ee3388f Merge remote-tracking branch 'gh/next' 2015-01-14 08:57:33 -08:00
Sage Weil
d15958631b PendingReleaseNotes: make a note about librados flag changes
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-13 12:23:37 -08:00
Sage Weil
5a1fd855df Merge pull request #3360 from mattrichards/bump_rados_version
librados: bump rados version number

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-13 12:18:04 -08:00
Jenkins
725d66098c 0.91 2015-01-13 12:10:22 -08:00
Josh Durgin
6f8b54ca29 Merge pull request #2697 from ceph/wip-8900
RBD image watcher and new exclusive lock handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-13 11:17:29 -08:00
Samuel Just
b8ce73f253 Merge pull request #3254 from trociny/feature-10036
osd: osd tree to show primary-affinity value

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-13 10:56:29 -08:00
Samuel Just
6c4a523c36 Merge pull request #3281 from ceph/wip-10441-b
osd: fix watch ordering bug 10441 option b

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-13 10:55:29 -08:00
Samuel Just
00c30dd0d4 Merge pull request #3290 from ceph/wip-da-SCA-20150102
Coverity and SCA fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-13 10:54:45 -08:00
Samuel Just
733ce25ccb Merge pull request #3302 from ceph/wip-9956
os/FileStore: verify kernel is new enough before using extsize ioctl

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-13 10:54:21 -08:00
Samuel Just
c82f8177f7 Merge pull request #3305 from majianpeng/fix5
fix bugs about sync_filesystem

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-13 10:53:34 -08:00
Gregory Farnum
a6f5682d55 Merge pull request #3364 from ceph/wip-quota-test
qa: set -e explicitly in quota test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-13 07:08:30 -08:00
John Spray
b578a53b03 qa: set -e explicitly in quota test
Previously was set in hashbang, which meant
that "./quota.sh" was OK, but "sh ./quota.sh" would
just run through ignoring errors.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-13 14:58:57 +00:00
Gregory Farnum
d8e1f675f6 Merge pull request #3336 from ceph/wip-fs-reset
mon: implement `fs reset`

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-13 06:47:04 -08:00
Loic Dachary
fc7fa3087d Merge pull request #3343 from dachary/wip-10505-centos-parted
tests: install parted in centos Dockerfile

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-13 11:07:55 +01:00
Jason Dillaman
7945f8d688 librbd: flush pending AIO requests under all existing flush scenarios
AIO requests that are waiting on the image lock should be flushed
during all existing RBD flush scenarios.  A few flush cases were
missed in the original implementation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 23:17:50 -05:00
Jason Dillaman
2dd0f038d6 librbd: AIO requests should retry lock requests
Added a timer to support retrying AIO lock requests until
they are successful.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 23:14:11 -05:00
Jason Dillaman
6176ec5fde librbd: differentiate between R/O vs R/W RBD features
The new RBD exclusive lock feature should be treated as a
feature that is only applied when the image is opened in
R/W mode.

Older clients will need to handle the updated
cls_rbd::get_features method in order to properly determine
the incompatible features for an image depending on the
current mode.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 20:02:25 -05:00
Jason Dillaman
544ed961c6 librbd: Add internal unit test cases
The new unit tests cover the modifications made to integrate
the internal librbd functionality with the new ImageWatcher.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 20:02:24 -05:00
Jason Dillaman
17f22d98df librbd: Add ImageWatcher unit test cases
Directly unit test the new ImageWatcher class to complement
the existing librbd integration tests of exclusive lock
handling.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 20:02:06 -05:00
Jason Dillaman
5160281b1a librbd: Add convenience library to support unit tests
Unit tests need access to the private symbols of librbd no
longer exported from librbd.so.  A new librbd_internal
convenience library was created to allow access.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 20:01:21 -05:00
Jason Dillaman
4297e3bf8e rbd: Allow CLI to optionally create shared images
Images that are flagged as shared cannot use the RBD
object map nor RBD mirroring features.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 20:01:21 -05:00
Jason Dillaman
ccadff1445 librbd: Integrate librbd with new exclusive lock feature
Operations that update the image now require the exclusive lock
if the feature is enabled.  AIO write and discard operations will
automatically request the exclusive lock from the current leader
to support live-migration.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 20:01:19 -05:00
Matt Richards
9ee80b3322 librados: bump rados version number
As a follow-on to 49d114f1ff,
increment the "extra" version field so clients can easily
determine if they have a version of librados that properly
translates C API operation flags.

Signed-off-by: Matthew Richards <mattjrichards@gmail.com>
2015-01-12 17:00:52 -08:00
Josh Durgin
d784bc47c4 Merge pull request #3316 from ceph/wip-10471
rgw: index swift keys appropriately

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-12 16:20:28 -08:00
Jason Dillaman
f5668d6b9d librbd: Create image exclusive lock watch/notify handler
The new watch/notify handler replaces the existing header
update watch/notify handler and adds support for managing
image exclusive lock leadership.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-12 19:01:07 -05:00
Sage Weil
2ecd8748d2 osd: enable filestore_extsize by default
Note that this will only get used if the kernel is new enough; if it is
older than 3.5 the option will get disabled and extsize will not be used
even if the option is set to true.

This partially reverts 01cd3cdc72.

Fixes: #9956
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-12 14:00:21 -08:00
Sage Weil
b76d0dc0f2 os/FileStore: verify kernel is new enough before using extsize ioctl
Old kernels have an XFS bug that exposes uninitialized data when the
extsize hint is set and only partially written.  This is fixed by Linux
commit aff3a9edb7080f69f07fe76a8bd089b3dfa4cb5d, documented in XFS bug
http://oss.sgi.com/bugzilla/show_bug.cgi?id=874, and tested by XFS
test xfs/229 to prevent regressions.

Notably the original bug affects kernel 3.2, which is widely deployed with
ubuntu precise 12.04.

Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-12 13:59:39 -08:00
Gregory Farnum
c219c43cc2 Merge pull request #3352 from kylinstorage/fix-10503
Fix bug 10503: http://tracker.ceph.com/issues/10503

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-12 11:33:02 -08:00
Samuel Just
4ecea7e54e Merge pull request #3203 from majianpeng/fix1
avoid memcopy from librados to caller buffer

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-12 08:39:48 -08:00
Samuel Just
187c85a5c4 Merge pull request #3034 from dachary/wip-10017-erasure-code-repair
erasure code repair when there are two failures

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-12 08:26:08 -08:00
Samuel Just
fb72b9e4b9 Merge pull request #3148 from mslovy/optimazation_wbthrottle
os: WBThrottle: optimize the map to unordered_map

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-12 08:23:26 -08:00
John Spray
a4152dbfa1 mon/MDSMonitor: add confirm flag to fs reset
This was already in the command map but was not
being checked.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-12 15:00:15 +00:00
John Spray
8630696681 qa: add fs reset to cephtool tests
This is just a superficial "I can call it" test,
it's actual behaviour is checked elsewhere.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-12 15:00:15 +00:00
John Spray
1713ffd898 mon: implement fs reset
This is for use in CephFS disaster recovery.  When
the metadata pool has been forcibly reset to a single-MDS
metadata tree, we would like to reset the MDSMap to match.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-12 15:00:14 +00:00
Yunchuan Wen
1f694767c3 Fix bug 10503: http://tracker.ceph.com/issues/10503
ceph-fuse: quota code is not 32-bit safe for vxattr output

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
2015-01-12 05:49:32 +00:00
Sage Weil
538bad38d3 Merge pull request #2948 from ceph/wip-promote
osd: promote_object separation; proxy read

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-11 07:55:08 -08:00
Sage Weil
f42ef1e370 ceph_test_rados: add some debug output
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-10 20:35:31 -08:00
Sage Weil
1554fbc87e osd/ReplicatedPG: improve proxy read cancelation
Avoid taking the PG lock for a canceled read op (if we are lucky).  Recheck
after the lock is taken for good measure.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-10 20:35:31 -08:00
Sage Weil
1c8b679d0c osd/ReplicatedPG: put proxy read completion on finisher
We can't use the synchronous completion callbacks (in fast dispatch
context) do to the proxy read completion work.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-10 20:35:30 -08:00
Zhiqiang Wang
650f1d989b osd: tiering: avoid duplicate promotion on proxy read
Do not promote if it is already undergoing in maybe_handle_cache.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-01-10 20:35:30 -08:00
Zhiqiang Wang
43f13af614 osd: tiering: proxy instead of redirect read in writeback mode when the
cache pool is full

To preserve read op order

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-01-10 20:35:30 -08:00
Zhiqiang Wang
bfb71a4e63 osd: tiering: cancel and requeue proxy read when needed
Cancel and requeue proxy read on the following cases:
1) on_shutdown
2) on_change
3) background promotion is done

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>

Conflicts:
	src/osd/ReplicatedPG.cc
	src/osd/ReplicatedPG.h
2015-01-10 20:35:30 -08:00
Sage Weil
759db93f16 osd/ReplicatedPG: allow reads to proxy etc even if blocked
If we are not write ordered, continue with cache checks so that we can
(among other things) proxy reads while promoting.

Note that this may reorder reads for clients, but we've decided that's okay.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-10 20:35:30 -08:00
Zhiqiang Wang
ce14310c8a test: add proxy read test
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-01-10 20:35:30 -08:00
Zhiqiang Wang
8e145e08ed osd: tiering: proxy reads during promote
wip 9980. Do proxy read and async promotion for writeback.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-01-10 20:35:30 -08:00
Zhiqiang Wang
4dc9990e7e osd: tiering: add cache mode READPROXY
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-01-10 20:35:30 -08:00