]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoscript: subscription-manager support (part 3) 8334/head
Loic Dachary [Mon, 28 Mar 2016 14:33:56 +0000 (16:33 +0200)]
script: subscription-manager support (part 3)

Renaming subman.py in subman is cute but does not prevent the generation
of the py[co].

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #8308 from wido/cloudstack-docs
Sage Weil [Mon, 28 Mar 2016 12:28:45 +0000 (08:28 -0400)]
Merge pull request #8308 from wido/cloudstack-docs

doc: Updated CloudStack RBD documentation

9 years agoMerge pull request #8327 from vumrao/wip-vumrao-15288
Sage Weil [Mon, 28 Mar 2016 12:23:58 +0000 (08:23 -0400)]
Merge pull request #8327 from vumrao/wip-vumrao-15288

doc: Remove Ceph Monitors do lots of fsync()

9 years agoMerge pull request #8328 from scienceluo/master
Sage Weil [Mon, 28 Mar 2016 12:23:10 +0000 (08:23 -0400)]
Merge pull request #8328 from scienceluo/master

doc: Fixes headline different font size and type

9 years agoMerge pull request #8293 from dachary/wip-subman-facts
Sage Weil [Mon, 28 Mar 2016 12:15:59 +0000 (08:15 -0400)]
Merge pull request #8293 from dachary/wip-subman-facts

