Commit Graph

77941 Commits

Author SHA1 Message Date
Sage Weil
e4ce4695f2 Merge pull request #17352 from liewegas/wip-21171
os/bluestore: drop deferred_submit_lock, fix aio leak

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
2017-09-08 07:16:40 -05:00
Jos Collin
fa0a832ee6 Merge pull request #17593 from shashalu/fix-clean-up-apply_epoch
rgw: drop unused function apply_epoch

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-08 11:15:59 +00:00
Kefu Chai
fca4fe30a9 Merge pull request #17590 from xiaoxichen/minor_doc_fix
doc: fix typo on specify db block device

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-08 18:46:09 +08:00
Boris Ranto
00e1ec5ea4 Merge pull request #17573 from jcsp/wip-21292
mgr/restful: cleaner message when not configured

Reviewed-by: Boris Ranto <branto@redhat.com>
2017-09-08 10:32:20 +02:00
lu.shasha
fa952e8068 rgw: drop unused function apply_epoch
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
2017-09-08 15:16:13 +08:00
Xiaoxi Chen
14ffd9ba8c doc: fix typo on specify db block device
Should use block.db instead of block-db

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
2017-09-07 22:53:30 -07:00
Tamilarasi Muthamizhan
594b736228 Merge pull request #17536 from ceph/wip-cd-rbd-pool
qa/tests: fix rbd pool creation for systemd tests
2017-09-07 15:13:32 -07:00
Tamilarasi Muthamizhan
600524afcb Merge pull request #16826 from ceph/wip-cd-upgrade
qa/tests: add ceph-deploy upgrade tests
2017-09-07 15:08:49 -07:00
Sage Weil
bcebbc45b4 Merge pull request #17415 from wangshuguangbj/bug_mon_mdsmonitor_assert
mon/MDSMonitor: fix a bug at preprocess_beacon

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-07 16:25:48 -05:00
Sage Weil
4bc72efc40 Merge pull request #17454 from xiexingguo/wip-vs
src/vstart.sh: default os to filestore for FreeBSD

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-09-07 16:25:23 -05:00
Sage Weil
f754d2ed5f Merge pull request #17522 from liupan1111/wip-fix-disk-error
os/bluestore: report error and quit correctly when disk error happens.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
2017-09-07 16:25:06 -05:00
Sage Weil
25bf48edbf Merge pull request #17525 from jcsp/wip-21249
mon: fix `osd out` clog message

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-07 16:23:49 -05:00
Sage Weil
dc17dfd9ff os/bluestore/aio: handle short return from io_submit
io_submit may return a value less than nr, indicating that only some of
the provided iocbs were queued.  If that happens we should loop, not
return and silently drop those aios on the floor.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-07 16:28:59 -04:00
Vasu Kulkarni
5c43c5972d Add workaround for http://tracker.ceph.com/issues/20950
mgr bootstrap key differs on disk, rewrite the new key
using auth get.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:57 -07:00
Vasu Kulkarni
71ea4987e0 Add kraken to luminous upgrade case
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:57 -07:00
Vasu Kulkarni
526d4aef1c Add kernel tar/untar and systemd task
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:57 -07:00
Vasu Kulkarni
2116f76a1f Restart services after upgrade
This seems to be an issue and should be fixed in our systemd scripts,
need to discuss more on this.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:57 -07:00
Vasu Kulkarni
8a2b9a0809 since the roles are mapped inside ceph-deploy, store the roles that
are mapped and use the new mapped role for upgrades during later
stage.

eg: mon.a is mapped to mon.mira002 during install, store this mapping
and durig upgrade map it back to appropriate name to find the hostname
with that role

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:57 -07:00
Vasu Kulkarni
e7a0a4f87f Add doc string for missing ceph-deploy-branch
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:57 -07:00
Vasu Kulkarni
407ce2613d use mon.a as ceph-admin node, the previous get_first_mon returns
a sorted(mons)[0] as first mon.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:56 -07:00
Vasu Kulkarni
f3ec7cabf6 use elif instead of else to handle cases for jewel install
jewel needs neither filestore or bluestore as an option, so provide none
when running with jewel branch.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:56 -07:00
Vasu Kulkarni
9c85c76a90 Jewel to luminous upgrade scenario using ceph-deploy
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:56 -07:00
Vasu Kulkarni
9a73127c16 Add upgrade functionality using ceph-deploy
This is to test for customer like upgrade scenarios and to find
any issues that may be related to systemd, packaging etc

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:56 -07:00
Vasu Kulkarni
b409c3d163 Fix old flake8 issues
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:56 -07:00
Vasu Kulkarni
a9be0c387e Add option to skip mgr install for old release
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-09-07 12:22:56 -07:00
Sage Weil
70567017d5 Merge pull request #17581 from liewegas/wip-migration-fixups
doc/rados/operations/bluestore-migration: typos
2017-09-07 14:19:58 -05:00
Sage Weil
2bb5daa864 doc/rados/operations/bluestore-migration: typos
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-07 15:19:31 -04:00
Sage Weil
1006b62fe6 Merge pull request #17322 from liewegas/wip-post-luminous-mon
mon: remove pre-luminous compat cruft (2 of many)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-09-07 13:47:43 -05:00
Sage Weil
f9777fafc3 Merge pull request #17578 from liewegas/wip-integration
script/build-integration-branch: check errors
2017-09-07 12:59:09 -05:00
Sage Weil
e911493ffa Merge pull request #17577 from ktdreyer/gitignore-debian-patches
.gitignore: allow debian .patch files

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-07 12:58:57 -05:00
Sage Weil
686f2ae7fa script/build-integration-branch: check errors
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-07 13:55:59 -04:00
Ken Dreyer
c734b0c029 .gitignore: allow debian .patch files
The Ubuntu packaging layout with git-buildpackage assumes a
"debian/patches/" directory with several .patch files in it.

