RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,645 Commits 212 Branches 394 Tags 1.5 GiB
2bdb833b36
Commit Graph

82645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
2bdb833b36
Merge pull request #20183 from tchaikov/wip-crushtool 
crushtool: add --add-bucket and --move options

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-02-01 12:37:55 +08:00
Kefu Chai
2769583ff1
Merge pull request #20180 from xiexingguo/wip-more-balancer-fixes 
mgr/balancer: two more fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-02-01 12:34:50 +08:00
Kefu Chai
8c7dd252cc
Merge pull request #20154 from xiexingguo/wip-mgr-balancer-fixes 
mgr/balancer: pool-specific optimization support and bug fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-02-01 12:33:31 +08:00
Kefu Chai
129effb0bf
Merge pull request #20128 from guzhongyan/master 
common/pick_address: wrong prefix_len in pick_iface()

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-02-01 12:29:19 +08:00
Kefu Chai
1c320ea717
Merge pull request #20080 from dillaman/wip-librados-client-compat 
librados: getter for min compatible client versions

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
 2018-02-01 12:24:54 +08:00
Casey Bodley
9401bba7a8
Merge pull request #20195 from luomuyao/bugfix 
rgw: drop a repeated statement for encode_xml()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-31 10:54:15 -05:00
luomuyao
341ddddf24 rgw: drop a repeated statement for encode_xml() 
Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
 2018-01-31 10:33:27 +08:00
Patrick Donnelly
d8ba4862c1
Merge PR #19760 into master 
* refs/pull/19760/head:
	mds: add dump flag for CInode
	mds: add command "openfiles ls"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:18:10 -08:00
Patrick Donnelly
90687e499c
Merge PR #19825 into master 
* refs/pull/19825/head:
	client: properly choose target mds for rmsnap/renamesnap
	mds: properly setup need_snapflush for snapped inode
	mds: ignore MClientCaps::FLAG_NO_CAPSNAP

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:18:01 -08:00
Patrick Donnelly
6c6e25f8ee
Merge PR #19833 into master 
* refs/pull/19833/head:
	common: add C_SaferCond ctor with name argument
	Client: use C_SaferCond for "_flush_range"
	client: use C_SaferCond for _fallocate and ll_write_block
	client: use C_SaferCond for _sync_fs and _fsync
	client: use C_SaferCond in Client::_write
	client: use C_SaferCond for _read_sync
	client: use C_SaferCond in _read_async
	client: use C_SaferCond for "Client::_read"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:17:54 -08:00
Patrick Donnelly
bb329c5582
Merge PR #19836 into master 
* refs/pull/19836/head:
	Avoid the assert failure when the inode for the cap_export from other MDS happened not in MDCache

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2018-01-30 15:17:48 -08:00
Patrick Donnelly
89dfc9521d
Merge PR #19842 into master 
* refs/pull/19842/head:
	client: unify function name in debug log for Client.cc

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:17:42 -08:00
Patrick Donnelly
b233abc211
Merge PR #19991 into master 
* refs/pull/19991/head:
	cephfs-journal-tool: move shutdown to the deconstructor of MDSUtility

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:17:35 -08:00
Patrick Donnelly
388c9dd37c
Merge PR #20001 into master 
* refs/pull/20001/head:
	mds: use the steady clock on tick

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:17:29 -08:00
Patrick Donnelly
23ff594e16
Merge PR #20012 into master 
* refs/pull/20012/head:
	mds: fix scrub crash

Reviewed-by: Douglas Fuller <dfuller@redhat.com>
 2018-01-30 15:17:22 -08:00
Patrick Donnelly
69765dcbcb
Merge PR #20079 into master 
* refs/pull/20079/head:
	mds: set higher priority for some perf counters

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:17:16 -08:00
Patrick Donnelly
ae0b89c6c9
Merge PR #20113 into master 
* refs/pull/20113/head:
	osdc/ObjectCacher: don't merge TX buffer heads
	osdc/ObjectCacher: fix off-by-one error in bh_write_commit()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 15:17:10 -08:00
Casey Bodley
9cdd2fe658
Merge pull request #20000 from zhouyuan/rgw_beast_listen 
rgw: allow beast frontend to listen on specific IP address

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-30 12:04:47 -05:00
Casey Bodley
50917930b9
Merge pull request #20058 from cbodley/wip-doc-rgw-frontends 
doc/rgw: add page for http frontend configuration

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
 2018-01-30 11:38:06 -05:00
Patrick Donnelly
0d6c5927ba
Merge PR #20165 into master 
* refs/pull/20165/head:
	doc/client: uniform naming

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 08:35:58 -08:00
Casey Bodley
8ccefcbacd
Merge pull request #20164 from luomuyao/typo 
rgw: fix a typo in comment

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
 2018-01-30 11:29:45 -05:00
Kefu Chai
8ea03a78d5 test/cli/crushtool: add test for --add-bucket and --move 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-30 22:09:59 +08:00
Kefu Chai
c1f4334345 crush/CrushWrapper: lower log level of check_item_loc() 
it's not an error if the item is not at loc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-30 22:09:58 +08:00
Kefu Chai
22c943511e crushtool: add --move 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-30 22:09:58 +08:00
Jason Dillaman
5b95c51a75
Merge pull request #20159 from shun-s/fix-rbd-log 
librbd: clean up ManagedLock log prefix

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-01-30 08:10:41 -05:00
Kefu Chai
4525003908 crushtool: add --add-bucket 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-30 19:09:09 +08:00
Gu Zhongyan
b0d8043a72 common/pick_address: wrong prefix_len in pick_iface() 
With prefix_len initialized as zero, mask in netmask_ipv4/6()
will always be zero, so find_ip_in_subnet() always return the
first interface.
Set prefix_len to the right value to fetch the right interface.

