RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 00:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,553 Commits 212 Branches 394 Tags 1.5 GiB
5c1f4d2925
Commit Graph

84553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Dias
5a861f5fb1
Merge pull request #20870 from rjfd/wip-dashboard-tasks 
mgr/dashboard: asynchronous task support

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
 2018-03-28 08:27:51 +01:00
Ricardo Dias
dca2554a9c
Merge pull request #20884 from zouaiguo/wip_for_mgr_rbd_info 
mgr/dashboard: add image id to mgr rbd info instead of block_name_prefix

Reviewed-by: Ricardo Dias <rdias@suse.com>
 2018-03-28 08:22:52 +01:00
xie xingguo
955d79c6e0 intarith: get rid of ROUND_UP* macros 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-03-28 14:53:10 +08:00
xie xingguo
e0c76911b3 intarith: kill P2* macros 
These macros are originally introduced in https://github.com/ceph/ceph/pull/10128
and get replaced by https://github.com/ceph/ceph/pull/19913.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-03-28 14:53:03 +08:00
runsisi
5f975cdcc0 mon/Elector: remove unused member fields start_stamp and ack_stamp 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2018-03-28 11:36:37 +08:00
lvshanchun
056ad808db mgr: summarize mon metrics in MMgrReport and sent it 
Signed-off-by: lvshanchun <lvshanchun@gmail.com>
 2018-03-28 11:08:34 +08:00
lvshanchun
e0dedf173f mon: send health_metrics to mgr 
Signed-off-by: lvshanchun <lvshanchun@gmail.com>
 2018-03-28 11:08:34 +08:00
lvshanchun
714ffe0d5f mgr,osd: make osd_metric more popular 
Signed-off-by: lvshanchun <lvshanchun@gmail.com>
 2018-03-28 11:08:34 +08:00
lvshanchun
5b6104a1f6 mon: add admin command to dump historic/slow ops 
Signed-off-by: lvshanchun <lvshanchun@gmail.com>
 2018-03-28 11:08:34 +08:00
zouaiguo
4840e899f1 [mgr/dashboard] add image id to rbd info instead of block_name_prefix 
when create images use data_pool parameter, such as:
rbd create -p pool1 -s 1G --data-pool pool2  image1

then get image info from mgr use request http://192.7.7.36:7000/rbd_pool_data/pool1
we got the response:
[{"parent_name": "", "parent_pool": 18446744073709551615, "name": "image1", "num_objs": 256, "block_name_prefix": "rbd_data.14.f561643c986", "obj_size": 4194304, "features": 189, "features_name": "fast-diff, layering, exclusive-lock, deep-flatten, object-map, data-pool", "order": 22, "size": 1073741824}]

