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
84,706 Commits 212 Branches 394 Tags 1.6 GiB
507b872858
Commit Graph

84706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kefu Chai
9ad7407222 osd: cap snaptrimq_len at 2^32 
(uint64_t)(1 << 31) evaluates to 0xffffffff80000000 instead of 0x80000000,
because the converted signed number is sign-extended.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-03-29 13:44:09 +08:00
Neha Ojha
6aceb66524
Merge pull request #21104 from neha-ojha/wip-minimal-perf-suite 
qa/suites: add minimal performance suite

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Varada Kari <varada.kari@gmail.com>
 2018-03-28 20:31:30 -07:00
Yan, Zheng
754eb4d200 mds: cleanup MDCache::open_snaprealms() 
don't retry if all snaprealms' parent are open

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2018-03-29 11:10:20 +08:00
Kefu Chai
60d1787596
Merge pull request #21092 from runsisi/wip-osdmon-log 
mon/OSDMonitor: logging non-active osd id when handling osd beacon

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-03-29 09:06:57 +08:00
Kefu Chai
9502b121a1
Merge pull request #21091 from runsisi/wip-elector-cleanup 
mon/Elector: remove unused member fields start_stamp and ack_stamp

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-29 09:06:25 +08:00
Kefu Chai
5cd64fdf86
Merge pull request #21085 from xiexingguo/wip-kill-p2-macros 
intarith: get rid of  P2* and ROUND_UP* macros

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-29 09:05:47 +08:00
Kefu Chai
98d766a371
Merge pull request #21082 from zhsj/fix-java9 
cmake: bump target jdk to 1.7

Reviewed-by: Wido den Hollander <wido@42on.com>
 2018-03-29 09:04:42 +08:00
Kefu Chai
bff0d38e32
Merge pull request #21062 from xiexingguo/wip-hobject-cmp 
common/hobject: compare two objects' key directly

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-29 09:04:02 +08:00
Kefu Chai
ff3d489399
Merge pull request #20955 from liewegas/wip-mgr-mkfs-grace 
mon: double mon_mgr_mkfs_grace from 60s -> 120s

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2018-03-29 09:03:16 +08:00
Kefu Chai
ab6e35b41e
Merge pull request #20862 from wido/ipv6-local-address 
common/ipaddr: Do not select link-local IPv6 addresses

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-29 08:59:09 +08:00
Kefu Chai
7e3124faa5
Merge pull request #21081 from majianpeng/rbd-remove-unused-func 
osdc: remove unused function.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2018-03-29 08:58:27 +08:00
Kefu Chai
77a2a1ffca compressor: add zstd back 
it's a regression introduced by 16c3552a

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-03-29 08:54:31 +08:00
ashitakasam
5507f29f9a rgw: comparison between signed and unsigned integer expressions 
Fixes: Change the data type of 'c' from int to size_t in
src/rgw/rgw_civetweb.cc RGWCivetWeb::read_data

Signed-off-by: ashitakasam <694240887@qq.com>
 2018-03-29 08:39:07 +08:00
Neha Ojha
c5484e098e qa/suites: add minimal performance suite 
Signed-off-by: Neha Ojha <nojha@redhat.com>
 2018-03-28 17:36:55 -07:00
Kefu Chai
7dbc67f5e0
Merge pull request #20040 from liewegas/wip-snapmapper 
osd: make snapmapper warn+clean up instead of assert

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-29 08:29:19 +08:00
Pavani Rajula
29da5c03c0 pybind/cephfs: added comments to cephfs.pyx 
Signed-off-by: Pavani Rajula<rpavani1998@gmail.com>
 2018-03-28 23:11:46 +05:30
