RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 22:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,572 Commits 1 Branch 394 Tags 1.4 GiB
cbec91d2d4
Commit Graph

51572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
cbec91d2d4 Merge pull request #8306 from tchaikov/wip-doc-formatting 
doc/rados/operations/crush: fix the formatting
 2016-03-25 16:28:42 -04:00
Sage Weil
91d233e840 Merge pull request #8202 from XinzeChi/wip-objecter-tid 
osdc/Objecter: dout log after assign tid

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-25 16:10:35 -04:00
Sage Weil
a0e5aa5c8a Merge remote-tracking branch 'gh/jewel' 2016-03-25 15:49:23 -04:00
Kefu Chai
e82dd05caa Merge pull request #8310 from tchaikov/wip-fix-rbdmap-manpage 
makefile: fix rbdmap manpage

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-26 01:23:41 +08:00
Kefu Chai
3b551e6db2 cmake: conditionally install man pages 
this matches its counterpart in automake
* install fuse related man pages only if HAVE_LIBFUSE
* install rbd related man pages only if WITH_RBD

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-26 00:03:19 +08:00
Kefu Chai
1287846c66 autotools: add rbdmap to dist_man_MANS 
this fixes the rpm/deb build failure
was introduced by 20c8650

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-25 23:53:52 +08: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
bc3dcd22bb Merge pull request #8044 from dzafman/wip-8885 
osd: fix dump_ops_in_flight races

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-03-25 09:53:56 -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
Kefu Chai
3e8bb4b19e doc/rados/operations/crush: fix the formatting 
unlike in LaTeX, we should use ``foo`` instead of ``bar'' in the
sphinx markdown for the double quote.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-25 15:53:13 +08: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
Gregory Farnum
0831e5944c Merge pull request #8180 from ukernel/jewel-15167 
Be more careful about directory fragmentation and scrubbing

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-24 17:44:53 -07:00
Gregory Farnum
1996f41846 Merge pull request #8115 from ukernel/jewel-cephfs-data-scan-misc 
Minor fixes around data scan in some scenarios

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-03-24 17:41:38 -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
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
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