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
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
Patrick Donnelly
d269c851c6
Merge PR #16778 into master
...
* refs/remotes/upstream/pull/16778/head:
mds: fix return value of MDCache::dump_cache
mds: new cap message flags indicate if there is pending capsnap
mds: properly do null snapflush part2
mds: track snap inodes through sorted map
mds: properly drop wrlock when finishing snapflush
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-06 21:05:18 -07:00
Patrick Donnelly
28c7813f4e
Merge PR #17291 into master
...
* refs/remotes/upstream/pull/17291/head:
mds: fix 'dirfrag end' check in Server::handle_client_readdir
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
2017-09-06 14:45:16 -07:00
Patrick Donnelly
00629ad52f
Merge PR #17289 into master
...
* refs/remotes/upstream/pull/17289/head:
osd, mds, tools: drop the invalid comment and some unused variables
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-06 14:45:14 -07:00
Patrick Donnelly
8f79a7eccc
Merge PR #17219 into master
...
* refs/remotes/upstream/pull/17219/head:
mds: fix StrayManager::truncate()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-09-06 14:45:12 -07:00
Sage Weil
1e272575ad
Merge pull request #17505 from liewegas/wip-20910
...
qa/objectstore/bluestore*: less debug output
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-09-06 16:02:01 -05:00
Sage Weil
267750e457
Merge pull request #17459 from xiexingguo/wip-bs-tracked-key
...
os/bluestore: add bluestore_prefer_deferred_size_hdd/ssd to tracked keys
Reviewed-by: Pan Liu <liupan1111@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-06 15:55:54 -05:00
Sage Weil
32d5722003
Merge pull request #17463 from tchaikov/wip-ceph-tell-mds-star
...
ceph: fixes for "tell <service>.*" command
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Chang Liu <liuchang0812@gmail.com>
2017-09-06 15:55:25 -05:00
Sage Weil
b647184233
Merge pull request #17503 from liewegas/wip-21250
...
os/bluestore/BlueFS: prevent _compact_log_async reentry
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@gmail.com>
2017-09-06 15:52:29 -05:00
Jason Dillaman
0130b85732
cls/rbd: metadata_list not honoring max_return parameter
...
Fixes: http://tracker.ceph.com/issues/21247
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-09-06 16:20:37 -04:00
Jason Dillaman
9c4f9856b0
rbd: support iterating over metadata items when listing
...
Fixes: http://tracker.ceph.com/issues/21179
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-09-06 16:14:58 -04:00
Sage Weil
bd52ddd681
Merge pull request #17510 from liewegas/wip-crush-fix-rule-lookup
...
crush: fix fast rule lookup when uniform
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-06 13:41:55 -05:00
Yuri Weinstein
49d307211a
Merge pull request #17356 from shashalu/bucket_link/unlink_olh
...
rgw: don't write bucket_header when it is not changed in bucket_link/unlink
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-09-06 08:50:23 -07:00
Yuri Weinstein
64a445add0
Merge pull request #17434 from iliul/remove-useless-output
...
rgw: Remove the useless output when list zones
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-06 08:49:27 -07:00
Jos Collin
2e6c65b90a
Merge pull request #17518 from wjwithagen/wjw-githubmap
...
.githubmap: Add wjwithagen as a known Ceph reviewer
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-09-06 15:14:47 +00:00
Sage Weil
e2bc8883ba
qa/standalone/mon/misc.sh: fix mon feature test
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:07 -04:00
Sage Weil
076110873c
mon: s/mon_debug_no_require_luminous/mon_debug_no_require_mimic/
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:07 -04:00
Sage Weil
e21e63cb88
qa/workunits/cephtool/test.sh: drop 'pg set_full_ratio'
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:06 -04:00
Sage Weil
b198236d68
doc/man/8/ceph.rst: remove pg set_*full_ratio
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:06 -04:00
Sage Weil
e840d38c8f
test/osd/CMakeLists: fix test name
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:06 -04:00
Sage Weil
e467873e36
doc/man/8/ceph: remove old 'ceph pg ' force_create_pg, set_[near]full_ratio
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:06 -04:00
Sage Weil
2cf04b1654
ceph-object-corpus: PGMap encoding change
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-06 10:18:06 -04:00