RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,492 Commits 216 Branches 395 Tags 1.4 GiB
ed54ece0cd
Commit Graph

3361 Commits

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
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
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
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
Lenz Grimmer
d5e54fda5c
Merge pull request #21024 from s0nea/wip-dashboard-return-features-list 
mgr/dashboard: Convert the RBD feature names to a list of strings

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
 2018-03-27 11:45:54 +02:00
Lenz Grimmer
914faf2c1e
Merge pull request #21004 from s0nea/wip-dashboard-skip-datapool-testcase 
mgr/dashboard: skip data pool testcase for none-bluestore clusters

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
 2018-03-27 11:43:18 +02:00
Lenz Grimmer
43e5097c2f
Merge pull request #20873 from sebastian-philipp/dashboard_v2-simple-html-debug 
mgr/dashboard: Add minimalistic browsable API

Reviewed-by: Patrick Nawracay <pnawracay@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
 2018-03-27 11:31:07 +02:00
Casey Bodley
6b59fbfcc6
Merge pull request #21027 from cbodley/wip-qa-swift-force-branch 
qa/tasks/swift: add support for the "force-branch" configurable.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
 2018-03-26 14:27:46 -04:00
Sebastian Wagner
7a7a17caa9 mgr/dashboard: New API tests for perf_couters 
Added OSD and MDS tests.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-26 17:16:41 +02:00
Ricardo Dias
a392e612cc
Merge pull request #21007 from rjfd/wip-dashboard-fix-py3 
mgr/dashboard: fix dashboard python 3 support

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-26 10:59:17 +01:00
Ricardo Dias
d5763de318
Merge pull request #20865 from sebastian-philipp/dashboard_v2_pool-create 
mgr/dashboard: Add Pool-create to the backend

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
 2018-03-26 10:07:15 +01:00
Tatjana Dehler
33e15ecd39 mgr/dashboard: convert RBD features to a list of strings 
Until now the API returns the features provided by an RBD as one comma
separated string. It's more usable for the frontend to receive a list
of strings instead.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
 2018-03-26 09:41:56 +02:00
Radoslaw Zarzynski
c5859f25e6 qa/tasks/swift: add support for the "force-branch" configurable. 
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
 2018-03-23 12:40:05 -04:00
Nathan Cutler
f1936a2702
Merge pull request #21013 from dzafman/wip-remove-bc 
test: Replace bc command with printf command

Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2018-03-23 17:28:02 +01:00
Sebastian Wagner
cbee371958 mgr/dashboard: Add Teuthology test for /api/pool/_info 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-23 16:40:18 +01:00
Sebastian Wagner
dd18675e4f mgr/dashboard: Minor tweak to DashboardTestCase._request 
Don't fall through silently.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-23 16:40:18 +01:00
Sebastian Wagner
e6c1056ad5 mgr/dashboard: Add create() to Pool controller 
Also:

* Added tests.
* Renamed `DashboardTest` to `PoolTest`.
* Added `delete()`.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-23 16:40:18 +01:00
Yuri Weinstein
6a5bab7dd4
Merge pull request #20981 from cbodley/wip-qa-fix-ssl 
qa: fix overrides for openssl_keys task

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
 2018-03-23 06:55:10 -07:00
Ricardo Dias
d101b33bc7 qa/tasks/mgr/dashboard: Fix login expires too soon 
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
 2018-03-23 11:30:16 +01:00
Tatjana Dehler
075102468b mgr/dashboard: skip 'test_create_rbd_in_data_pool' without bluestore 
Skip the test case 'test_create_rbd_in_data_pool' only if the cluster
does not support bluestore, otherwise run the test. The Ceph mgr
provides the information if the cluster supports bluestore or not, so
the test will be skipped depending on the current cluster.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
 2018-03-23 11:11:27 +01:00
Tatjana Dehler
25a0ed93ec mgr/dashboard: add 'osd metadata' command call 
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
 2018-03-23 11:11:17 +01:00
David Zafman
293ac9895f test: Replace bc command with printf command 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-22 17:19:56 -07:00
Warren Usui
a19eaf22a2 Document the new '$' suite file 
Including the $ in a directory of yaml files causes teuthology to randomly
select one of the yaml files in that directory.

Signed-off-by: Warren Usui <wusui@redhat.com>
 2018-03-23 00:02:11 +00:00
Ricardo Dias
25c75a952d
mgr/dashboard: fix dashboard python 3 support 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-22 15:56:20 +00:00
Casey Bodley
cfe4ba6342 qa: fix overrides for openssl_keys task 
teuthology looks for overrides by the class name, so overrides weren't
working after the task was renamed

Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2018-03-22 10:31:08 -04:00
Sage Weil
038afcbc2a Merge remote-tracking branch 'gh/mimic-dev2' 2018-03-18 18:39:46 -05:00
Sage Weil
9424ed8506 Merge PR #20879 into wip-sage-testing-20180316.201311 
* refs/pull/20879/head:
	qa/rgw: disable s3tests for lifecycle_expiration

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2018-03-16 15:13:19 -05:00
Sage Weil
b1c045cf33 wa/standalong/mon/osd-pool-create: debug and increase delay 
Signed-off-by: Sage Weil <sage@redhat.com>
 2018-03-16 10:35:32 -05:00
