RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 17:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,936 Commits 212 Branches 394 Tags 1.6 GiB
0d80c88667
Commit Graph

73936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xie xingguo
905ad73c33 mon/OSDMonitor: add "ceph osd ls-tree" command 
E.g.:
~# ceph osd tree
ID WEIGHT  TYPE NAME                                        UP/DOWN REWEIGHT PRIMARY-AFFINITY
-5 3.00000 root foo
-4 2.00000     rack foo-rack-1
-3 1.00000         host foo-host-192-8-8-91
 1 1.00000             osd.1                                     up  1.00000          1.00000
-6 1.00000         host foo-host-192-8-8-92
 2 1.00000             osd.2                                     up  1.00000          1.00000
-8 1.00000     rack foo-rack-2
-7 1.00000         host foo-host-192-8-8-93
 0 1.00000             osd.0                                     up  1.00000          1.00000
-1       0 root default
-2       0     host gitbuilder-ceph-rpm-centos7-amd64-basic

~# ceph osd ls-tree foo
0
1
2

~# ceph osd ls-tree foo-rack-1
1
2

~# ceph osd ls-tree foo-rack-2
0

~# ceph osd ls-tree foo-host-192-8-8-92
2

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-06-12 10:08:33 +08:00
xie xingguo
4fec5b85f1 mon/OSDMonitor: batch OSDs nodown/noout support 
This patch allow us to add batch OSDs(e.g., from a specific host which is currently in maintenance)
into a specific nodown/noout list, which can not be automatically marked down/out
and hence can be eliminated from data migration.

This has the same effect with the global nodown/noout flag but is more fine-grained.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-06-12 10:08:33 +08:00
zhanglei
79eb830014 Merge branch 'ceph' into zl 2017-06-11 21:23:34 -04:00
yuliyang
6983eee563 rgw: fix rgw bucket policy IfExists position 
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
 2017-06-11 15:13:42 +08:00
Casey Bodley
b8272f3607 rgw: only log metadata on metadata master zone 
Fixes: http://tracker.ceph.com/issues/20244

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2017-06-10 18:12:54 -04:00
Sage Weil
9f259cb923 Merge pull request #15610 from wjwithagen/wip-wjw-freebsd-py-pecan 
core: Install Pecan for FreeBSD
 2017-06-10 12:50:10 -05:00
Mykola Golub
c42c9f9afd Merge pull request #15574 from dillaman/wip-20223 
pybind/rbd: OSError should be picklable

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2017-06-10 18:24:16 +03:00
Loic Dachary
fe491909a6 Merge pull request #15576 from dachary/wip-ceph-disk 
ceph-disk: sensible default for block.db

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-10 15:39:54 +02:00
Willem Jan Withagen
f7e18c29dc core: Install Pecan for FreeBSD 
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2017-06-10 12:12:23 +02:00
Gregory Farnum
3084fcfda9 Merge pull request #15609 from stiwari/wip-19879 
Merge pull request from stiwari/wip-19879
 2017-06-09 21:27:19 -07:00
Yehuda Sadeh
10a22815d2 Merge pull request #12851 from zhangsw/fix-rgw-bucketcheck-bug 
rgw: bucket index check in radosgw-admin removes valid index.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2017-06-09 15:16:55 -07:00
Gregory Farnum
2289e80950 Merge pull request #15606 from stiwari/fix_1 
Documentation Fixes for http://tracker.ceph.com/issues/19879

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2017-06-09 14:39:11 -07:00
Sage Weil
4b8abef1b4 Merge pull request #15588 from liewegas/wip-20216 
pybind/mgr/dashboard: monkeypatch os.exit to stop cherrypy from taking down mgr

Reviewed-by: John Spray <jspray@redhat.com>
 2017-06-09 16:26:18 -05:00
Josh Durgin
7376e8132f Merge pull request #15550 from jcsp/wip-doc-cephfs-objsize 
doc/cephfs: mention RADOS object size limit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-09 14:22:56 -07:00
Loic Dachary
2a5cd5dc1e ceph-disk: sensible default for block.db 
If bluestore_block_db_size is unset or zero, fallback to a sensible
default which is block_size / 100. With a minimum of 1GB.

Signed-off-by: Loic Dachary <loic@dachary.org>
 2017-06-09 20:50:54 +02:00
Matt Benjamin
126cd32593 Merge pull request #13395 from dang/wip-quota-cache-doc 
Document RGW quota cache options
 2017-06-09 13:56:52 -04:00
