Commit Graph

53864 Commits

Author SHA1 Message Date
Boris Ranto
6de39ce737 rpm: Restore /var/run/ceph context manually
The fixfiles command won't fix label for /var/run/ceph (/run is probably
excluded from relabel), we need to restore the context manually.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:59:14 +02:00
Boris Ranto
3c104b1065 rpm: Mute semodule in postun script
Currently, we don't mute the semodule output in postun script. This
results in the following message when removing ceph-selinux package:

libsemanage.semanage_direct_remove_key: Removing last ceph module (no
other ceph module exists at another priority).

The fix is to simply mute the output of the command.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:59:14 +02:00
Boris Ranto
bef5ea7833 Revert "rpm: put /sbin/ldconfig into -p"
This reverts commit a53d932fc4.

If the interpret is passed to postun script, everything until the next
rpm section gets interpreted as the input for the interpret (in this
case ldconfig). This results in warnings like

/sbin/ldconfig: relative path `0' used to build cache

when removing the packages that pass the interpret because we use
several '#' characters to separate the subpackage sections and these get
passed to the ldconfig.

Using the default interpret (bash) fixes the warning. I'm also doing the
same to %post script for consistency.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:58:38 +02:00
Samuel Just
6f835726a7 BackoffThrottle: wait() if past max
Otherwise, we risk spinning on wait_for() with a small
delay.

Fixes: http://tracker.ceph.com/issues/15953
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-05-23 10:37:15 -07:00
Samuel Just
846808ff3f BackoffThrottle: use wait_for instead of wait_until
On some platforms, wait_until won't surrender the lock
with a negative argument.

Signed-off-by: Samuel Just <sjust@redhat.com>
2016-05-23 10:37:14 -07:00
Casey Bodley
0120d271bd Merge pull request #9249 from tchaikov/wip-cmake-ocf
cmake: add ocf support

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-23 10:53:15 -04:00
Boris Ranto
bdd85cd4fe Merge pull request #9227 from ceph/rpm-autosetup-kdreyer
ceph.spec.in: use %autosetup macro

Reviewed-by: Nathan Cuthler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-05-23 16:34:42 +02:00
Kefu Chai
4711fe1cae Merge pull request #9147 from flaf/master
doc: update required packages list to build doc

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-23 22:20:54 +08:00
Sage Weil
23d329f5a6 Merge pull request #9247 from cxwshawn/wip-tc4-fix
global: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:51:27 -04:00
Sage Weil
7f1049d1d7 Merge pull request #9251 from cxwshawn/wip-tc5-fix
client: optimize header file dependency.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:50:50 -04:00
Sage Weil
d8efaa117f osd/HitSet.h: add 'override' to virtual functionsReviewed-by: Kefu Chai <kchai@redhat.com>
osd/HitSet.h: add 'override' to virtual functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-23 09:50:13 -04:00
Sage Weil
b8e73de44c Merge pull request #9255 from yuyuyu101/wip-test-msgr-fix
test_msgr: add verbose info for pending connections

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-23 09:48:56 -04:00
John Spray
cb1c6fe26c Merge pull request #8929 from ajarr/wip-15614
ceph_volume_client: allow read-only authorization for volumes

Reviewed-by: John Spray <john.spray@redhat.com>
2016-05-23 12:34:30 +01:00
Radoslaw Zarzynski
19c12bbc23 rgw: remove unnecessary data copying in RGWPutMetadataBucket.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-05-23 13:27:24 +02:00
Radoslaw Zarzynski
d9e4727b7e rgw: Fix updating CORS/ACLs during POST on Swift's container.
Introduced in: 7a7de9b752
Fixes: http://tracker.ceph.com/issues/15976
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-05-23 12:48:24 +02:00
songbaisen
d71424dc16 mon: remove the redundant judge on dispatch_op function
Signed-off-by: songbaisen <song.baisen@zte.com.cn>
2016-05-23 18:42:00 +08:00
Ramana Raja
011ea5e7fb ceph_volume_client: allow read-only authorization for volumes
Allow clients to be restricted to read-only mount of the volume
by restricting their ceph auth ID's MDS and OSD caps to read-only.

Fixes: http://tracker.ceph.com/issues/15614

Signed-off-by: Ramana Raja <rraja@redhat.com>
2016-05-23 14:20:24 +05:30
Mykola Golub
b8b3a9757f pybind/rbd: create/clone/copy: default to None for features param
If None is specified don't set the features so that the defaults is
used.

Fixes: http://tracker.ceph.com/issues/15982
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-05-23 09:23:11 +03:00
Mykola Golub
d305eaad8d librbd: clone: default to parent features
Fixes: http://tracker.ceph.com/issues/15982
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-05-23 09:23:11 +03:00
Jason Dillaman
21c759936d Merge pull request #8473 from rjfd/wip-14421
rbd-mirror: Delete local image mirror when remote image mirroring is disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-22 16:14:18 -04:00
Ricardo Dias
d85e312ead rbd-mirror: test: added image-deleter test case when mirroring is disabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
9cb0b180bc rbd-mirror: Unregister clients from non-primary images journal
A non-primary image may have registered clients on its journal
(for instance a primary image that was later demoted). We must
unregister the clients when disabling image mirroring with the
force option.

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
ac9514941b rbd-mirror: test: Added unit test for testing image-deleter thread
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
e3677f115e rbd-mirror: test: Fixed test_PoolWatcher to support the new changes in PoolWatcher class
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
3c2615aa6d rbd-mirror: Replayer: bootstrap existing mirrored images
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:21 -04:00
Ricardo Dias
a6d698829d rbd-mirror: replayer: Added image-deleter thread to replayer
Fixes: http://tracker.ceph.com/issues/14421

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:20 -04:00
Ricardo Dias
011984d40b rbd-mirror: Added image-deleter thread to rbd-mirror
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:20 -04:00
Ricardo Dias
6cc6e663ed rbd-mirror: Added implementation of image-deleter thread
image-deleter thread will handle the deletion of local images that have
been disabled for mirroring by the primary site.

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-05-22 16:13:20 -04:00
Jason Dillaman
1ac39355fd Merge pull request #9179 from vshankar/rbd-min-commit-position
cls_journal: initialize empty commit position upon client register

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-22 15:45:11 -04:00
Jason Dillaman
2f48747cdd Merge pull request #7836 from yuyuyu101/wip-13938
TaskFinisher: use singleton SafeTimer and Finisher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-22 15:44:53 -04:00
Haomai Wang
39515b0f7c test_msgr: add verbose info for pending connections
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-05-22 23:53:05 +08:00
cxwshawn
d2dfe8b607 client: optimize header file dependency.
same work as https://github.com/ceph/ceph/pull/9247

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
2016-05-22 15:04:48 +08:00
xie xingguo
c855a7e6a7 os/filestore: standardize lock name for better tracing
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-22 14:39:47 +08:00
xie xingguo
9389462d4e os/filestore: simplify temp object collection check a little
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-22 14:38:36 +08:00
xie xingguo
3a28d01c4b osd/ReplicatedPG: don't cache_dont_need to false twice
The constructor will do it.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-22 14:38:36 +08:00
xie xingguo
10036d63f9 osd/PG: count "num_want_acting" and fill "have" in single round
This is good for performance under most cases.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-22 14:38:36 +08:00
xie xingguo
2fd28eab67 os/filestore: kill collection_version_current() method
This method is deprecated since hammer and not supported by bluestore,
and removing unnecessary code is always the preferred option.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-22 14:38:36 +08:00
xie xingguo
9ab21ae8fa os/filestore: add xattr config family to tracked key
So we can track these option change dynamically and react properly.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-22 14:38:36 +08:00
xie xingguo
c6567d7e27 os/filestore: make handle_conf_change() can handle xattr_value_* changing too
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-22 14:38:36 +08:00
John Spray
2c7dd5f222 mon: tolerate missing osd metadata
Just because one OSD's metadata is missing,
don't give up on outputting all the other
OSDs' metadata.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-05-21 22:38:15 +01:00
John Spray
5fe4fe4d92 mon: fix metadata dumps for empty lists
Because 'r' was set inside loop, these would
fail to set it (leaving ENOSYS) if no
metadata is present.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-05-21 22:38:08 +01:00
Michal Jarzabek
c5582ec6be osd/HitSet.h: add 'override' to virtual functions
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-21 22:26:01 +01:00
Sage Weil
4764b699d6 osdc/Objecter: move C_TwoContexts class to cc fileReviewed-by: Sage Weil <sage@redhat.com>
osdc/Objecter: move C_TwoContexts class to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
2016-05-21 16:29:39 -04:00
Michal Jarzabek
43af3432f5 osdc/Objecter: move C_TwoContexts class to cc file
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-05-21 15:48:18 +01:00
Kefu Chai
a78b9390de cmake: add ocf support
a new option is added: WITH_OCF. it is OFF by default.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-21 21:26:57 +08:00
chenxiaowei
4adf35d6fc global: optimize header file dependency.
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
2016-05-21 04:48:39 +01:00
Radoslaw Zarzynski
d6129e664f rgw: fix update of already existing account/bucket's custom attributes.
Introduced in: 3f3b18bff1.
Fixes: http://tracker.ceph.com/issues/15977
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-05-21 02:51:42 +02:00
Robin H. Johnson
7c7a465b55 rgw: fix manager selection when APIs customized
When modifying rgw_enable_apis per RGW instance, such as for staticsites, you
can end up with RESTManager instance being null in some cases, which returns a
HTTP 405 MethodNotAllowed to all requests.

Example configuration to trigger the bug:
rgw_enable_apis = s3website

Backport: jewel
X-Note: Patch from Yehuda in private IRC discussion, 2016/05/20.
Fixes: http://tracker.ceph.com/issues/15973
Fixes: http://tracker.ceph.com/issues/15974
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
2016-05-20 16:11:40 -07:00
Samuel Just
dc88e41062 Merge pull request #9241 from ceph/wip-fix-q-tests
common/: fix tests for prioritized_queue and wpq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-05-20 15:32:09 -07:00
Yehuda Sadeh
be22ac6540 Merge pull request #9102 from yehudasa/wip-rgw-leak-4
rgw: don't unregister request if request is not connected to manager

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-20 15:30:44 -07:00