Commit Graph

78173 Commits

Author SHA1 Message Date
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
Joao Eduardo Luis
bc5fe2e909 mon/OSDMonitor: fix typo
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
2017-09-07 18:10:18 +01: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
Sage Weil
f9a63cdf32 Revert "os/bluestore: pass strict flag to bluestore_blob_use_tracker_t::equal()"
This reverts commit 5070999169.

The existing blob may have a vector-based au because it was, say, split, while the local one
may not (because it not needed).  Use a sloppy comparison.

Fixes: http://tracker.ceph.com/issues/21293
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-07 09:28:27 -04: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
273c84578b qa/workunits/rbd: relax greps to support upgrade formatting change
Fixes: http://tracker.ceph.com/issues/21181
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-09-07 08:56:16 -04:00
xie xingguo
af2c4847e4 tools/ceph_objectstore_tool: fix 'dup' unable to duplicate meta PG
Recently we plan to bring a Jewel cluster into Luminous.
After that is done, which turns out to be a big success,
we then try to transform all FileStore osds into BlueStore ones
offline but with no luck. The ceph_objectstore_tool keeps complaining:
--------------------------------------------------------------------
dup from filestore: /var/lib/ceph/osd/ceph-20.old
      to bluestore: /var/lib/ceph/osd/ceph-20
fsid d444b253-337d-4d15-9d63-86ae134ec9ac
65 collections
1/65 meta
cannot get bit count for collection meta: (61) No data available
--------------------------------------------------------------------

The root cause is that for FileStore Luminous will always try to rewrite
pg "bits" as a file attribute on "Load" if that is not available.
But since meta pg is never loaded (we skip it during OSD::load_pgs()),
we actually never get the chance to do so; hence making the
dup method from ceph_objectstore_tool very unhappy since it always
expects to see such a attribute from underlying store.

Fix the above problem by manually skipping loading the "bits" attribute
if underlying OS is FileStore for dup.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-07 20:52:51 +08: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
iliul
ef9ddaf0c9 tools: Modify "rados df" header's alignment
Signed-off-by: iliul <liul124@chinaunicom.cn>
2017-09-07 09:49:53 +00: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
Yan, Zheng
bc7d02dbdb client: fix request reference leak
if request gets aborted, its reference leaks.

Fixes: http://tracker.ceph.com/issues/21274
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-09-07 16:19:58 +08:00
linxuhua
0482e7b421 remote the ),it's redundant.
Signed-off-by: linxuhua <linxuhua@unionpay.com>
2017-09-07 15:44:00 +08: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
Kefu Chai
3124eb2148 mon,monmap: use new style config opts
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-07 13:24:22 +08:00
Kefu Chai
22d1aac42a common,mon,osd,pybind: remove executable mode bit
since they are not supposed to be executed as an executable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-07 13:13:56 +08:00
Kefu Chai
d64afab334 interval_set: silence "set but unused" warning
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-09-07 13:13:35 +08:00