Matt Benjamin
5e4f8f63c9 Merge pull request #15568 from guihecheng/rgw_file-cleanup-names 
rgw: rgw_file cleanup names
 2017-06-09 13:41:45 -04:00
Matt Benjamin
05a390ba0f Merge pull request #15541 from guihecheng/rgw_file-cleanup 
rgw_file: replace raw fs->fh_lru.unref with predefined fs->unref
 2017-06-09 12:48:20 -04:00
Ilya Dryomov
8cf0373374 rados: fix typo in 'df' column name 
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
 2017-06-09 18:36:19 +02:00
Kefu Chai
ab43b0ddc8 Merge pull request #15558 from Linbing/wip-osd-optimize-send-failues 
osd: when osd in not in failure_pending, we don't need to get osd inst from osdmap.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-10 00:27:44 +08:00
Yuri Weinstein
41a90b99aa Merge pull request #15223 from badone/wip-ceph_test_admin_socket_output 
tests: Add integration tests for admin socket output

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-09 09:01:52 -07:00
Yuri Weinstein
b38272a7d8 Merge pull request #15573 from liewegas/wip-20208 
mon/PGMap: fix osd_epoch update when removing osd_stat

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
 2017-06-09 09:00:10 -07:00
Sage Weil
a423270674 os/bluestore: set bluestore_cache_kv_ratio to configure rocksdb cache size 
Devote 40% to kv (rocksdb), 50% to metadata (onodes etc), 10% to data.

Note that if we don't consume the data portion (e.g., no cache hints) that
the onode metadata will "borrow" that space.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-09 10:50:56 -04:00
Sage Weil
3990137bf9 kv/RocksDBStore: rocksdb_cache_row_ratio 
Specify portion of cache to devote to row cache (the rest goes to the
block cache).

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-09 10:50:55 -04:00
Jason Dillaman
3ae72a001b Merge pull request #15594 from idryomov/wip-krbd-rados-ls 
qa: update krbd_data_pool.sh to match the new rados ls behavior

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-06-09 10:50:20 -04:00
Sage Weil
f3904aad0c Merge pull request #15600 from ceph/luminous 
12.0.3
 2017-06-09 09:13:59 -05:00
Sage Weil
b6a5b946f8 Merge pull request #15180 from theanalyst/doc/rgw-dev-s3tests 
doc: dev improve the s3tests doc to reflect current scripts
 2017-06-09 08:32:10 -05:00
Sage Weil
d94fce0286 kv/RocksDBStore: allow cache_size to be specified explicitly 
(Not via a config option)

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-09 09:30:42 -04:00
Sage Weil
c7464183ea kv/RocksDBStore: make rocksdb_cache_type tunable (lru or clock) 
"[Clock is] Similar to NewLRUCache, but create a cache based on CLOCK
algorithm with better concurrent performance in some cases. See
[cache]/clock_cache.cc for more detail."

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-09 09:30:42 -04:00
Enming Zhang
01c35281af rgw: fix get bucket policy s3 compatible issue 
In AWS S3 get bucket policy should return 404 error code when bucket policy does not exist like following:

Response: {'status': 404, 'headers': {'x-amz-id-2': 'Gncp2wjrOy2Juy0RFbuyWjGFCFNSQd8vXIi8sbxhSdR7bi4VmjSlbmRKkUr3dK3+tmewATJSwZw=', 'server': 'AmazonS3', 'transfer-encoding': 'chunked', 'x-amz-request-id': 'D3F18909B654014A', 'date': 'Thu, 25 May 2017 03:28:35 GMT', 'content-type': 'application/xml'}, 'reason': 'Not Found', 'data': '<?xml version="1.0" encoding="UTF-8"?>\n<Error><Code>NoSuchBucketPolicy</Code><Message>The bucket policy does not exist</Message><BucketName>em-111</BucketName><RequestId>D3F18909B654014A</RequestId><HostId>Gncp2wjrOy2Juy0RFbuyWjGFCFNSQd8vXIi8sbxhSdR7bi4VmjSlbmRKkUr3dK3+tmewATJSwZw=</HostId></Error>'}

Now RGW return is:

Response: {'status': 404, 'headers': {'date': 'Thu, 25 May 2017 06:38:48 GMT', 'content-length': '270', 'x-amz-request-id': 'tx00000000000000000000e-0059267bf8-1013-default', 'content-type': 'application/xml', 'accept-ranges': 'bytes'}, 'reason': 'Not Found', 'data': '<?xml version="1.0" encoding="UTF-8"?><Error><Code>NoSuchBucketPolicy</Code><Message>The bucket policy does not exist</Message><BucketName>111</BucketName><RequestId>tx00000000000000000000e-0059267bf8-1013-default</RequestId><HostId>1013-default-default</HostId></Error>'}

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
 2017-06-09 19:53:26 +08:00
