Commit Graph

40683 Commits

Author SHA1 Message Date
Zhiqiang Wang
b47a5499a0 librbd: don't do readahead when m_readahead_pos reaching limit
When m_readahead_pos reaches the limit, there's no need to call
_compute_readahead to calculate the readahead. Just return with no
readahead.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-04-07 14:23:38 +08:00
Zhiqiang Wang
04fe26921f librbd: start readahead from m_last_pos when the size of the continuing
triggering request is big enough

If the size of the read triggering the continuing readahead is such big
that exceeding m_readahead_pos, should do the readahead starting from
m_last_pos.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-04-07 13:43:36 +08:00
Sage Weil
9c7ea3be91 Merge pull request #3867 from wonzhq/fiemap
FileStore: fiemap implementation using SEEK_HOLE/SEEK_DATA

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-06 15:48:27 -07:00
Sage Weil
cee47b361c Merge pull request #3170 from tchaikov/python-rados-refactor
python-rados: extract type-checking into a decorator

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 15:47:33 -07:00
Sage Weil
a074a1478d Merge pull request #3560 from XinzeChi/wip-pmon-all
ceph.in: add ceph ping mon.* for ping all monitor

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-06 15:47:09 -07:00
Sage Weil
6c070accfc Merge pull request #3879 from liewegas/wip-cache-mode-none
mon: warn if cache_mode is none and pool is a read or writ eoverlay tier

Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-06 15:46:21 -07:00
Josh Durgin
04566f5c54 Merge pull request #3980 from ceph/wip-rbd-update-features
librbd: add support for updating image features 

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-04-06 15:33:53 -07:00
Sage Weil
1594daecc6 Merge remote-tracking branch 'gh/hammer'
Conflicts:
	src/gmock
2015-04-06 13:43:01 -07:00
Yehuda Sadeh
405003b313 Merge pull request #4133 from rzarzynski/wip-10645
rgw: improve metadata handling on object copy operation of Swift API.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-06 11:49:50 -07:00
Sage Weil
f028b25f81 Merge pull request #4280 from jdurgin/wip-lttng-build
debian: remove lttng checking from rules

Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-06 11:36:50 -07:00
Josh Durgin
4347a3207d debian: remove lttng checking from rules
This can be done better in a separate script, which puts these in
CEPH_EXTRA_CONFIGURE_ARGS. In particular, this lets us enable
lttng for gitbuilder builds, but not release builds.

Fixes: #11333
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit a294daff0b)
2015-04-06 11:36:35 -07:00
Josh Durgin
a294daff0b debian: remove lttng checking from rules
This can be done better in a separate script, which puts these in
CEPH_EXTRA_CONFIGURE_ARGS. In particular, this lets us enable
lttng for gitbuilder builds, but not release builds.

Fixes: #11333
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-04-06 11:29:39 -07:00
Yehuda Sadeh
efb1a2dd1e Update PendingReleaseNotes for firefly change, rgw socket path related
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-04-06 10:38:57 -07:00
Jason Dillaman
37b1996bf3 librbd: remove object maps when disabling
If the object map feature is disabled, remove any object maps
prior to disabling the feature.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:35 -04:00
Jason Dillaman
5bc3a454ef librbd: flag the snapshot object map as invalid when error occurs
Instead of flagging the HEAD image object map as invalid when an
error occurs with a snapshot object map, properly flag the snapshot
as invalid.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:35 -04:00
Jason Dillaman
3a7b28d9a2 rbd: add feature enable/disable support
Mutable image features can now be enabled/disabled via
the rbd CLI.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:35 -04:00
Jason Dillaman
d1348e5cfe tests: add update_features test to test_librbd
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
28557c3e17 tests: add update_features test for pybind
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
82affca727 pybind: add update_features to rbd.py
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
7cff359188 librbd: add update_features to librbd API
Allow mutable features to be enabled / disabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
34c347becb tests: add test case for cls_rbd set_features
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
71b4c12478 cls_rbd_client: add set_features helper method
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
71dcee745b cls_rbd: add set_features class method
Allow certain mutable feature flags to be updated within
an image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
2e26309329 librbd: remove usage of snapshot features
The features for the image HEAD now apply to all
snapshots within the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
59b6801976 tests: update cls_rbd_client tests for get_features changes
Images no longer track per-snapshot features. snapshot_list
no longer needs to retrieve per-snapshot features.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
58d59d6e52 cls_rbd_client: snapshot_list no longer retrieves features
Features should now be consistent across snapshots, so
no reason to retrieve them.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Jason Dillaman
281f87f9ee cls_rbd: get_features on snapshots returns HEAD image features
In preparation for dynamic feature bits, it probably doesn't
make sense to have snapshots have different features enabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-04-06 13:14:34 -04:00
Sage Weil
557715049a Merge pull request #4246 from ceph/wip-11113-hammer
librbd: snap_remove should ignore -ENOENT errors
2015-04-06 08:55:51 -07:00
Sage Weil
8f4551c15e doc/release-notes: 0.67.12 are draft notes
Signed-off-by: Sage Weil <sage@redhat.com>
2015-04-06 08:36:24 -07:00
Sage Weil
97dfde8dc7 Merge pull request #4250 from athanatos/wip-11265
ECTransaction: write out the hinfo key on touch as well

Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-06 08:07:28 -07:00
Sage Weil
ad8481b708 Merge pull request #4251 from athanatos/wip-11284
ReplicatedPG::promote_object: do not create obc if not promoting

