RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,983 Commits 211 Branches 394 Tags 1.4 GiB
5e34b7480c
Commit Graph

82983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
5e34b7480c mgr: import absolute_import to enforce absolute_import 
to make sure new "import" statements in future in these files do not
assume relative import.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:16 +08:00
Kefu Chai
92af0732ea pybind/mgr/restful: move global variable into context.py 
otherwise we need to tackle with the circular import. it's not fatal, if
we can "import foo" in py2 and "from . import foo" in py3, respectively.
but we cannot unify them using "from . import foo", because the circular
reference issue. and conditionalize the import statement is ugly. so, i
think we'd better break the loop. so i am moving the "instance" variable
into its own file.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:16 +08:00
Kefu Chai
5f89243046 restful: various py3 fixes 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:16 +08:00
Kefu Chai
c8baadf3c0 cmake: depend on the right version of python bindings 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:16 +08:00
Kefu Chai
477595de48 vstart.sh: set PYTHONPATH correctly 
it varies depending on the major version of the python we are using.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:16 +08:00
Kefu Chai
3b58a1c18c vstart.sh: introduce get_cmake_variable() 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:16 +08:00
Kefu Chai
8039c46d49 init-ceph: s/lib.2/lib.$MGR_PYTHON_VERSION_MAJOR/ 
we should not hardwire cython_modules's path to lib.2, it should be
cython_modules/lib.3 if ceph-mgr requires python3.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:15 +08:00
Kefu Chai
410ce76f62 mgr: load ceph_{logger,module} globally 
no need to add them for each sub-interpreter. extensions are shared
among them.

Fixes: http://tracker.ceph.com/issues/22880
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:12:15 +08:00
Kefu Chai
b09f754ecb pybind/mgr: use relative import 
* in python3, we cannot assume default relative import. instead, we should
  be explicit. also, only import the `Module` and `StandbyModule` classes
  from plugins, as they are what we are interested.
* and import urllib.parse in python3.

Fixes: http://tracker.ceph.com/issues/22880
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:11:38 +08:00
Kefu Chai
91f83cc0a5 pybind/mgr: fix the TabError error 
018-02-08 18:50:10.790 7fcfbb679700 -1 mgr[py] Module not found:
'dashboard'
2018-02-08 18:50:10.790 7fcfbb679700 -1 mgr[py] Traceback (most recent
call last):
  File "/var/ceph/ceph/src/pybind/mgr/dashboard/__init__.py", line 2, in
<module>
    from . module import Module  # NOQA
  File "/var/ceph/ceph/src/pybind/mgr/dashboard/module.py", line 1189
    template = env.get_template("rgw_detail.html")
                                                 ^
TabError: inconsistent use of tabs and spaces in indentation

Fixes: http://tracker.ceph.com/issues/22880
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 14:10:00 +08:00
Kefu Chai
511fc9c4b2
Merge pull request #20378 from tchaikov/wip-os-perf-stat-in-ns 
osd: check feature bits when encoding objectstore_perf_stat_t

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-02-11 09:53:40 +08:00
Kefu Chai
7bb4761d52
Merge pull request #20275 from badone/wip-osdmonitor-unused-function 
mon/OSDMonitor: Comment out unused function

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-02-11 09:52:10 +08:00
Kefu Chai
4c43c67d6d
Merge pull request #20371 from tchaikov/wip-admin_socket_output 
test/admin_socket_output: add --vstart=path/to/asok option

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
 2018-02-11 09:51:04 +08:00
Kefu Chai
7e36b630a0
Merge pull request #20227 from rzarzynski/wip-bs-final-aiocontexts 
os/bluestore: mark derivatives of AioContext as final.

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-02-11 01:24:31 +08:00
Mykola Golub
7a2b56c28a
Merge pull request #20376 from dillaman/wip-22873 
librbd: auto-remove trash snapshots when image is deleted

