RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,842 Commits 211 Branches 394 Tags 2 GiB
343e1a4281
Commit Graph

75842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spray
343e1a4281 qa: update whitelist for "wrongly marked me down" 
Signed-off-by: John Spray <john.spray@redhat.com>
 2017-07-24 14:54:46 +01:00
John Spray
a83774013c osd: rephrase "wrongly marked me down" clog message 
Rephrase as "Monitor daemon marked osd.<id> down, but it is
still running", which is more descriptive.  Demote the
epoch information to DEBUG level.

Signed-off-by: John Spray <john.spray@redhat.com>
 2017-07-24 14:54:46 +01:00
Sage Weil
fc8374b472 Merge pull request #16326 from liewegas/wip-weight-set 
crush,mon: add weight-set introspection and manipulation commands

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com
 2017-07-24 08:27:06 -05:00
John Spray
34f412573d Merge pull request #16360 from dillaman/wip-rbd-mirror-service-daemon 
mgr/dashboard: rbd mirroring status page

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-07-24 14:00:51 +01:00
John Spray
478ba0568e Merge pull request #16529 from Liuchang0812/wip-20750 
mgr/status: row has incorrect number of values

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-07-24 12:40:52 +01:00
Kefu Chai
fa36dc3e55 Merge pull request #16503 from renhwztetecs/renhw-wip-mon-rebuild-doc 
doc/mon: fix ceph-authtool command in rebuild mon's sample

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-24 19:39:44 +08:00
Kefu Chai
8cf3b6b92f Merge pull request #16523 from tchaikov/wip-ceph-disk-asok-dir 
tests: add setup/teardown for asok dir

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
 2017-07-24 18:31:37 +08:00
liuchang0812
c7a88e42d1 mgr/status: row has incorrect number of values 
Fixes: http://tracker.ceph.com/issues/20750

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
 2017-07-24 17:34:45 +08:00
Xie Xingguo
42d14a62c8 Merge pull request #16507 from scienceluo/patch-1 
Update .organizationmap

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-24 17:28:24 +08:00
huanwen ren
f4dd2801ca doc/mon: fix ceph-authtool create keyring 
if use "ceph-authtool keyring -n mon. --cap mon allow 'allow *'"
as err:
[root]# ceph-authtool keyring -n mon. --cap mon allow 'allow *'
ceph-authtool: unexpected 'allow *'

Excessive "allow" is the cause of the error

Signed-off-by huanwen ren <ren.huanwen@zte.com.cn>
 2017-07-24 17:00:10 +08:00
Kefu Chai
8c1a2b1d94 vstart.sh: do not try to remove default asok_dir 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-07-24 16:40:10 +08:00
Kefu Chai
b0bd816dd1 tests: add setup/teardown for asok dir 
ceph-disk.sh has its own setup/teardown, so update them also. so asok
files will have their parent directory when being created.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-07-24 16:39:17 +08:00
Orit Wasserman
7536d2ecae Merge pull request #16502 from weiqiaomiao/wip_weiqm_unlock_bucket 
rgw: should unlock when reshard_log->update() reture non-zero in RGWB…
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
 2017-07-24 11:25:21 +03:00
weiqiaomiao
ff5bd5bd52 rgw: should unlock when reshard_log->update() reture non-zero in RGWBucketReshard::execute() 
Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
 2017-07-24 12:30:01 +08:00
Sage Weil
27c1d62ae9 Merge pull request #16508 from liewegas/wip-mgr-lock-cycle 
mgr: fix lock cycle
 2017-07-22 21:14:36 -05:00
Sage Weil
17c1a8f74a Merge pull request #16488 from liewegas/wip-skewed 
common/options: remove mon_warn_osd_usage_min_max_delta from options.cc too

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-22 13:07:43 -05:00
Sage Weil
1fbf4ca7fd Merge pull request #16490 from jdurgin/wip-20739 
osd/PrimaryLogPG: skip deleted missing objects in pg[n]ls

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-22 13:07:28 -05:00
Sage Weil
a7b40ce13c Merge pull request #16501 from liewegas/wip-fix-mgr-commands 
mon: do not dereference empty mgr_commands
 2017-07-22 13:07:05 -05:00
Sage Weil
08bdc2c867 Merge pull request #16500 from liewegas/wip-compact-sudo 
qa/workunits/cephtool/test.sh: add sudo for daemon compact

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-22 13:01:20 -05:00
Sage Weil
bb2c84eda6 mgr/PyModules: fix lock name 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-22 13:48:17 -04:00
Sage Weil
d7ba56f421 mgr/DaemonServer: fix lock cycle 
This breaks a lock cycle with DaemonState::lock and PyModules::lock.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-22 13:48:00 -04:00
luokexue
5ba8236e19 Update .organizationmap 
The list of contributors to ZTE looks better if it is in alphabetical order.

Signed-off-by: Luo Kexue luo.kexue@zte.com.cn
 2017-07-22 23:11:09 +08:00