Reviewed-by: Sage Weil <sage@redhat.com>
2015-04-06 08:07:15 -07:00
Ken Dreyer
471271b353 Merge pull request #4278 from nilamdyuti/wip-doc-ceph-object-gateway
doc: Corrects some content for Debian-based distros in simple gateway
configuration file.

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-04-06 08:23:11 -06:00
Nilamdyuti Goswami
54c808577b doc: Corrects some content for Debian-based distros in simple gateway
configuration file.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2015-04-06 18:51:17 +05:30
Loic Dachary
c78940714c Merge pull request #4238 from ceph/wip-9580
ceph-disk: make journal setup conditional on osd backend

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 12:15:38 +02:00
Sage Weil
7b19d8f33c Merge pull request #4244 from dachary/wip-9580
tests for ceph-disk: make journal setup conditional on osd backend
2015-04-05 17:25:05 -07:00
Loic Dachary
106d006787 tests: add ceph-disk.sh activate for memstore
Add a test for the activation of the memstore objectstore and verify
that it works without specifying a journal.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:19 +02:00
Loic Dachary
4601e10800 tests: move rados put/get tests in a function
Add the test_pool_read_write function to share the rados put / get test
that demonstrate the osd that has been created can actually be used. Use
it from the both the regular device and dmcrypt tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:19 +02:00
Loic Dachary
8db870edf1 tests: ceph-disk.sh dmcrypt tests use test_setup_dev_and_run
Instead of duplicating the device construction / destruction logic for
dmcrypt tests, use test_setup_dev_and_run to do it. It is now able to
recover from devmapper leftover which may occur when a cryptsetup test
fails.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:19 +02:00
Loic Dachary
8c6d209650 tests: merge ceph-disk.sh activate dmcrypt functions
The activate_dmcrypt_plain_dev_body and activate_dmcrypt_dev_body
functions are almost identical, merge them and differentiate with an
argument.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:18 +02:00
Loic Dachary
282ccce16a tests: add test_setup_dev_and_run to ceph-disk.sh
Move test_activate_dev to test_setup_dev_and_run and make it
run the function given in argument. test_activate_dev calls
test_setup_dev_and_run and no longer needs to implement device
allocation or destruction.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:18 +02:00
Loic Dachary
c583b57670 tests: improve ceph-disk.sh setup/teardown
Address all possible failure cases, when ceph-disk.sh completes or when
it starts with leftover from a previous interrupted run. It is assumed
that ceph-disk.sh will crash at any point.

* umount all mount points that belong to ceph-disk.sh (check the
  absolute path of the directory)
* dmsetup remove all device mapper nodes found to hold a loop device
  that ceph-disks.sh no longer uses
* losetup --detach all loop devices that ceph-disks.sh no longer uses

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:18 +02:00
Loic Dachary
eaf89661d9 tests: do not use -e in ceph-disk.sh
The tests explicitly return on error when relevant. Add two error cases:

* detect when the allocation of a loop device fails.
* in the outer loop, return immediately if one of the test fails

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:18 +02:00
Loic Dachary
28269d7cb8 tests: reduce ceph-disk.sh verbosity
Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-06 01:58:18 +02:00
Sage Weil
23549bfbbd Merge pull request #4256 from dachary/wip-dumpling-release-notes
doc/release-notes: final dumpling v0.67.12 release notes
2015-04-05 10:35:26 -07:00
Kefu Chai
acfbc152c8 Merge pull request #4263 from dachary/wip-man-install
rhel 6 needs python-sphinx10 

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-04-03 10:25:36 +08:00
Loic Dachary
e39070fea7 man: using sphinx-1.0-build if no sphinx-build
On RHEL 6 and CentOS 6 sphinx 1.0+ which is required to build man pages
is packaged as sphinx10 instead of sphinx and the binary is
sphinx-1.0-build instead of sphinx-build.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-03 02:59:58 +02:00
Loic Dachary
a8eab36cb0 spec.in: sphinx -b man needs sphinx > 1.0
It is used to build the man pages.

Signed-off-by: Loic Dachary <ldachary@rehdat.com>
2015-04-03 02:59:58 +02:00
Loic Dachary
1433315b69 Merge pull request #4115 from dzafman/wip-dzmanfix
doc, mon: Add ceph osd pool get <poolname> all to man page

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-04-03 01:33:07 +02:00
Loic Dachary
59dfd63196 Merge pull request #4262 from dachary/wip-man-install
man: add conf.py to the list of distributed files
2015-04-03 00:55:55 +02:00
Loic Dachary
a3cf004411 man: add conf.py to the list of distributed files
Otherwise packages won't build as it's not included in the tarbal.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-04-03 00:22:01 +02:00