David Zafman
ce9c029858 test: Eliminate use of bc (use awk) in get_timeout_delays() 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-28 10:24:33 -07:00
David Zafman
ed54ece0cd osd: Need to setsid() now that global_init_daemonize() not used 
Caused by: d55a66c56e

Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-28 10:24:33 -07:00
David Zafman
39adde2655 osd: Improve object_stat_sum_t handling 
Keep post split PGs as inconsistent from original
Keep num_scrub_errors as total of other 2

Signed-off-by: David Zafman <dzafman@redhat.com>
 2018-03-28 10:24:33 -07:00
Igor Fedotov
bcc9715deb os/bluestore: fix broken cap in _balance_bluefs_freespace() 
1 << 31 is cast to signed int that results in huge value when casting to
uint64_t making min() call ineffective.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
 2018-03-28 15:55:48 +03:00
Kefu Chai
2739b6f1c5
Merge pull request #21071 from mkoderer/vstart-fix 
vstart.sh: Fix help text in vstart.sh

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-28 20:31:43 +08:00
Lenz Grimmer
5a65671fbe
Merge pull request #20961 from smithfarm/wip-dashboard-rst 
doc: mgr/dashboard.rst: mention ceph.conf and ceph mgr services

Reviewed-by: Ricardo Dias <rdias@suse.com>
 2018-03-28 14:31:25 +02:00
Jianpeng Ma
e88d0bed57 osdc: remove unused function. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2018-03-28 20:17:12 +08:00
Marc Koderer
0fb5effa7e vstart.sh: Fix help text 
Signed-off-by: Marc Koderer <marc.koderer@sap.com>
 2018-03-28 14:03:04 +02:00
Kefu Chai
f710466995
Merge pull request #21077 from Ashid6/master 
doc: typo fix

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-28 19:04:29 +08:00
Kefu Chai
ea97c120d2
Merge pull request #20660 from Leeshine/wip-mon-op-tracker 
mon,mgr: make  osd_metric more popular and report slow ops to mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-03-28 19:02:35 +08:00
Kefu Chai
e4647dc09c
Merge pull request #21057 from tchaikov/wip-22114 
mon: mark mgr reports as no_reply

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2018-03-28 19:01:58 +08:00
Ashita Dashottar
1e8d753876 doc: typo fix 
Signed-off-by: Ashita Dashottar <AshitaDashottar6@gmail.com>
 2018-03-28 16:15:00 +05:30
Yan, Zheng
002c732dc3 mds: make sure snaptable version > 0 
version 0 snaptable confuses snapshot cache code

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
 2018-03-28 17:55:16 +08:00
Shengjing Zhu
7c511d7924 cmake: bump target jdk to 1.7 
jdk 1.7 was released on 2011. For CentOS 6/7, both have openjdk
1.8. For Debian 8(jessie), Ubuntu 14.04(trusty) have openjdk 1.7.
These are the oldest distributions officially built for during
luminous release.

Since jdk 1.9/9, the minimal supported version is 1.6/6.
jdk 1.0/10(recently released) only supports 1.7/7.
http://openjdk.java.net/jeps/182

Fixes: http://tracker.ceph.com/issues/23458
Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>
 2018-03-28 17:24:07 +08:00
Nathan Cutler
baf4ad63e6 doc: mgr/dashboard.rst: adjust TCP port wording 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2018-03-28 11:01:03 +02:00
runsisi
3972943894 mon/OSDMonitor: logging non-active osd id when handling osd beacon 
Signed-off-by: runsisi <runsisi@zte.com.cn>
 2018-03-28 16:52:58 +08:00
huanwen ren
c903dc2e36 client: fixup warning 
/src/client/Client.cc:8750:11: warning: 'r' may be used uninitialized in this function [-Wmaybe-uninitialized]
int64_t r;

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
 2018-03-28 15:50:44 +08:00
Ricardo Dias
dd03c5e54e
Merge pull request #20976 from sebastian-philipp/dashboard-restcontroller-default-get 
mgr/dashboard: Fix objects named `default` are inaccessible

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
 2018-03-28 08:37:04 +01:00
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