RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
77,996 Commits 212 Branches 394 Tags 1.5 GiB
52c79aecdd
Commit Graph

77996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Donnelly
52c79aecdd
Merge PR #17466 into master 
* refs/remotes/upstream/pull/17466/head:
	qa: whitelist expected MDS_READ_ONLY for kcephfs test

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-09-08 11:23:19 -07:00
Patrick Donnelly
5f99d9d53c
Merge PR #17456 into master 
* refs/remotes/upstream/pull/17456/head:
	mds: print subtrees only after merge

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-09-08 11:23:17 -07:00
Patrick Donnelly
490bc0050c
Merge PR #17452 into master 
* refs/remotes/upstream/pull/17452/head:
	Make standby-replay mds not migrate empty subtree when trimming cache
	Make standby-replay mds avoid initiating subtree export

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-09-08 11:23:15 -07:00
Patrick Donnelly
353b1311c3
Merge PR #17384 into master 
* refs/remotes/upstream/pull/17384/head:
	ceph.in: validate service glob

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-09-08 11:23:12 -07:00
Patrick Donnelly
1d793366ab
Merge PR #16752 into master 
* refs/remotes/upstream/pull/16752/head:
	client: NULL check before append value to bufferlist

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
 2017-09-08 11:23:10 -07:00
Sage Weil
5b89608343 Merge pull request #16272 from liewegas/wip-balancer 
mgr/balancer: mgr module to automatically balance PGs across OSDs

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-09-08 11:29:14 -05:00
Andrew Schoen
9693f86883 Merge pull request #17403 from ceph/wip-bz1485011 
ceph-volume Persist non-lv devices for journals

Reviewed-by: Andrew Schoen aschoen@redhat.com
 2017-09-08 10:43:44 -05:00
Sage Weil
46ba645703 Merge pull request #17603 from liewegas/wip-migration-twiddle 
doc: restructure bluestore migration insructions

Reviewed-by: David Galloway <dgallowa@redhat.com>
 2017-09-08 10:32:08 -05:00
Sage Weil
9fa4901783 doc: restructure bluestore migration insructions 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-09-08 11:27:34 -04:00
Sage Weil
24c4354886 Merge pull request #17602 from ceph/wip-blumig-doc 
doc: Updates to bluestore migration doc

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-09-08 10:05:27 -05:00
David Galloway
a9314f0a17 doc/rados/operations/bluestore-migration: Add instruction for evacuating 
host

Signed-off-by: David Galloway <dgallowa@redhat.com>
 2017-09-08 10:48:32 -04:00
Sage Weil
f4991b71e2 Merge pull request #17011 from liewegas/wip-doc-bluestore-migration 
doc/rados/operations/bluestore-migration: update docs a bit
 2017-09-08 09:47:02 -05:00
Kefu Chai
4515636a41 Merge pull request #17582 from ivancich/wip-fix-mclock-unittests 
test/common: unittest_mclock_priority_queue builds with "make" command

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-09-08 22:03:28 +08:00
David Galloway
f1b3d1e4bb doc/rados/operations/bluestore-migration: Fix typo in bluestore migration doc 
Signed-off-by: David Galloway <dgallowa@redhat.com>
 2017-09-08 09:45:53 -04:00
Sage Weil
c364977279 Merge pull request #17569 from liewegas/wip-21293 
Revert "os/bluestore: pass strict flag to bluestore_blob_use_tracker_t::equal()"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-09-08 07:19:42 -05:00
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
J. Eric Ivancich
494b2f8f5a test/common: unittest_mclock_priority_queue builds with "make" command 
Although it would be built with "make tests",
unittest_mclock_priority_queue was not built with a simple "make".

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
 2017-09-07 17:49:28 -04: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