notice:
since block_name_prefix is deprecated,
from block_name_prefix we can not get image id(the real id is ''f561643c9869')
we need add image id to rbd info instead block_name_prefix

Python 2.7.5 (default, Jun 17 2014, 18:11:42)
[GCC 4.8.2 20140120 (Red Hat 4.8.2-16)] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import rados
>>> import rbd
>>> RADOS_NAME = 'client.admin'
>>> cluster_name="ceph"
>>> cluster_handle = rados.Rados(name=RADOS_NAME, clustername=cluster_name, conffile='')
>>> cluster_handle.connect()
>>> ioctx = cluster_handle.open_ioctx("pool1")
>>> image_inst = rbd.Image(ioctx, "image1")
>>> image_inst.stat()
{'parent_name': '', 'parent_pool': 18446744073709551615L, 'num_objs': 256L, 'block_name_prefix': u'rbd_data.14.f561643c986', 'obj_size': 4194304L, 'order': 22, 'size': 1073741824L}
>>> image_inst.id()
u'f561643c9869'

after fix:

[root@tfg36 site-packages]# curl http://192.7.7.36:7000/rbd_pool_data/pool1
[{"parent_name": "", "parent_pool": 18446744073709551615, "name": "image1", "num_objs": 256, "block_name_prefix": "rbd_data.14.f561643c986", "obj_size": 4194304, "features": 189, "id": "f561643c9869", "features_name": "fast-diff, layering, exclusive-lock, deep-flatten, object-map, data-pool", "order": 22, "size": 1073741824}]

Signed-off-by: zouaiguo <zou.aiguo@zte.com.cn>
 2018-03-28 10:14:42 +08:00
Kefu Chai
3b164cb252
Merge pull request #21064 from Songweibin/wip-spell-error 
osd: correct several spell errors in comments

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-28 10:03:05 +08:00
Josh Durgin
03f9826927
Merge pull request #21051 from neha-ojha/wip-doc-async-recovery 
doc: dev description of async recovery

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2018-03-27 17:55:20 -07:00
Kefu Chai
423eb018de
Merge pull request #21023 from Liuchang0812/delete-asok-directories 
test: delete asok directories correctly

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-28 08:38:50 +08:00
Kefu Chai
9d8a64f061
Merge pull request #21052 from zhsj/fix-distro-detect-test 
test: remove distro_version assert in distro detect test

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-28 08:30:06 +08:00
Neha Ojha
5cc9252784 doc: dev description of async recovery 
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
 2018-03-27 15:01:17 -07:00
Patrick Donnelly
607f6024d1
Merge PR #20798 into master 
* refs/pull/20798/head:
	ceph-fuse: trim ceph-fuse -V output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-03-27 14:54:47 -07:00
Patrick Donnelly
cc6b607a55
Merge PR #20828 into master 
* refs/pull/20828/head:
	client: cleanup ::_read return

Reviewed-by: Jeff Layton <jlayton@redhat.com>
 2018-03-27 14:54:40 -07:00
Patrick Donnelly
272b6f641c
Merge PR #20854 into master 
* refs/pull/20854/head:
	client: add ctime/btime to Inode dump

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
 2018-03-27 14:54:34 -07:00
Patrick Donnelly
2320106ab0
Merge PR #20908 into master 
* refs/pull/20908/head:
	ceph-fuse: Fix Segmentation fault --localize-reads

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-03-27 14:54:27 -07:00
Patrick Donnelly
5a6c248fa0
Merge PR #20913 into master 
* refs/pull/20913/head:
	client: add ceph_ll_sync_inode

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
 2018-03-27 14:54:21 -07:00
Patrick Donnelly
d007cf9fa9
Merge PR #20997 into master 
* refs/pull/20997/head:
	client: fix Client::_read return
 2018-03-27 14:54:15 -07:00
Patrick Donnelly
c0a70f31f7
Merge PR #21012 into master 
* refs/pull/21012/head:
	Document the new '$' suite file

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-03-27 14:46:56 -07:00
Nathan Cutler
b775260f81 doc: mgr/dashboard.rst: mgr initial modules can take a list 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2018-03-27 21:43:25 +02:00
Nathan Cutler
83d4a3c53f doc: mgr/dashboard.rst: mention ceph.conf and ceph mgr services 
Also break down the "Configuration" section into three separate sub-sections
for clarity.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2018-03-27 21:43:25 +02:00
Mykola Golub
9ecd4680d2 test/librados_test_stub: always create copy of buffers passed to operation 
Otherwise the buffers may be shared between object files if the same
bufferlist was passed to several operations (append and write_full were
affected).

Signed-off-by: Mykola Golub <mgolub@suse.com>
 2018-03-27 21:27:50 +03:00
Alfredo Deza
b2fc3fac30
Merge pull request #21070 from ceph/wip-cv-vagrant-reload 
ceph-volume improve robustness when reloading vms in tests

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
 2018-03-27 13:31:55 -04:00
John Spray
c7049c103a
Merge pull request #20494 from wido/influx-time-fixes 
mgr/influx: Various time fixes

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-03-27 17:45:19 +01:00
Kefu Chai
625faf00bd
Merge pull request #21063 from guzhongyan/bs-cleanup 
os/bluestore: remove unused variable.

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2018-03-28 00:31:25 +08:00
Kefu Chai
5b5638ebef
Merge pull request #21043 from wido/zabbix-osd-numpgs 
mgr/zabbix: Send max, min and avg PGs of OSDs to Zabbix

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-03-27 22:59:22 +08:00
Kefu Chai
c9903b5b9c
Merge pull request #21037 from guzhongyan/bf-format 
os/bluestore: fix some code formatting

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
 2018-03-27 22:56:57 +08:00
Kefu Chai
7b20a15020
Merge pull request #20951 from tchaikov/wip-FTBFS-bluestore-armhf 
bluestore: fix build on armhf

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-03-27 22:55:41 +08:00
Kefu Chai
648a3111a0
Merge pull request #21034 from rzarzynski/wip-bs-reorder-bluefs_extent_t 
os/bluestore: reorder members of bluefs_extent_t for space efficiency

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-03-27 22:54:59 +08:00
Kefu Chai
f2545d2b84
Merge pull request #20900 from ifed01/wip-ifed-fix-interals-in-repair 
os/bluestore: bluestore repair should use interval_set::union_insert

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-03-27 22:53:54 +08:00
Kefu Chai
fc86c2b76f
Merge pull request #20774 from rishabh-d-dave/fix-tilde-expansion 
config: expand tilde for ~/.ceph/$cluster.conf

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-27 22:44:33 +08:00
Kefu Chai
a1f204edf5
Merge pull request #20558 from chardan/jfw-wip-show_compression_methods-22420 
osd,compressor: Expose compression algorithms via MOSDBoot.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-27 22:43:23 +08:00
Kefu Chai
81b00f58e0
Merge pull request #20314 from ovh/bp-librados-nntk 
librados: extend C API for so it accepts keys with NUL chars

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-03-27 22:41:04 +08:00
Alfredo Deza
3be723d4d9 ceph-volume tests create a retry script for vagrant reload 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-03-27 10:16:28 -04:00
Alfredo Deza
b1b9c7a416 ceph-volume tests use a reload script in simple functional tests 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-03-27 09:49:52 -04:00
Alfredo Deza
a54f503786 ceph-volume tests use a reload script in lvm functional tests 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-03-27 09:49:36 -04:00
Sebastian Wagner
452992b178 mgr/dashboard: Fix objects named default are inaccessible 
These two calls to `default()` are identical: `vpath` and
params` are both empty:

$ curl 'http://localhost/api/cp_path/'

and

$ curl 'http://localhost/api/cp_path/default'

But we need to dinstinguish them. To fix this, we need
to add the missing `default`

We now require that all exposed controllers have a @ApiController
decorator.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-27 15:20:42 +02:00
Sebastian Wagner
fdde9057b2 mgr/dashboard: Use @ApiController for PerfCounters 
The next commit will require that all controllers
have a `@ApiController` decorator.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-27 15:20:07 +02:00
Ricardo Dias
9f11a68b7f
mgr/dashboard: task manager unit tests implementation 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 14:08:48 +01:00
Ricardo Dias
e2fb3926cf
mgr/dashboard: add task manager usage instructions to HACKING.rst 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 14:08:48 +01:00
Ricardo Dias
067b86eb42
mgr/dashboard: added tasks info to summary controller 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 14:08:47 +01:00
Ricardo Dias
6d5279ddd6
mgr/dashboard: async tasks controller 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 14:08:47 +01:00
Ricardo Dias
404e2516a8
mgr/dashboard: Asynchronous tasks implementation 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 14:08:47 +01:00
Kefu Chai
0daccfb495 mon: mark mgr reports and osd_failure as no_reply 
see also: #20517

Fixes: http://tracker.ceph.com/issues/22114
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-03-27 21:04:18 +08:00
Ricardo Dias
ce8c489db8
mgr/dashboard: implemented NotificationQueue listener removal 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 13:47:36 +01:00
Ricardo Dias
11b6c93028
mgr/dashboard: fix NotificationQueue waiting loop 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 13:45:41 +01:00
Ricardo Dias
6b0afa3ab6
mgr/dashboard: Support for handler priorities in NotificationQueue 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 13:45:41 +01:00