Sage Weil
4e6487cad4 Merge pull request #15991 from dillaman/wip-rbd-auth-profile 
mon,osd: new rbd-based cephx cap profiles

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-21 22:38:42 -05:00
Sage Weil
a40d8e4a83 Merge pull request #16432 from liewegas/wip-mgr-daemonstate-lock 
mgr: add per-DaemonState lock

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-07-21 22:36:26 -05:00
Sage Weil
0429acda45 Merge pull request #16460 from liewegas/wip-mgr-metadata 
mon: add mgr metdata commands, and overall 'versions' command for all daemon versions

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-21 22:36:09 -05:00
Sage Weil
165f80a9e1 Merge pull request #16465 from xiexingguo/wip-shutup-noscrub-warn 
mon: stop issuing not-[deep]-scrubbed warnings if disabled

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-21 22:35:43 -05:00
Sage Weil
31e9061815 Merge pull request #16477 from tchaikov/wip-health-mon 
mon/HealthMonitor: trigger a proposal if stat updated

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-21 22:34:50 -05:00
Sage Weil
4d4b0b469e Merge pull request #16478 from xiexingguo/wip-drop-empty-message 
mon/HealthMonitor: avoid sending unnecessary MMonHealthChecks to leader

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-21 22:34:32 -05:00
Sage Weil
bea20a4ce1 Merge pull request #16480 from jcsp/wip-rm-convert 
common: remove config opt conversion utility

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
 2017-07-21 22:34:08 -05:00
Sage Weil
c1704f2e6b mon: do not dereference empty mgr_commands 
This may be empty before the initial quorum commits the static command
list.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-21 23:32:05 -04:00
Sage Weil
2f272ab451 qa/workunits/cephtool/test.sh: add sudo for daemon compact 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-21 23:18:03 -04:00
Patrick Donnelly
1e5c8aef7b
Merge PR 16390 into master 
* refs/remotes/upstream/pull/16390/head:
	mds: cleanup with unique_ptr
	mds: add to get version in the mds_commands
	mds: cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-07-21 13:23:10 -07:00
Patrick Donnelly
9506789ce1
Merge PR 16379 into master 
* refs/remotes/upstream/pull/16379/head:
	qa: fix MDS_CLIENT_RECALL copy error

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:23:07 -07:00
Patrick Donnelly
9e936c70b2
Merge PR 16337 into master 
* refs/remotes/upstream/pull/16337/head:
	mds: clear dirty rstat flag on non-auth inode when finishing scatter update

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:23:04 -07:00
Patrick Donnelly
e46d63c8cc
Merge PR 16280 into master 
* refs/remotes/upstream/pull/16280/head:
	Client: mkdirs bugs when two clients send mkdir request for a same dir

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:23:01 -07:00
Patrick Donnelly
71e49cf121
Merge PR 16278 into master 
* refs/remotes/upstream/pull/16278/head:
	MDSMonitor: show laggy MDSs at higher debug level

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:22:58 -07:00
Patrick Donnelly
e0880c865a
Merge PR 16270 into master 
* refs/remotes/upstream/pull/16270/head:
	mds: improve wording of mdsmap dne logging

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:22:56 -07:00
Patrick Donnelly
11d809e9fe
Merge PR 16232 into master 
* refs/remotes/upstream/pull/16232/head:
	MDS: update the mlogger of mds in function check_memory_usage

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:22:53 -07:00
Patrick Donnelly
4eb985085f
Merge PR 16231 into master 
* refs/remotes/upstream/pull/16231/head:
	Client: get rid of variable "butnot" in "client::get_caps"

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:22:50 -07:00
Patrick Donnelly
23e3d40751
Merge PR 16226 into master 
* refs/remotes/upstream/pull/16226/head:
	qa: wait for OSDMap to propagate for snap purge

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:22:47 -07:00
Patrick Donnelly
58bac728bc
Merge PR 16149 into master 
* refs/remotes/upstream/pull/16149/head:
	mds: misc cleanup

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2017-07-21 13:22:44 -07:00
Patrick Donnelly
db6b76b0e4
Merge PR 15942 into master 
* refs/remotes/upstream/pull/15942/head:
	client: add unlock_fh_pos when abort

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-07-21 13:22:36 -07:00
Sage Weil
5e8fa3e06b crush: assume weight_set != null imples weight_set_size > 0 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-21 15:18:10 -04:00
Josh Durgin
5617604556 osd/PrimaryLogPG: skip deleted missing objects in pg[n]ls 
Fixes: http://tracker.ceph.com/issues/20739
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
 2017-07-21 15:02:57 -04:00
Jason Dillaman
6b44cb6034 PendingReleaseNotes: added blurb for new RBD cap profiles 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-21 14:30:38 -04:00
Jason Dillaman
e1d439f2fb osd: expand profile caps upon construction to avoid potential race 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-21 14:30:18 -04:00
Jason Dillaman
44fa7ee788 qa/workunits/rbd: rbd-mirror tests should use 'mirror' user 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-21 14:30:18 -04:00
Jason Dillaman
56614d0ee9 qa/suites/rbd: mirroring tests should use rbd cap profiles 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-21 14:30:18 -04:00
Jason Dillaman
d32485ff37 qa/workunits/rbd: devstack test should use auth profiles 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-21 14:30:18 -04:00
Jason Dillaman
7f1b1dc38a doc: include details for new RBD cap profiles 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-07-21 14:30:18 -04:00