RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-07 19:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,611 Commits 215 Branches 395 Tags 1.7 GiB
772ad242fa
Commit Graph

51611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
772ad242fa Merge pull request #8318 from tchaikov/wip-15240 
test/system/*: use dynamically generated pool name

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-27 10:01:14 -04:00
Kefu Chai
239f164a02 test/system/*: use dynamically generated pool name 
was using "foo" for the pool name. this works if we are performing
tests in serial. but if we do it in parallel, the tests interfere
with each other.

Fixes: #15240
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-27 21:21:55 +08:00
Sage Weil
77027813ed Merge pull request #7094 from songbaisen/wipdf 
mon: show the pool quota info on ceph df detail command

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-03-26 16:17:14 -04:00
Sage Weil
219995c45c Merge pull request #8275 from xiexingguo/xxg-wip-fixdirtyinfo 
osd: fix dirtying info without correctly setting drity_info field

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-26 16:16:26 -04:00
Sage Weil
c813fea92b Merge pull request #8230 from majianpeng/clear-omap 
osd: fix bugs for omap ops

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-26 16:16:09 -04:00
Sage Weil
77cec5daa9 Merge pull request #8254 from xiexingguo/xxg-wip-osd 
osd: fix reference count, rare race condition etc.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-26 16:14:02 -04:00
Sage Weil
c972d0cd42 Merge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge 
osd: more fixes for incorrectly dirtying info; resend reply for duplicated scrub-reserve req

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-26 16:13:42 -04:00
Sage Weil
fca1c707d0 Merge pull request #8247 from liewegas/wip-split-creates 
mon: do not send useless pg_create messages for split pgs

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-26 16:12:29 -04:00
Sage Weil
63c00cb305 Merge pull request #8208 from liewegas/wip-15027 
mon: mark_down_pgs in lockstep with pg_map's osdmap epoch

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-26 16:11:41 -04:00
Sage Weil
1cbe2bd9d4 ceph_test_rados_api_misc: debug LibRadosMiscConnectFailure.ConnectFailure 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-26 09:47:51 -04:00
Sage Weil
67a61962db Merge pull request #8265 from athanatos/wip-journal-default 
config_opts: disable filestore throttle soft backoff by default
 2016-03-25 21:21:36 -04:00
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
xie xingguo
294cab1171 osd/pg: publish stats to osd if pg is currently marked as down 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-03-25 22:14:24 +08:00
xie xingguo
c0ceb8b7a6 osd/pg: publish stats to osd if we recovered from degraded 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-03-25 22:14:23 +08:00
xie xingguo
c6a4f34940 osd/pg: avoid publishing pg_stat twice in a short interval 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-03-25 22:14:21 +08:00
xie xingguo
be3ebd8fe5 osd/pg: fold sanity check into one single "if" qualification 
Just as "boost::statechart::result
PG::RecoveryState::WaitRemoteBackfillReserved::react(const RemoteBackfillReserved &evt)"
does.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-03-25 22:14:20 +08:00
xie xingguo
81d692922b osd/pg: drop unnecessary update_heartbeat_peers() 
The proc_replica_info() method will do the same job in a
smarter way, so the succeeding call to update_heartbeat_peers()
is unnecessary and cost expensive.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-03-25 22:14:19 +08: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
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