zhanglei
31d0d37482 os/bluestore/BlueFS:.slow should be compared with dirname 
Signed-off-by: zhanglei <243290414@qq.com>
 2017-06-09 05:38:24 -04:00
Jos Collin
9eda2bb9ff Merge pull request #15570 from joscollin/wip-cleanup-testmsgr-warning 
test/msgr: silence warnings from -Wsign-compare

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
 2017-06-09 12:30:35 +05:30
linbing
13488adf30 osd: the condition of last epoch <= superblock.newest_map epoch has been 
check before we puts diff osdmap to transaction, it's unnecessary to
check it again after that. last and superblock.newest_map does not
be changed during that time.

Signed-off-by: linbing <linbing@t2cloud.net>
 2017-06-09 10:14:59 +08:00
Sage Weil
f7187559af Merge pull request #15100 from kestrels/wip-crc32c-fastzero2 
crc32c: Add ppc64le fast zero optimized assembly.

Reviewed-By: Piotr Dałek <piotr.dalek@corp.ovh.com>
 2017-06-08 20:39:59 -05:00
Sage Weil
dc3b053fd5 Merge pull request #15387 from jecluis/wip-20123 
mon/PGMap: show %used in formatted output

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-06-08 20:39:33 -05:00
Sage Weil
642fe3bc3e Merge pull request #15508 from tchaikov/wip-ceph.in-cleanup 
ceph.in: drop the compatiiblity to handle non json commands
 2017-06-08 20:39:15 -05:00
Sage Weil
6c776f5d8a Merge pull request #15560 from dmick/master 
mgr/DaemonServer.cc: log daemon type string as well as id

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
 2017-06-08 20:38:58 -05:00
Sage Weil
c2e346cf12 Merge pull request #15562 from tchaikov/wip-no-assert.h 
common,osdc: remove atomic_t completely

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-08 20:38:23 -05:00
Sage Weil
6f561c8c77 Merge pull request #15567 from Fabian-Gruenbichler/pull/logrotatesync 
debian: sync logrotate packaging with downstream

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-08 20:38:08 -05:00
Sage Weil
860d5cee28 Merge pull request #15578 from jcsp/wip-mgr-cleanup 
mgr: cleanup, stop clients sending in perf counters

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-06-08 20:37:53 -05:00
Sage Weil
840eb7fa88 Merge pull request #15582 from liewegas/wip-20226 
osd: take PGRef for recovery sleep wakeup event

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-06-08 20:37:27 -05:00
Sage Weil
c1c4a59db7 pybind/mgr/dashboard: monkeypatch os.exit to stop cherrypy from taking down mgr 
Fixes: http://tracker.ceph.com/issues/20216
Suggested-by: Tim Serong <tserong@suse.com>
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-08 18:12:02 -04:00
Sage Weil
1101661a2b Merge pull request #15405 from liewegas/wip-rest-test 
pybind/mgr/restful: improve cert handling; work with vstart

Reviewed-by: Boris Ranto <branto@redhat.com>
 2017-06-08 17:07:22 -05:00
Sage Weil
0f23f35210 debian/control: Build-Depends on python-pecan 
This is needed for make check (so that restful mgr module can load).

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-08 17:45:47 -04:00
Sage Weil
f05a34aff2 Merge pull request #15557 from liewegas/wip-mgr-respawn 
mgr/MgrStandby: respawn when deactivated

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-06-08 15:45:52 -05:00
Casey Bodley
babd25fa36 Merge pull request #15301 from shashalu/rgw-ssl 
rgw: add "rgw_verify_ssl" config

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-08 16:01:47 -04:00
Casey Bodley
734083b0ea Merge pull request #15257 from shashalu/fix-rgw-admin-retcode 
rgw: fix radosgw-admin retcode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-08 16:00:02 -04:00
Casey Bodley
43cad44cb3 Merge pull request #14950 from fangyuxiangGL/set-obj-accounted-size 
rgw: set object accounted size correctly

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-06-08 15:59:20 -04:00
Sage Weil
30ae537a55 mgr/Mgr: fix deadlock in load_config 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-08 14:30:10 -04:00
Sage Weil
390ad9031f pybind/mgr/dashboard: get_localized_config for server_{addr,port} 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-06-08 14:30:10 -04:00