script: subscription-manager support (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: Remove Ceph Monitors do lots of fsync() 8327/head
Vikhyat Umrao [Mon, 28 Mar 2016 07:27:04 +0000 (12:57 +0530)]
doc: Remove Ceph Monitors do lots of fsync()
     and change the ligature of "fl" to "f" and "l"

Fixes: #15288
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
9 years agoFixes headline different font size and type 8326/head 8328/head
scienceluo [Mon, 28 Mar 2016 06:10:28 +0000 (14:10 +0800)]
Fixes headline different font size and type

9 years agoMerge pull request #8299 from liewegas/wip-15230
Sage Weil [Sun, 27 Mar 2016 14:02:26 +0000 (10:02 -0400)]
Merge pull request #8299 from liewegas/wip-15230

messages/MOSDOp: clear reqid inc for v6 encoding

9 years agoMerge pull request #8318 from tchaikov/wip-15240
Sage Weil [Sun, 27 Mar 2016 14:01:14 +0000 (10:01 -0400)]
Merge pull request #8318 from tchaikov/wip-15240

test/system/*: use dynamically generated pool name

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotest/system/*: use dynamically generated pool name 8318/head
Kefu Chai [Sun, 27 Mar 2016 13:21:54 +0000 (21:21 +0800)]
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>
9 years agoMerge pull request #7094 from songbaisen/wipdf
Sage Weil [Sat, 26 Mar 2016 20:17:14 +0000 (16:17 -0400)]
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>
9 years agoMerge pull request #8275 from xiexingguo/xxg-wip-fixdirtyinfo
Sage Weil [Sat, 26 Mar 2016 20:16:26 +0000 (16:16 -0400)]
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>
9 years agoMerge pull request #8230 from majianpeng/clear-omap
Sage Weil [Sat, 26 Mar 2016 20:16:09 +0000 (16:16 -0400)]
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>
9 years agoMerge pull request #8254 from xiexingguo/xxg-wip-osd
Sage Weil [Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)]
Merge pull request #8254 from xiexingguo/xxg-wip-osd

osd: fix reference count, rare race condition etc.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8291 from xiexingguo/xxg-wip-fixhistorymerge
Sage Weil [Sat, 26 Mar 2016 20:13:42 +0000 (16:13 -0400)]
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>
9 years agoMerge pull request #8247 from liewegas/wip-split-creates
Sage Weil [Sat, 26 Mar 2016 20:12:29 +0000 (16:12 -0400)]
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>
9 years agoMerge pull request #8208 from liewegas/wip-15027
Sage Weil [Sat, 26 Mar 2016 20:11:41 +0000 (16:11 -0400)]
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>
9 years agoscript: subscription-manager support (part 2) 8293/head
Loic Dachary [Thu, 24 Mar 2016 10:59:33 +0000 (11:59 +0100)]
script: subscription-manager support (part 2)

Strip the .py suffix so that no pyc / pyo files are generated.
Do not install on CentOS.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoceph_test_rados_api_misc: debug LibRadosMiscConnectFailure.ConnectFailure
Sage Weil [Sat, 26 Mar 2016 13:47:51 +0000 (09:47 -0400)]
ceph_test_rados_api_misc: debug LibRadosMiscConnectFailure.ConnectFailure

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agomessages/MOSDOp: clear reqid inc for v6 encoding 8299/head
Sage Weil [Sat, 26 Mar 2016 01:56:01 +0000 (21:56 -0400)]
messages/MOSDOp: clear reqid inc for v6 encoding

For the new v7 encoding, we put the client incarnation in the
reqid so that we can have it at the beginning of the encoding.
However, we do *not* want to do this for the v6 encoding, as that
version of get_reqid() will return reqid if it is not ==
osd_reqid_t().

Fixes: #15230
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8265 from athanatos/wip-journal-default
Sage Weil [Sat, 26 Mar 2016 01:21:36 +0000 (21:21 -0400)]
Merge pull request #8265 from athanatos/wip-journal-default

config_opts: disable filestore throttle soft backoff by default

9 years agoMerge pull request #8306 from tchaikov/wip-doc-formatting
Sage Weil [Fri, 25 Mar 2016 20:28:42 +0000 (16:28 -0400)]
Merge pull request #8306 from tchaikov/wip-doc-formatting

doc/rados/operations/crush: fix the formatting

9 years agoMerge pull request #8202 from XinzeChi/wip-objecter-tid
Sage Weil [Fri, 25 Mar 2016 20:10:35 +0000 (16:10 -0400)]
Merge pull request #8202 from XinzeChi/wip-objecter-tid

osdc/Objecter: dout log after assign tid

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Fri, 25 Mar 2016 19:49:23 +0000 (15:49 -0400)]
Merge remote-tracking branch 'gh/jewel'

9 years agoMerge pull request #8310 from tchaikov/wip-fix-rbdmap-manpage
Kefu Chai [Fri, 25 Mar 2016 17:23:41 +0000 (01:23 +0800)]
Merge pull request #8310 from tchaikov/wip-fix-rbdmap-manpage

makefile: fix rbdmap manpage

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agocmake: conditionally install man pages 8310/head
Kefu Chai [Fri, 25 Mar 2016 15:46:25 +0000 (23:46 +0800)]
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>
9 years agoautotools: add rbdmap to dist_man_MANS
Kefu Chai [Fri, 25 Mar 2016 15:38:48 +0000 (23:38 +0800)]
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>
9 years agoMerge pull request #8038 from badone/wip-crushtool-crash
Sage Weil [Fri, 25 Mar 2016 15:22:43 +0000 (11:22 -0400)]
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>
9 years agoMerge pull request #8309 from tchaikov/wip-15240
Kefu Chai [Fri, 25 Mar 2016 15:21:31 +0000 (23:21 +0800)]
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>
9 years agoxxHash: fix submodule commit
Sage Weil [Fri, 25 Mar 2016 15:10:06 +0000 (11:10 -0400)]
xxHash: fix submodule commit

This was inadvertantly rewinded in b9a14312edd6a4edb0f4783ab08ad97e0e9ba03f

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/pg: publish stats to osd if pg is currently marked as down 8291/head
xie xingguo [Fri, 25 Mar 2016 03:25:53 +0000 (11:25 +0800)]
osd/pg: publish stats to osd if pg is currently marked as down

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd/pg: publish stats to osd if we recovered from degraded
xie xingguo [Fri, 25 Mar 2016 03:04:42 +0000 (11:04 +0800)]
osd/pg: publish stats to osd if we recovered from degraded

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd/pg: avoid publishing pg_stat twice in a short interval
xie xingguo [Fri, 25 Mar 2016 02:56:46 +0000 (10:56 +0800)]
osd/pg: avoid publishing pg_stat twice in a short interval

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd/pg: fold sanity check into one single "if" qualification
xie xingguo [Fri, 25 Mar 2016 02:09:29 +0000 (10:09 +0800)]
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>
9 years agoosd/pg: drop unnecessary update_heartbeat_peers()
xie xingguo [Thu, 24 Mar 2016 12:01:16 +0000 (20:01 +0800)]
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>
9 years agoMerge pull request #8211 from liewegas/wip-jewel
Sage Weil [Fri, 25 Mar 2016 13:55:30 +0000 (09:55 -0400)]
Merge pull request #8211 from liewegas/wip-jewel

doc: draft notes for jewel

9 years agoMerge pull request #8044 from dzafman/wip-8885
Sage Weil [Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)]
Merge pull request #8044 from dzafman/wip-8885

osd: fix dump_ops_in_flight races

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #8156 from liewegas/wip-pg-query
Sage Weil [Fri, 25 Mar 2016 13:52:35 +0000 (09:52 -0400)]
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>
9 years agoMerge pull request #8177 from majianpeng/signal-handle
Sage Weil [Fri, 25 Mar 2016 13:52:21 +0000 (09:52 -0400)]
Merge pull request #8177 from majianpeng/signal-handle

global/signal_handler: print thread name in signal handler

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agotest/system/rados_list_parallel: print oid if rados_write fails 8309/head
Kefu Chai [Fri, 25 Mar 2016 13:43:24 +0000 (21:43 +0800)]
test/system/rados_list_parallel: print oid if rados_write fails

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodoc/release-notes: rgw typo 8211/head
Sage Weil [Fri, 25 Mar 2016 13:41:12 +0000 (09:41 -0400)]
doc/release-notes: rgw typo

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8294 from theanalyst/rgw/bucket-quota-check
Orit Wasserman [Fri, 25 Mar 2016 12:50:44 +0000 (13:50 +0100)]
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>
9 years agodoc: Updated CloudStack RBD documentation 8308/head
Wido den Hollander [Fri, 25 Mar 2016 11:06:24 +0000 (12:06 +0100)]
doc: Updated CloudStack RBD documentation

Signed-off-by: Wido den Hollander <wido@42on.com>
9 years agodoc/rados/operations/crush: fix the formatting 8306/head
Kefu Chai [Fri, 25 Mar 2016 07:53:11 +0000 (15:53 +0800)]
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>
9 years agoMerge remote-tracking branch 'origin/wip-15065'
Greg Farnum [Fri, 25 Mar 2016 00:55:56 +0000 (17:55 -0700)]
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>
9 years agoMerge branch 'wip-mfsmap-features' of git://github.com/jcsp/ceph
Greg Farnum [Fri, 25 Mar 2016 00:50:43 +0000 (17:50 -0700)]
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>
9 years agoMerge pull request #7952 from ukernel/wip-14360
Gregory Farnum [Fri, 25 Mar 2016 00:49:22 +0000 (17:49 -0700)]
Merge pull request #7952 from ukernel/wip-14360

mds: allow client to request caps when opening file

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #8180 from ukernel/jewel-15167
Gregory Farnum [Fri, 25 Mar 2016 00:44:53 +0000 (17:44 -0700)]
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>
9 years agoMerge pull request #8115 from ukernel/jewel-cephfs-data-scan-misc
Gregory Farnum [Fri, 25 Mar 2016 00:41:38 +0000 (17:41 -0700)]
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>
9 years agoMerge pull request #8297 from dillaman/wip-cls-rbd-mirror-image-list
Josh Durgin [Thu, 24 Mar 2016 16:28:16 +0000 (09:28 -0700)]
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>
9 years agoMerge pull request #8253 from wido/issue-15119
Orit Wasserman [Thu, 24 Mar 2016 16:26:25 +0000 (17:26 +0100)]
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>
9 years agoMerge pull request #8224 from SUSE/wip-15212
Josh Durgin [Thu, 24 Mar 2016 16:19:48 +0000 (09:19 -0700)]
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>
9 years agocls_rbd: mirror_image_list should return global image id 8297/head
Jason Dillaman [Thu, 24 Mar 2016 12:46:54 +0000 (08:46 -0400)]
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>
9 years agorgw:Use count fn in RGWUserBuckets for quota check 8294/head
Abhishek Lekshmanan [Thu, 24 Mar 2016 11:01:51 +0000 (12:01 +0100)]
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>
9 years ago10.1.0 v10.1.0
Jenkins Build Slave User [Thu, 24 Mar 2016 10:53:48 +0000 (10:53 +0000)]
10.1.0

9 years agoMerge pull request #8285 from dmick/jewel
Alfredo Deza [Thu, 24 Mar 2016 10:45:16 +0000 (06:45 -0400)]
Merge pull request #8285 from dmick/jewel

debian/control: try installing virtualenv first, if it exists

Reviewed-by: Alfredo Deza <adeza@redhat.com>
9 years agoos/bluestore/BlueStore.cc: when do omapclear, it should clear omap_head. 8230/head
Jianpeng Ma [Mon, 21 Mar 2016 12:19:52 +0000 (20:19 +0800)]
os/bluestore/BlueStore.cc: when do omapclear, it should clear omap_head.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd/ReplicatedPG: when do omapclear, it clear FLAG_OMAP at the same time.
Jianpeng Ma [Thu, 24 Mar 2016 09:58:31 +0000 (17:58 +0800)]
osd/ReplicatedPG: when do omapclear, it clear FLAG_OMAP  at the same time.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoosd/ReplicatedPG: When do omapclear, it should check object whether is omap.
Jianpeng Ma [Thu, 24 Mar 2016 09:55:00 +0000 (17:55 +0800)]
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>
9 years agoosd/ReplicatedPG: For omap read ops, it should check object wether has omap
Jianpeng Ma [Thu, 24 Mar 2016 09:49:39 +0000 (17:49 +0800)]
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>
9 years agoosd/pg: set dirty_info if we succeeding in updating log from master
xie xingguo [Thu, 24 Mar 2016 08:25:57 +0000 (16:25 +0800)]
osd/pg: set dirty_info if we succeeding in updating log from master

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoosd/pg: set dirty_info if proc_master_log() dirties info
xie xingguo [Thu, 24 Mar 2016 08:17:57 +0000 (16:17 +0800)]
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>
9 years agoMerge pull request #8251 from majianpeng/vstart
Kefu Chai [Thu, 24 Mar 2016 03:16:43 +0000 (11:16 +0800)]
Merge pull request #8251 from majianpeng/vstart

vstart: make -k with optional mon_num.

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agovstart: make -k with optional mon_num. 8251/head
Jianpeng Ma [Thu, 24 Mar 2016 09:36:42 +0000 (17:36 +0800)]
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>
9 years agoMerge pull request #8288 from dmick/wip-default-virtualenv-path
Josh Durgin [Thu, 24 Mar 2016 02:34:55 +0000 (19:34 -0700)]
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>
9 years agoosd/pg: set dirty_info after we dirty history 8275/head
xie xingguo [Thu, 24 Mar 2016 02:32:51 +0000 (10:32 +0800)]
osd/pg: set dirty_info after we dirty history

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMakefile-env.am: set a default for CEPH_BUILD_VIRTUALENV 8288/head
Dan Mick [Thu, 24 Mar 2016 01:13:21 +0000 (18:13 -0700)]
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>
9 years agoMerge pull request #8235 from trociny/wip-rbd-mirror-asok
Jason Dillaman [Thu, 24 Mar 2016 00:47:01 +0000 (20:47 -0400)]
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>
9 years agodebian/control: try installing virtualenv first, if it exists 8285/head
Dan Mick [Wed, 23 Mar 2016 22:47:10 +0000 (15:47 -0700)]
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>
9 years agoMerge pull request #8280 from rjfd/wip-15238
Jason Dillaman [Thu, 24 Mar 2016 00:34:17 +0000 (20:34 -0400)]
Merge pull request #8280 from rjfd/wip-15238

rbd-mirror: switch fsid over to mirror uuid

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7976 from ukernel/jewel-15008
Gregory Farnum [Thu, 24 Mar 2016 00:08:49 +0000 (17:08 -0700)]
Merge pull request #7976 from ukernel/jewel-15008

Jewel 15008

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7902 from jcsp/wip-pycephfs-flock
Gregory Farnum [Thu, 24 Mar 2016 00:06:15 +0000 (17:06 -0700)]
Merge pull request #7902 from jcsp/wip-pycephfs-flock

pybind: add flock to libcephfs python bindings

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #7901 from jcsp/wip-pycephfs-fixes
Gregory Farnum [Thu, 24 Mar 2016 00:05:22 +0000 (17:05 -0700)]
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>
9 years agoMerge pull request #8271 from vumrao/wip-vumrao-15244
Yehuda Sadeh [Wed, 23 Mar 2016 22:33:47 +0000 (15:33 -0700)]
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>
9 years agoMerge pull request #8184 from theanalyst/fix/rgw-admin-zone-msg
Yehuda Sadeh [Wed, 23 Mar 2016 22:29:18 +0000 (15:29 -0700)]
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>
9 years agoMerge pull request #8264 from cbodley/wip-rgw-admin-errors
Yehuda Sadeh [Wed, 23 Mar 2016 22:28:17 +0000 (15:28 -0700)]
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>
9 years agoMerge pull request #8190 from yehudasa/wip-rgw-sync-fixes-4
Yehuda Sadeh [Wed, 23 Mar 2016 22:23:16 +0000 (15:23 -0700)]
Merge pull request #8190 from yehudasa/wip-rgw-sync-fixes-4

Wip rgw sync fixes 4

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorbd: rbd-mirroring: Replayer registers in remote journal with mirror_uuid 8280/head
Ricardo Dias [Wed, 23 Mar 2016 17:06:46 +0000 (17:06 +0000)]
rbd: rbd-mirroring: Replayer registers in remote journal with mirror_uuid

Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15238
9 years agoMerge pull request #8282 from dillaman/wip-15250
Josh Durgin [Wed, 23 Mar 2016 21:14:30 +0000 (14:14 -0700)]
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>
9 years agoMerge pull request #7907 from dachary/wip-subman-facts
Sage Weil [Wed, 23 Mar 2016 21:05:47 +0000 (17:05 -0400)]
Merge pull request #7907 from dachary/wip-subman-facts

script: subscription-manager support

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #8022 from roidayan/fix_compile_against_latest_accelio
Casey Bodley [Wed, 23 Mar 2016 20:32:55 +0000 (16:32 -0400)]
Merge pull request #8022 from roidayan/fix_compile_against_latest_accelio

xio: fix compilation against latest accelio

9 years agorbd: allow librados to prune the command-line for config overrides 8282/head
Jason Dillaman [Wed, 23 Mar 2016 19:34:17 +0000 (15:34 -0400)]
rbd: allow librados to prune the command-line for config overrides

Fixes: #15250
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8279 from dachary/wip-virtualenv-jessie
Alfredo Deza [Wed, 23 Mar 2016 19:17:20 +0000 (15:17 -0400)]
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>
9 years agobuild/ops: in jessie virtualenv is in package virtualenv 8279/head
Loic Dachary [Wed, 23 Mar 2016 16:56:37 +0000 (17:56 +0100)]
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>
9 years agotest/rgw: use bucket for data checkpoint instead of data 8190/head
Yehuda Sadeh [Mon, 21 Mar 2016 23:52:14 +0000 (16:52 -0700)]
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>
9 years agorgw: data sync, update and flush high marker
Yehuda Sadeh [Mon, 21 Mar 2016 23:50:32 +0000 (16:50 -0700)]
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>
9 years agorgw: update data log even if canceling index operation
Yehuda Sadeh [Mon, 21 Mar 2016 23:49:20 +0000 (16:49 -0700)]
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>
9 years agorgw: break out of run_sync() if going down
Yehuda Sadeh [Mon, 21 Mar 2016 23:48:01 +0000 (16:48 -0700)]
rgw: break out of run_sync() if going down

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fix bucket_instance_meta_info mtime json decoding
Yehuda Sadeh [Fri, 18 Mar 2016 22:49:20 +0000 (15:49 -0700)]
rgw: fix bucket_instance_meta_info mtime json decoding

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8277 from SUSE/wip-15246
Sage Weil [Wed, 23 Mar 2016 16:55:38 +0000 (12:55 -0400)]
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>
9 years agoMerge pull request #8222 from SUSE/wip-14984
Sage Weil [Wed, 23 Mar 2016 16:33:39 +0000 (12:33 -0400)]
Merge pull request #8222 from SUSE/wip-14984

systemd: set up environment in rbdmap unit file

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoxio: fix compilation against latest accelio 8022/head
Roi Dayan [Sun, 14 Feb 2016 09:45:22 +0000 (11:45 +0200)]
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>
9 years agoMerge pull request #8268 from yehudasa/wip-15243
Yehuda Sadeh [Wed, 23 Mar 2016 16:26:00 +0000 (09:26 -0700)]
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>
9 years agoMerge pull request #8148 from roidayan/xio-add_prefix_to_xio_logs
Casey Bodley [Wed, 23 Mar 2016 16:21:52 +0000 (12:21 -0400)]
Merge pull request #8148 from roidayan/xio-add_prefix_to_xio_logs

xio: add prefix to xio msgr logs

9 years agoMerge pull request #8227 from roidayan/xio-call_xio_init_first
Casey Bodley [Wed, 23 Mar 2016 16:21:09 +0000 (12:21 -0400)]
Merge pull request #8227 from roidayan/xio-call_xio_init_first

xio: xio_init needs to be called before any other xio function

9 years agoMerge pull request #8207 from theanalyst/doc/mstart
Sage Weil [Wed, 23 Mar 2016 16:17:53 +0000 (12:17 -0400)]
Merge pull request #8207 from theanalyst/doc/mstart

doc: very basic doc on mstart

9 years agomon/PGMonitor: do not send pg_creates for split PGs 8247/head
Sage Weil [Tue, 22 Mar 2016 15:44:07 +0000 (11:44 -0400)]
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>
9 years agomon/PGMonitor: minor optimization in send_pg_creates
Sage Weil [Tue, 22 Mar 2016 15:44:35 +0000 (11:44 -0400)]
mon/PGMonitor: minor optimization in send_pg_creates

Avoid repeated hash lookup.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8237 from oritwas/wip-rgw-fix-mrun
Casey Bodley [Wed, 23 Mar 2016 15:35:23 +0000 (11:35 -0400)]
Merge pull request #8237 from oritwas/wip-rgw-fix-mrun

cmake: fix mrun to handle cmake build structure

9 years agorgw: convert plain object to versioned (with null version) when removing 8268/head
Yehuda Sadeh [Wed, 23 Mar 2016 01:14:57 +0000 (18:14 -0700)]
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>