Casey Bodley
1f50f19cc1
Merge pull request #20863 from rjfd/wip-qa-fix-ssl-conflict 
qa/rgw: renamed ssl task to openssl_keys

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-03-16 09:04:10 -04:00
Ricardo Dias
7b774f1bb0
qa/suites/rados/mgr/tasks/dashboard: add fail_on_skip = false 
This commit prevents dashboard API tests to be tagged as failed when
some test is decorated with @skip.

Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-16 08:40:42 +00:00
Ricardo Dias
aa205a6731
mgr/dashboard: renamed dashboard_v2 to dashboard 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-16 07:23:08 +00:00
Ricardo Dias
ed291d9e4d
mgr/dashboard: remove dashboard module 
Signed-off-by: Ricardo Dias <rdias@suse.com>
 2018-03-16 07:23:04 +00:00
Kefu Chai
23c130b338
Merge pull request #20916 from tspmelo/fix-mgr-perf-counter 
mgr/dashboard_v2: fix test_perf_counters_mgr_get

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-16 11:23:02 +08:00
Josh Durgin
9b72808469
Merge pull request #19811 from neha-ojha/wip-async-recovery 
osd: async recovery

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
 2018-03-15 15:39:34 -07:00
Sage Weil
69642f0e14 Merge remote-tracking branch 'gh/mimic-dev2' 
# Conflicts:
#	qa/standalone/osd/repro_long_log.sh
 2018-03-15 16:02:30 -05:00
Sage Weil
d505f4d429
Merge pull request #20918 from liewegas/wip-less-many 
qa/suites/rados: fewer msgr failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2018-03-15 15:59:42 -05:00
Neha Ojha
7f6f4f90fe qa: modify TEST_recovery_sizeup() to handle async recovery 
Signed-off-by: Neha Ojha <nojha@redhat.com>
 2018-03-15 11:13:34 -07:00
Sage Weil
69765a788e qa/standalone/osd/repro_long_log: no-mon-config for cot 
Signed-off-by: Sage Weil <sage@redhat.com>
 2018-03-15 08:42:14 -05:00
Sage Weil
ef7eaa48be qa/suites/rados: fewer msgr failures 
500 is a bit much... e.g., enough to hit timeouts forming mon quorum.

Signed-off-by: Sage Weil <sage@redhat.com>
 2018-03-15 08:39:28 -05:00
Tiago Melo
a2033e0845 mgr/dashboard_v2: fix test_perf_counters_mgr_get 
Now that we can obtain perf counters for the mgr, we need to assert that we get
more than 0 counters and that they have the desired structure.

Fixes: https://tracker.ceph.com/issues/23378

Signed-off-by: Tiago Melo <tmelo@suse.com>
 2018-03-15 12:50:58 +00:00
Josh Durgin
360bc69bcf
Merge pull request #20901 from neha-ojha/wip-fix-mgr 
qa/tasks/ceph_manager: use set_config on revived osd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2018-03-14 15:27:39 -07:00
Neha Ojha
e3899dc901 qa/tasks/ceph_manager: use set_config on revived osd 
Signed-off-by: Neha Ojha <nojha@redhat.com>
 2018-03-14 12:37:56 -07:00
David Zafman
8a7e6c2349
Merge pull request #20220 from dzafman/wip-calc-stats3 
osd: Improve recovery stat handling by using peer_missing and missing_loc info

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-03-14 11:07:44 -07:00
David Zafman
af85f3cc48 test: osd-backfill-stats.sh parallel osd-recovery-stats.sh check() changes 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-14 10:07:11 -07:00
David Zafman
acc1f80684 test: Use "(est)" in log message when an osd doesn't have peer_missing 
Consolidate check() code and common script code
TEST_recovery_multi() wasn't reliable due to delayed peer_missing

Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-14 10:07:11 -07:00
David Zafman
12e331b742 test: osd-recovery-stats.sh: New test with different missing objs on multiple OSDs 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-14 10:07:11 -07:00
David Zafman
09b5697ba2 test: Correction for better degraded/misplaced handling 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-14 10:07:11 -07:00
David Zafman
d7fd9174b9 osd: Fix for handling more than 1 missing target 
Fix test case to test more than 1 target

Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-14 10:07:03 -07:00
Lenz Grimmer
78022e13e7
Merge pull request #20751 from s0nea/wip-mgr-dashboard_rbd_add 
mgr/dashboard_v2: Add RBD create functionality to the Python backend

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
 2018-03-14 15:57:32 +01:00
Tatjana Dehler
5056cbacbf mgr/dashboard: Add RBD create functionality 
This commit adds a basic RBD create functionality to the REST API. It enables
the POST request of the http://<host>:<port>/api/rbd API endpoint.

The commit adds also related tests.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
 2018-03-14 10:38:43 +01:00