Reviewed-by: Mykola Golub <mgolub@suse.com>
 2018-02-10 08:53:35 +02:00
Jason Dillaman
82ef376e80 librbd: auto-remove trash snapshots when image is deleted 
Fixes: http://tracker.ceph.com/issues/22873
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2018-02-09 13:34:55 -05:00
Igor Fedotov
774773e3ae
Merge pull request #20387 from ifed01/wip-ifed-fio-build-fix 
test/fio: fix build failure caused by sequencer replacement.
 2018-02-09 18:35:25 +03:00
John Spray
4e2748d3a4
Merge pull request #20043 from Rubab-Syed/configuration_setting_browser 
mgr/dashboard: add configuration setting browser

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-02-09 15:22:51 +00:00
Jason Dillaman
30aed9f9de
Merge pull request #20389 from trociny/wip-cli_generic 
qa/workunits/rbd: fix cli_generic test_purge for rbd default format 1

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-02-09 09:21:57 -05:00
Mykola Golub
57baca0166 qa/workunits/rbd/cli_generic: fix test_purge for rbd default format 1 
Signed-off-by: Mykola Golub <mgolub@suse.com>
 2018-02-09 16:04:43 +02:00
Mykola Golub
8079d23897
Merge pull request #20364 from Songweibin/wip-fix-test-rbd 
test/rbd: cli_generic fails if v1 image format or deep-flatten disabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
 2018-02-09 14:42:27 +02:00
Igor Fedotov
935a1bdb34 tools/ceph-objectstore-tool: do not fail on lack of OI_ATTR for an 
object.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
 2018-02-09 15:00:07 +03:00
Igor Fedotov
7f768dbf62 test/fio: create superblock on mkfs to provide proper tools functioning 
E.g. ceph-objectstore-tool requires that

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
 2018-02-09 14:58:15 +03:00
Igor Fedotov
9f8ae668c1 test/fio: fix build failure caused by sequencer replacement. 
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
 2018-02-09 14:06:15 +03:00
John Spray
e654f2832a
Merge pull request #20372 from tchaikov/wip-mgr-doc 
doc/mgr: remove non user-facing code from doc

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-02-09 10:51:09 +01:00
songweibin
21c3bc3e69 test/rbd: cli_generic fails if v1 image format or deep-flatten disabled 
Fixes: http://tracker.ceph.com/issues/22950

Signed-off-by: songweibin <song.weibin@zte.com.cn>
 2018-02-09 16:17:27 +08:00
Kefu Chai
01d350f388
Merge pull request #20382 from tchaikov/wip-fix-ftbfs-store-test 
test/store_test: fix FTBFS as Sequencer is removed

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-02-09 14:39:49 +08:00
Kefu Chai
6e90be1ac9 check feature bits when encoding objectstore_perf_stat_t 
OS_PERF_STAT_NS feature bit is added. it's sharing the same bit with
QOS_DMC.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-09 14:31:48 +08:00
Kefu Chai
3a7cac0684 test/store_test: fix FTBFS as Sequencer is removed 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-09 13:05:25 +08:00
Kefu Chai
5757d6f118
Merge pull request #20294 from rzarzynski/wip-bs-drop-std_function 
os/bluestore: avoid overhead of std::function in blob_t.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-02-09 10:45:24 +08:00
Kefu Chai
24d1b2edb4
Merge pull request #19232 from socketpair/precision 
mgr: increase time resolution of Commit/Apply OSD latencies.

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-02-09 10:44:27 +08:00
Kefu Chai
34c3af45a5
Merge pull request #18804 from majianpeng/bluestore-collection-prealloc 
os/bluestore: Prealloc memory avoid realloc in list_collection.

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-02-09 10:43:24 +08:00
Kefu Chai
7894961e9f
Merge pull request #18494 from ifed01/wip-stupidalloc-fix2 
os/bluestore: do not assert if BlueFS rebalance is unable to allocate sufficient space

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-02-09 10:42:43 +08:00
Kefu Chai
a82cad5839
Merge pull request #18343 from shinobu-x/sk-remove-osdmap 
mon/PGMap: Remove unnecessary header

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-02-09 10:41:50 +08:00
Patrick Donnelly
8c95cc5144
Merge PR #19954 into master 
* refs/pull/19954/head:
	test/encoding: refactor to avoid escaping shell magic
	mds: minor refactor of SimpleLock
	mds: track Capability in mempool
	mds: move CInode container members to mempool
	mds: move CDentry container members to mempool
	mds: move CDir container members to mempool
	mds: put MDSCacheObject compact_map in mempool
	common: use size_t for object size
	mds: convert to allocator agnostic string_view
	mds: simplify initialization
	compact_*: support mempool allocated containers