Signed-off-by: Gu Zhongyan guzhongyan@360.cn
Signed-off-by: yupeng chen chenyupeng-it@360.cn
 2018-01-30 18:37:34 +08:00
xie xingguo
cdae240ed9 pybind/mgr/balancer: fix sanity check against minimal pg numbers per pool 
And rename some variables properly.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-01-30 17:02:41 +08:00
xie xingguo
ae56d847a0 pybind/mgr/balancer: do not dirty compat_ws on error out 
We will get a worse result if we execute the corresponding plan later.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-01-30 17:02:35 +08:00
Yan, Zheng
4eb4827f60 client: properly choose target mds for rmsnap/renamesnap 
Old code does not set inode or dentry for rmsnap/renamesnap requests.
So rmsnap/renamesnap requests are sent to random mds.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2018-01-30 16:26:28 +08:00
Yan, Zheng
de3f3d88b3 mds: properly setup need_snapflush for snapped inode 
MDCache::cow_inode() checks "cap->issued() & CEPH_CAP_ANY_WR" to decide
if it needs to setup need_snapflush for the new snapped inode.
Locker::handle_client_caps() should call Locker::_do_cap_update() first,
then update issued caps. Otherwise MDCache::cow_inode() will fail to
setup need_snapflush if cap messages flushes dirty caps and releases the
same caps.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2018-01-30 16:25:11 +08:00
Kefu Chai
8d5da83ba0
Merge pull request #19770 from shinobu-x/mempool_lock 
common: s/unique_lock/lock_guard/, if manual lock/unlock are not necessary

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-30 10:08:48 +08:00
shun-s
c2e9595174 rbd: clean up ManagedLock log prefix 
clean up ManagedLock log prefix

Signed-off-by: shun-s <song.shun3@zte.com.cn>
 2018-01-30 09:41:07 +08:00
xie xingguo
52e336efc1 pybind/mgr/balancer: re-initialize everything on instantiating a new Eval 
Otherwise there might be obsolete pool/root infos etc.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-01-30 08:37:16 +08:00
Casey Bodley
cb396a78d4
Merge pull request #20052 from ceph/revert-19253-wip-rgw-22124 
Revert "rgw: reshard should not update stats when linking new bucket instance"

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-29 16:47:08 -05:00
Matt Benjamin
40c93224c0
Merge pull request #20171 from linuxbox2/rgw_rvrt_disable_exact 
Revert "rgw_file: disable FLAG_EXACT_MATCH enforcement"
 2018-01-29 13:06:59 -05:00
Matt Benjamin
cbe3d3f41b Revert "rgw_file: disable FLAG_EXACT_MATCH enforcement" 
This reverts commit 5e0bea71b52f652a5cb6323cf56391ada215c80b.
Fixes: http://tracker.ceph.com/issues/22827

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2018-01-29 11:21:39 -05:00
Sage Weil
4f537e2263
Merge pull request #20167 from cernceph/dvanders_withhold 
osd: change log level when withholding pg creation

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-29 08:42:45 -06:00
Dan van der Ster
d12ba37e0d osd: change log level when withholding pg creation 
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
 2018-01-29 15:37:00 +01:00
luomuyao
dc2369d8af rgw: fix a typo in comment 
Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
 2018-01-29 19:01:33 +08:00
John Spray
c41ef5a5ce
Merge pull request #19758 from nrdmn/fix-dashboard-wip 
pybind/mgr/dashboard: fix reverse proxy support

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-29 10:56:00 +00:00
Kefu Chai
91e126084b
Merge pull request #20142 from shangzhong/wip-java-native 
java/native: s/jni: lstat/jni: stat in native_ceph_stat

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:41:54 +08:00
Kefu Chai
e46a4d80cc
Merge pull request #20130 from k0ste/newfeature 
mgr: balancer: fixed mistype "AttributeError: 'Logger' object has no attribute 'err'"

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:38:05 +08:00
Kefu Chai
3e3e781600
Merge pull request #20127 from majianpeng/issue_op_cleanup 
osd/ReplicatedBackend: clean up code.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:37:38 +08:00
Kefu Chai
d61b129e4e
Merge pull request #20119 from Liuchang0812/remove-health-service 
mon: remove health service

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-29 18:37:12 +08:00
Kefu Chai
9c45641540
Merge pull request #20092 from tangwenjun3/wip-fix-write-label 
os/bluestore: no need to fsync when failed to write label

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-29 18:36:43 +08:00
Kefu Chai
2a5b62a394
Merge pull request #20078 from renhwztetecs/renhw-wip-mon-paxos-cleanup 
mon: paxos cleanup

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2018-01-29 18:36:08 +08:00
huanwen ren
78c3dfdf32 doc/client: uniform naming 
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
 2018-01-29 18:24:05 +08:00
John Spray
b2d406e07f
Merge pull request #20126 from tchaikov/wip-doc-mgr-auth 
doc: update mgr related auth settings

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-29 10:03:36 +00:00
xie xingguo
4ca3eb2892 mgr/balancer: pool-specific optimization support 
This currently only works for upmap.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-01-29 11:20:31 +08:00