Commit Graph

51818 Commits

Author SHA1 Message Date
Gregory Farnum
698910f900 Merge pull request #7976 from ukernel/jewel-15008
Jewel 15008

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-23 17:08:49 -07:00
Gregory Farnum
c936bb22c5 Merge pull request #7902 from jcsp/wip-pycephfs-flock
pybind: add flock to libcephfs python bindings

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-03-23 17:06:15 -07:00
Gregory Farnum
6bbc6b50bb Merge pull request #7901 from jcsp/wip-pycephfs-fixes
libcephfs: fix python tests and fix getcwd on missing dir

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-03-23 17:05:22 -07:00
Yehuda Sadeh
1b12901014 Merge pull request #8271 from vumrao/wip-vumrao-15244
doc: rgw_region_root_pool option should be in [global]

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 15:33:47 -07:00
Yehuda Sadeh
daa18c84f0 Merge pull request #8184 from theanalyst/fix/rgw-admin-zone-msg
rgw: add zone delete to rgw-admin help

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 15:29:18 -07:00
Yehuda Sadeh
21a9ebc9e0 Merge pull request #8264 from cbodley/wip-rgw-admin-errors
radosgw-admin: 'period commit' supplies user-readable error messages

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 15:28:17 -07:00
Yehuda Sadeh
f2f26465d7 Merge pull request #8190 from yehudasa/wip-rgw-sync-fixes-4
Wip rgw sync fixes 4

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-03-23 15:23:16 -07:00
Ricardo Dias
4f74856f65 rbd: rbd-mirroring: Replayer registers in remote journal with mirror_uuid
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15238
2016-03-23 22:12:37 +00:00
Josh Durgin
70a3cada6d Merge pull request #8282 from dillaman/wip-15250
rbd: allow librados to prune the command-line for config overrides

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-23 14:14:30 -07:00
Sage Weil
f9b079e0af Merge pull request #7907 from dachary/wip-subman-facts
script: subscription-manager support

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-23 17:05:47 -04:00
Casey Bodley
72c5736ac0 Merge pull request #8022 from roidayan/fix_compile_against_latest_accelio
xio: fix compilation against latest accelio
2016-03-23 16:32:55 -04:00
Jason Dillaman
9872dcc7e7 rbd: allow librados to prune the command-line for config overrides
Fixes: #15250

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-23 15:34:17 -04:00
Alfredo Deza
a21cc14a52 Merge pull request #8279 from dachary/wip-virtualenv-jessie
build/ops: in jessie virtualenv is in package virtualenv

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-03-23 15:17:20 -04:00
Loic Dachary
eb583cbbbf build/ops: in jessie virtualenv is in package virtualenv
The python scripts are not yet compatible with python3, yet it is the
default on jessie. Force the creation of the virtualenv to use python2.7
instead. The wheelhouse is already explicitly populated for both python3
and python2.7 by install-deps.sh, regardless of the default interpreter.

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-23 19:56:11 +01:00
Yehuda Sadeh
cbc9d42706 test/rgw: use bucket for data checkpoint instead of data
data checkpoint is not accurate, as data log might not show repeating changes.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 10:35:28 -07:00
Yehuda Sadeh
d615eafbe2 rgw: data sync, update and flush high marker
We need to update the high marker even if we skip entries, and eventually
flush it. This is needed so that our position in the bucket index log that
we follow is reflected correctly.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 10:35:28 -07:00
Yehuda Sadeh
9bd7bd8899 rgw: update data log even if canceling index operation
Need to update the data log anyway, so that it reflects that there were
changes in the bucket index log.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 10:35:28 -07:00
Yehuda Sadeh
8cb14783e4 rgw: break out of run_sync() if going down
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 10:35:28 -07:00
Yehuda Sadeh
09d3cc7ba5 rgw: fix bucket_instance_meta_info mtime json decoding
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 10:35:28 -07:00
Sage Weil
1aa2fe6ca2 Merge pull request #8277 from SUSE/wip-15246
rpm: prefer UID/GID 167 when creating ceph user/group

Reviewed-by: David Disseldorp ddiss@suse.de
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-23 12:55:38 -04:00
Sage Weil
df6570c2bd Merge pull request #8222 from SUSE/wip-14984
systemd: set up environment in rbdmap unit file

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-23 12:33:39 -04:00
Roi Dayan
f1743dbb0b xio: fix compilation against latest accelio
Do not use C struct initilization style to avoid eclipse errors.
We also don't use c++ struct initalize as members are not specified
and it just happens that in latest accelio version one of the fields
has changed in the middle of the struct.

Signed-off-by: Roi Dayan <roid@mellanox.com>
2016-03-23 18:30:53 +02:00
Yehuda Sadeh
baa9883039 Merge pull request #8268 from yehudasa/wip-15243
rgw: convert plain object to versioned (with null version) when removing

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-23 09:26:00 -07:00
Casey Bodley
1bccc8a5ab Merge pull request #8148 from roidayan/xio-add_prefix_to_xio_logs
xio: add prefix to xio msgr logs
2016-03-23 12:21:52 -04:00
Casey Bodley
e1c0217b77 Merge pull request #8227 from roidayan/xio-call_xio_init_first
xio: xio_init needs to be called before any other xio function
2016-03-23 12:21:09 -04:00
Sage Weil
a09da43201 Merge pull request #8207 from theanalyst/doc/mstart
doc: very basic doc on mstart
2016-03-23 12:17:53 -04:00
Sage Weil
9c616d269a mon/PGMonitor: do not send pg_creates for split PGs
They will split from the parent on their own, and the OSD drops these
PGs on the floor anyway in OSD::handle_pg_create().

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-23 11:41:29 -04:00
Sage Weil
369d54f413 mon/PGMonitor: minor optimization in send_pg_creates
Avoid repeated hash lookup.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-23 11:41:29 -04:00
Casey Bodley
01f50d4af2 Merge pull request #8237 from oritwas/wip-rgw-fix-mrun
cmake: fix mrun to handle cmake build structure
2016-03-23 11:35:23 -04:00
Yehuda Sadeh
c6334d430b rgw: convert plain object to versioned (with null version) when removing
Fixes #15243