Reviewed-by: Zheng Yan <zyan@redhat.com>
 2018-02-08 18:17:15 -08:00
Jason Dillaman
7b7a7d55b1
Merge pull request #20007 from mogeb/steady-clock-librbd 
librbd: use steady clock to measure elapsed time in AioCompletion

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-02-08 19:20:21 -05:00
Jason Dillaman
5029ee8a60
Merge pull request #20008 from mogeb/steady-clock-tools-rbd 
tools/rbd: use steady clock in bencher

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-02-08 19:20:07 -05:00
Jason Dillaman
7b79305f60
Merge pull request #20218 from shun-s/wip-speedup-diskusage-resize 
librbd: speed up object map disk usage and resize

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-02-08 19:19:52 -05:00
Jason Dillaman
6d5652125c
Merge pull request #20311 from Songweibin/wip-group-snap-ls 
rbd: do not show title if there is no group snapshot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-02-08 19:19:35 -05:00
Jason Dillaman
6c3d5aa149
Merge pull request #20349 from trociny/wip-22932 
rbd-mirror: fix potential infinite loop when formatting status message

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-02-08 19:19:12 -05:00
Patrick Donnelly
84ae0ce5fc
Merge PR #20310 into master 
* refs/pull/20310/head:
	qa: adjust cephfs full test for kclient

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-02-08 13:30:04 -08:00
Patrick Donnelly
65217e5363
Merge PR #20148 into master 
* refs/pull/20148/head:
	mds: reset connection's priv when marking down connection
	mds: fix session reference leak

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-02-08 13:05:26 -08:00
Patrick Donnelly
b0afc33811
Merge PR #20155 into master 
* refs/pull/20155/head:
	osdc/Journaler: make sure flush() writes enough data

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-02-08 13:05:19 -08:00
Patrick Donnelly
e8e72570fe
Merge PR #20190 into master 
* refs/pull/20190/head:
	mon: allow removal of tier of ec overwritable pool

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
 2018-02-08 13:05:12 -08:00
Patrick Donnelly
06b176b362
Merge PR #20200 into master 
* refs/pull/20200/head:
	client: add cap_dirtier_uid/gid to CapSnap

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2018-02-08 13:05:05 -08:00
Patrick Donnelly
cb03b5e7f5
Merge PR #20246 into master 
* refs/pull/20246/head:
	mds: remove extra 0x in ino prints
	mds: print inode number not CInode ptr
 2018-02-08 13:04:54 -08:00
Kefu Chai
789b23ad85 doc/mgr: remove none user-facing code from doc 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-09 01:47:35 +08:00
Kefu Chai
5613fe38a9 test/test_admin_socket_output: allow different asok directory 
the asok files are not necessary located in ./out, actually, they are
put in $TMPDIR/ceph-asok.$random_stuff .

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-08 22:37:54 +08:00
Kefu Chai
1979b011ae test/admin_socket_output: no need to create a copy of fs::path 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-02-08 22:37:53 +08:00
Alfredo Deza
7a5777183e
Merge pull request #20367 from ceph/simple-custom-cluster 
ceph-volume: adds custom cluster name support to simple

Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2018-02-08 08:48:41 -05:00