Commit Graph

51683 Commits

Author SHA1 Message Date
Yehuda Sadeh
c3fcd83271 rgw: fetch_remote_obj() fix handling of ERR_NOT_MODIFIED
got broken when disabled opstate

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-24 15:10:26 -07:00
Yehuda Sadeh
103f4b8706 rgw: parse mtime only when header exists and not error
No need to try parsing mtime otherwise.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-24 15:10:26 -07:00
Yehuda Sadeh
7fe265754c rgw: fix lockdep false positive
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-24 15:10:25 -07:00
Josh Durgin
a2efc127ba Merge pull request #8297 from dillaman/wip-cls-rbd-mirror-image-list
cls_rbd: mirror_image_list should return global image id

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-24 09:28:16 -07:00
Orit Wasserman
dc337df49b Merge pull request #8253 from wido/issue-15119
rgw: Do not send a Content-Type on a '304 Not Modified' response

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-24 17:26:25 +01:00
Josh Durgin
20c86506ae Merge pull request #8224 from SUSE/wip-15212
rbdmap: add manpage

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-24 09:19:48 -07:00
Jason Dillaman
206cf5a56d cls_rbd: mirror_image_list should return global image id
The global image id is needed to crosslink images when an image is
replicated between multiple clusters.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-24 09:02:13 -04:00
Abhishek Lekshmanan
ccdb0d1b50 rgw:Use count fn in RGWUserBuckets for quota check
We already have a count function from RGWUserBuckets class which gives
the total size of the map, use that instead of getting the map and doing
a count.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-03-24 12:01:51 +01:00
Jenkins Build Slave User
96ae8bd25f 10.1.0 2016-03-24 10:53:48 +00:00
Alfredo Deza
4e3a43bc0d Merge pull request #8285 from dmick/jewel
debian/control: try installing virtualenv first, if it exists

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-03-24 06:45:16 -04:00
Venky Shankar
ec6f108df5 os/bluestore: ceph-bluefs-tool fixes
Couple of fixes:
- check vector size before using
- fix assert() failure after write_fd()

Fixes: #15261
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2016-03-24 15:52:02 +05:30
Jianpeng Ma
525a42b53c os/bluestore/BlueStore.cc: when do omapclear, it should clear omap_head.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-03-24 17:59:44 +08:00
Jianpeng Ma
53cd6420d3 osd/ReplicatedPG: when do omapclear, it clear FLAG_OMAP at the same time.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-03-24 17:58:31 +08:00
Jianpeng Ma
aeb8141c29 osd/ReplicatedPG: When do omapclear, it should check object whether is omap.
Though is_omap don't make sure object has omap header or k/v now, if
object isn't has FLAG_OMAP, it must don't have omap header or k/v.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-03-24 17:55:00 +08:00
Jianpeng Ma
98caba1d0b osd/ReplicatedPG: For omap read ops, it should check object wether has omap
For set omap heaader or k/v, it set FLAG_OMAP.  When remove header
or k/v, it don't remove FLAG_OMAP  because it don't  know object whether
have omap header or other k/vs.
Though object has FLAG_OMAP dont mean now it has omap header or k/v, it
better check FLAG_OMAP than pool whether support omap operations for omap reads.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-03-24 17:49:39 +08:00
xie xingguo
e29257e43d osd/pg: set dirty_info if we succeeding in updating log from master
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-24 16:27:28 +08:00
xie xingguo
15366b7022 osd/pg: set dirty_info if proc_master_log() dirties info
There are newly added branches for proc_master_log() method will
potentially dirty info but without setting dirty_info flag.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-24 16:27:16 +08:00
Kefu Chai
518c238fbf Merge pull request #8251 from majianpeng/vstart
vstart: make -k with optional mon_num.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-24 11:16:43 +08:00
Jianpeng Ma
81fa2ca34f vstart: make -k with optional mon_num.
Default mon_num=3, if we change this and using -k to create a new
cluster. It don't work. So we must record the old mon_num.
The same for osd_num/mds_num/rgw_num.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-03-24 17:40:42 +08:00
Josh Durgin
2de626ee98 Merge pull request #8288 from dmick/wip-default-virtualenv-path
Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-23 19:34:55 -07:00
xie xingguo
f45094f722 osd/pg: set dirty_info after we dirty history
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-03-24 10:32:51 +08:00
Dan Mick
5b3da26f54 Makefile-env.am: set a default for CEPH_BUILD_VIRTUALENV
We need to shorten the virtualenv path for non-Jenkins builds
too; gitbuilders were also overflowing the interpreter path limit

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-03-23 18:13:21 -07:00
Jason Dillaman
e8f56cf840 Merge pull request #8235 from trociny/wip-rbd-mirror-asok
rbd-mirror: asok commands to get status and flush on Mirror and Replayer level

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-23 20:47:01 -04:00
Dan Mick
fa05d802c6 debian/control: try installing virtualenv first, if it exists
Debian Jessie (at least) now has the virtualenv command in
package 'virtualenv', which depends on python3-virtualenv, and
that's how you get the virtualenv command there.  Earlier
Debian-based releases still use python-virtualenv.  Jessie's
virtualenv command still creates a python2 venv by default.

This will require a followup fix for install-deps.sh
to handle the | correctly, because currently it sends
the string to apt-get, which treats it as a regular expression
alternation of the two package names, so will try to install both.

The problem occurs when packages are installed without Recommended
packages (because jessie's virtualenv package currently Recommends
python-virtualenv); this is the case under pbuilder, and also using
'mk-build-deps --install', and I suspect under other automated
package-building tools.

Note that Build-Requires processing is not specified to
perform the searches in left-to-right order, so even this is
a tenuous workaround.  We probably need distro-specific
debian/ directories.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-03-23 17:38:12 -07:00
Jason Dillaman
35fe15aa17 Merge pull request #8280 from rjfd/wip-15238
rbd-mirror: switch fsid over to mirror uuid

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-23 20:34:17 -04:00
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