When removing a plain null versioned object (was created prior to bucket versioning
enabled), need to convert the bucket index representation to a versioned one. This
is needed so that all the versioning mechanics play together.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-23 08:26:58 -07:00
Casey Bodley
087de861a9 radosgw-admin: add explanation for EACCESS on 'realm pull'
References #15200

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-03-23 11:25:21 -04:00
Casey Bodley
d951ee5f5b rgw: 'period commit' supplies user-readable error messages
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-03-23 11:25:21 -04:00
Casey Bodley
292d8967d4 radosgw-admin: parse error messages from failed requests
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-03-23 11:25:21 -04:00
Nathan Cutler
d01d983ad4 packaging: rbdmap manpage
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-23 15:05:16 +01:00
Kefu Chai
71cfaf244e Merge pull request #8273 from wjin/fix
osd: fix log info

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-23 21:43:11 +08:00
Nathan Cutler
c2909465f8 RPM: prefer UID/GID 167 when creating ceph user/group
This change affects openSUSE/SLE only.

http://tracker.ceph.com/issues/15246 Fixes: #15246

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-23 14:38:14 +01:00
Xinze Chi
d19b91bea7 Objecter: dout log after assign tid
This would help to debug

Signed-off-by: Xinze Chi <xinze@xsky.com>
2016-03-23 21:25:54 +08:00
Kefu Chai
41def3a04b Merge pull request #8260 from liewegas/wip-ec-test
test/test-erasure-code.sh: disable pg_temp priming

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-23 21:22:44 +08:00
Alfredo Deza
3777e1b1d4 Merge pull request #8276 from dachary/wip-virtualenv-jewel
python: avoid long paths (part 2)

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-03-23 08:50:25 -04:00
Loic Dachary
c540835cf3 python: avoid long paths (part 2)
make CEPH_BUILD_VIRTUALENV=/tmp TESTS=ceph-detect-init/run-tox.sh check

sets the CEPH_DETECT_INIT_VIRTUALENV environment variable

CEPH_BUILD_VIRTUALENV=/tmp make TESTS=ceph-detect-init/run-tox.sh check

does not because Makefile-env.am overrides it.

Do not set CEPH_BUILD_VIRTUALENV in Makefile-env.am so the variable from
the environment can be used. Require that CEPH_BUILD_VIRTUALENV has a
trailing slash so that the default is just an empty variable.

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-23 13:31:51 +01:00
Vikhyat Umrao
418d9bebda doc: rgw_region_root_pool option should be in [global]
add new option rgw_zonegroup_root_pool from Jewel.

Fixes: #15244

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
2016-03-23 17:34:13 +05:30
Vitja Makarov
d2e281d2be rgw: S3: set EncodingType in ListBucketResult
Signed-off-by: Victor Makarov <vitja.makarov@gmail.com>
2016-03-23 14:56:28 +03:00
Xiaoxi Chen
c804416d78 osd/OSD.cc: finish full_map_request every MOSDMap message.
We remember the range of requested full map in requested_full_first/last
and prevent sending duplicate requests.

But monitor will cap the reply to osd_map_message_max number of maps, for example,
OSD request [100, 200] while monitor only return [100,149], previous code think
[150, 200] is dup and prevent the OSD to send out the request, which is wrong.

Fix this by clear the requested_full_first/last field at the end of handle_osd_map.

Fixes: #15130

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
2016-03-23 02:03:15 -07:00
xie xingguo
f2a752d9f2 osd/pg: reset handle during add_batch_sources_info()
So if needs_recovery_map gets too big, we don't starve
serving thread during peering.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-23 16:50:43 +08:00
xie xingguo
bb7ebe93bf osd/pg: add an option to cap loop before we reset tp handle
So we don't try to reset handle on every loop and this shall
save CPU a little bit.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-23 16:44:10 +08:00
Wei Jin
ac17e66766 osd: fix log info
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
2016-03-23 16:13:11 +08:00
xie xingguo
757f8a09a2 osd/pg: kill _report_snap_collection_errors() method
Which is never used by anyone.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-23 16:11:17 +08:00
xie xingguo
27b5d785b9 osd/pg: fix dirtying info without correctly setting dirty_info field
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-23 16:00:56 +08:00
xie xingguo
03c5a93022 osd: fix rare race for pg relevant events
Theoretically even if _have_pg() returns ture, we still can't assert that
_lookup_lock_pg() will always succeed. This is because when we switch between
these two methods, we will drop pg_map_lock, and thus may let a pg removal
sneak in, which may eventually cause divergence.

However this is a really rare case, and is less likely to happen in a
production environment. But this pr provided a safer way to achieve
the same goal and is a little faster by eliminating a duplicated search
from the pg_map, which makes it meaningful.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-23 08:43:24 +08:00
xie xingguo
6ed9c3fe0b osd: drop duplicated put of message
On returning false, the require_mon_peer() will internally decrease
the reference of the input message.

So the put() method here is duplicated and will cause reference
underflow and thus need to be dropped.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-23 08:43:24 +08:00