Commit Graph

51538 Commits

Author SHA1 Message Date
Nathan Cutler
65770059cb doc: amend Fixes instructions in SubmittingPatches
Since the "Fixes: #..." line is interpreted by GitHub as referring to a
pull request, yet the intention is for it to refer to the tracker issue,
change our instructions to use the full tracker issue URL.

Now that github pull request numbers are in the 8000s, there are cases when
a PR is wrongly closed by a "Fixes: #..." line in a commit message. See

https://github.com/ceph/ceph/pull/8286#event-603120191

for one such case.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-25 17:39:39 +01:00
Sage Weil
1ac8b5f972 Merge pull request #8038 from badone/wip-crushtool-crash
crushtool: Don't crash when called on a file that isn't a crushmap

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-25 11:22:43 -04:00
Kefu Chai
816c902ee5 Merge pull request #8309 from tchaikov/wip-15240
test/system/rados_list_parallel: print oid if rados_write fails

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-25 23:21:31 +08:00
Sage Weil
9f47a5b68e xxHash: fix submodule commit
This was inadvertantly rewinded in b9a14312ed

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-25 11:10:06 -04:00
Sage Weil
a431d04acb Merge pull request #8211 from liewegas/wip-jewel
doc: draft notes for jewel
2016-03-25 09:55:30 -04:00
Sage Weil
7a199ba536 Merge pull request #8156 from liewegas/wip-pg-query
osd/PG: indicate in pg query output whether ignore_history_les would help

Revewed-by: Samuel Just <sjust@redhat.com>
2016-03-25 09:52:35 -04:00
Sage Weil
badb37ddd7 Merge pull request #8177 from majianpeng/signal-handle
global/signal_handler: print thread name in signal handler

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-25 09:52:21 -04:00
Kefu Chai
71c41be3b1 test/system/rados_list_parallel: print oid if rados_write fails
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-25 21:43:24 +08:00
Sage Weil
0e1fb2aeef doc/release-notes: rgw typo
Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-25 09:41:12 -04:00
Orit Wasserman
e6cd78c8a4 Merge pull request #8294 from theanalyst/rgw/bucket-quota-check
rgw:Use count fn in RGWUserBuckets for quota check

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-03-25 13:50:44 +01:00
Greg Farnum
ee6f064521 Merge remote-tracking branch 'origin/wip-15065'
Support new standby_for_fscid option, letting us assign daemons to FS clusters.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-24 17:55:56 -07:00
Greg Farnum
f474c23d7c Merge branch 'wip-mfsmap-features' of git://github.com/jcsp/ceph
Clean up some code in the new multi-fs handling. Make its output
more precise and add some debug/repair config options.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Conflicts:
	src/mds/FSMap.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-03-24 17:50:43 -07:00
Gregory Farnum
74ed53b38f Merge pull request #7952 from ukernel/wip-14360
mds: allow client to request caps when opening file

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-24 17:49:22 -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
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
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
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
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
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
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