When upstream's .gitignore tells Git to ignore .patch files, we have to
edit that line out downstream. When we forget to do that downstream, it
can lead to missing patches and broken downstream builds.

Allow patches in the /debian/patches directory so it's easier to
maintain an Ubuntu package based on upstream's Git repo.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-09-07 11:08:51 -06:00
Jos Collin
404e39677b Merge pull request #17548 from yangdongsheng/mailmap
mailmap, organizationmap: add Dongsheng, Liuzhong, Pengcheng, Yang Affiliation

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-09-07 15:47:18 +00:00
Dongsheng Yang
5063212eea organization: add Liuzhong Chen, Pengcheng Zhang, Yang Wang
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-09-07 22:34:05 +08:00
Dongsheng Yang
bdec3ed06c mailmap: add Dongsheng Yang, Liuzhong Chen, Pengcheng Zhang, Yang Wang
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2017-09-07 22:33:08 +08:00
Jos Collin
1cb1e57454 Merge pull request #17540 from heyingstar/wip-update-organization
.mailmap, .organizationmap: add Fufei, Mingqiao and Ying Affiliation

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
2017-09-07 14:10:32 +00:00
John Spray
f7a1d57dd0 mgr/restful: cleaner message when not configured
RuntimeError+backtrace prints should be for
genuinely exceptional exceptions.  For these
known cases, we should just print the message cleanly.

http://tracker.ceph.com/issues/21292
Signed-off-by: John Spray <john.spray@redhat.com>
2017-09-07 16:05:43 +02:00
Ying He
fdba382316 add Ying He,Mingqiao Wu,Fufei Shang to mailmap and organizationmap
Signed-off-by: Ying He <heyingbj@inspur.com>
2017-09-07 21:27:45 +08:00
Sage Weil
e715533feb qa/workunits/*: require-osd-release mimic, not luminous
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-07 09:18:56 -04:00
Jason Dillaman
b0f1545d3b Merge pull request #16998 from trociny/wip-20860
rbd-mirror: update asok hook name on image rename

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:34:42 -04:00
Jason Dillaman
5995bca2eb Merge pull request #17300 from Songweibin/wip-mirror-peer-set
librbd: should not set self as remote peer

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:34:05 -04:00
Jason Dillaman
9cde1ab267 Merge pull request #17218 from PCzhangPC/benchrw
rbd: use different logic to disturb thread's offset in bench seq test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:32:05 -04:00
Jason Dillaman
6fbc3e12f0 Merge pull request #17187 from trociny/wip-mock-valgrind
test/librbd: fix valgrind memory leak warning

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:31:32 -04:00
Jason Dillaman
dfb8139240 Merge pull request #16597 from PCzhangPC/fix6
rbd: snap limit should't be set smaller than the number of  existing snaps

Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:30:02 -04:00
Haomai Wang
f3bb91e29c Merge pull request #17018 from alex-mikheev/wip_rdma_rxpool_2
msg/async/rdma: refactor rx buffer pool allocator

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-09-07 16:34:43 +08:00
Mykola Golub
f618508624 Merge pull request #17504 from dillaman/wip-21251
qa/suites/rbd: miscellaneous test fixes

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-07 11:34:01 +03:00
Mykola Golub
24ed122735 Merge pull request #17532 from dillaman/wip-21179
rbd: support iterating over metadata items when listing

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-07 11:31:45 +03:00
Mykola Golub
53d34d4425 Merge pull request #17509 from dillaman/wip-21217
test/cls_rbd: mask newer feature bits to support upgrade tests

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-07 08:33:08 +03:00
Mykola Golub
81e8be812b Merge pull request #17499 from dillaman/wip-21247
cls/rbd: metadata_list not honoring max_return parameter

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-07 08:30:31 +03:00
Patrick Donnelly
c9994788ca
Merge PR #17340 into master
* refs/remotes/upstream/pull/17340/head:
	mds: void sending cap import message when inode is frozen
	client: fix message order check in handle_cap_export()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-06 21:05:20 -07:00