RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-07 10:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,290 Commits 215 Branches 395 Tags 1.6 GiB
267b115c1f
Commit Graph

75290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YankunLi
dc660009af BlueStore:Failure retry for opening file 
Failure retry to open file

Signed-off-by: Yankun Li <lioveni99@gmail.com>
 2017-07-10 16:39:58 +08:00
lu.shasha
c8e07379b0 rgw:multisite: clean up RGWRemoteDataLog unused function 
'RGWRemoteDataLog::get_shard_info' function not used, drop it

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
 2017-07-10 16:14:55 +08:00
Kefu Chai
2bdb6627bf os/filestore: do not free event not added 
if an event fails to be added, it's freed by the callee. so we should
not try to free it again. that address could be re-used by the
allocator, to we might be freeing an irrelevent event.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-07-10 15:45:10 +08:00
Kefu Chai
11914dc351 common/Timer: return false if event not added 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-07-10 15:31:16 +08:00
xie xingguo
6223dc9185 mon/OSDMonitor: guard "osd crush rule create-replicated" 
require Luminous before using the crush device classes.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 11:25:53 +08:00
xie xingguo
379e47e144 osd/OSDMap: apply both pg_upmap and pg_upmap_items 
This allows a more flexible upmap policy by combinating
both pg_upmap and pg_upmap_items.

For example:
./bin/ceph osd pg-upmap 1.0 1 2 3
set 1.0 pg_upmap mapping to [1,2,3]

./bin/ceph osd pg-upmap-items 1.0 1 5
set 1.0 pg_upmap_items mapping to [1->5]

 ./bin/ceph pg ls-by-pool cephfs_data_a
PG_STAT OBJECTS MISSING_ON_PRIMARY DEGRADED MISPLACED UNFOUND BYTES LOG DISK_LOG STATE        STATE_STAMP                VERSION REPORTED UP      UP_PRIMARY ACTING  ACTING_PRIMARY
1.0           0                  0        0         0       0     0   0        0 active+clean 2017-07-10 11:04:53.955681     0'0    22:13 [5,2,3]          5 [5,2,3]              5

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 11:23:36 +08:00
xie xingguo
b90d259aa9 mon/OSDMonitor: improve "osd upmap" error message 
by adding a explicit guide.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 11:23:36 +08:00
xie xingguo
7d07356383 crush: fix potential weight overflow 
E.g.:
./bin/ceph osd crush reweight osd.0 32768

ID WEIGHT      TYPE NAME                                            UP/DOWN REWEIGHT PRIMARY-AFFINITY
-4 32770.00000 root default~hdd
-3           -     host gitbuilder-ceph-rpm-centos7-amd64-basic~hdd
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000
-1 32770.00000 root default
-2           -     host gitbuilder-ceph-rpm-centos7-amd64-basic
 0           -         osd.0                                             up  1.00000          1.00000
 1     1.00000         osd.1                                             up  1.00000          1.00000
 2     1.00000         osd.2                                             up  1.00000          1.00000

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 11:23:36 +08:00
Jiaying Ren
4e04bf3a90 rgw: drop unused rgw_pool param, local var and member var 
+ drop unused rgw_pool parameter in get_raw_obj_ref() and
  get_system_obj_ref(), because each method needs a rgw_raw_obj as
  param which includes its own rgw_pool.
+ drop misc unused local vars rgw_pool.
+ drop member variable pool.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
 2017-07-10 10:22:38 +08:00
Sage Weil
5a197c5817 Merge pull request #16160 from xiexingguo/wip-misc2 
mon, osd: misc fixes and cleanups

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2017-07-09 20:23:13 -05:00
Sage Weil
ce9dfe8ddd Merge pull request #16220 from dzafman/wip-20544 
mon: Fix status output warning for mon_warn_osd_usage_min_max_delta

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-09 20:22:46 -05:00
Sage Weil
7f22400aab Merge pull request #16223 from liewegas/wip-dashboard-default 
pybind/mgr/dashboard: bind to :: by default

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-09 20:20:51 -05:00
xie xingguo
c5b99afa73 test: fix ut and release-notes 
To keep pace with the newly merged https://github.com/ceph/ceph/pull/16027

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:55:15 +08:00
xie xingguo
a9a0bc85ec mon/OSDMonitor: tidy up class_map too on crush removal 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
xie xingguo
6e6ec9d129 crush: use auto for type safety 
class-id, by definition, is of type int32_t, not int.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
xie xingguo
906f0b5bcd crush: fix potential class id collision 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
xie xingguo
d54722f6ad mon/OSDMonitor: "osd crush ls-osd" support 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
xie xingguo
cde4ab096d mon/OSDMonitor: extend "set-device-class" for multiple osds 
This is useful for applying changes to entire subtrees.
For example:

./bin/ceph osd crush set-device-class hdd `./bin/ceph osd ls-tree default`
set osd(s) 0,1,2 to class 'hdd'

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
xie xingguo
c05bff87df crush: fix error handling 
get_bucket() does not return a nullptr on error,
it returns a negative error code instead.

Use the IS_ERR() macro to handle it properly.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
xie xingguo
0c885d6800 osd/OSD: automatically set device class on start 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
xie xingguo
a7ed837f5c crush: allow "osd crush set-device-class" to create class automatically 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-10 08:45:36 +08:00
Yehuda Sadeh
6f491006d3 rgw: register as a service 
support dynamic reload, and also add frontend info

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2017-07-09 14:09:05 -04:00
Sage Weil
ee5835dfb5 mon: make service summary string customizable; simple default 
Eventually the mgr can populate this field with something tailored to the
service.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-09 14:09:05 -04:00
John Spray
2f720a42fc mgr: set hostname propery on ServiceMap services 
Signed-off-by: John Spray <john.spray@redhat.com>
 2017-07-09 14:09:05 -04:00
John Spray
46059900d3 librados: include common daemon metadata in service_daemon_register 
Aside from being generally useful, this uniformity enables ceph-mgr
to have some common information about all the hosts
it knows about; otherwise we would sometimes learn
about a host without e.g. knowing about the cpu/ram/kernel.

Signed-off-by: John Spray <john.spray@redhat.com>
 2017-07-09 14:09:05 -04:00
Sage Weil
8074944e09 mgr: expose daemon status to modules 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-09 14:09:04 -04:00
Sage Weil
9c5ae296ad mgr/PyModules: expose service_map to modules 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-09 14:09:04 -04:00
Sage Weil
aabe0e35a0 librados: allow service registrations 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-09 14:09:04 -04:00
liuchang0812
324e4d2d19 mgr: remove useless headers in MgrStandby.h 
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
 2017-07-09 23:51:20 +08:00
liuchang0812
b26c9db782 tool/ceph: print timeout tips iff verbose 
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
 2017-07-09 23:51:20 +08:00
Joao Eduardo Luis
ed1d11ebdb mon/Monitor: recreate mon session if features changed 
Fixes: http://tracker.ceph.com/issues/20433

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2017-07-09 16:51:08 +01:00
Nathan Cutler
b08b485ce8 Merge pull request #16079 from smithfarm/wip-doc-make-check 
doc: dev: add notes on PR make check validation test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-09 13:14:42 +02:00
Joao Eduardo Luis
b414be7dc4 mon/Monitor: list sessions via admin socket 
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2017-07-09 11:36:42 +01:00
Joao Eduardo Luis
28b5baefbc mon/Paxos: fix annoying formatting spacing 
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2017-07-09 11:36:42 +01:00
Joao Eduardo Luis
4347556759 mon/Session: fix some annoying spacing 
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2017-07-09 11:36:42 +01:00
Sage Weil
3876161e09 mon: shorten 'PRIMARY-AFFINITY' -> 'PRI-AFF' column header 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:35:22 -04:00
Sage Weil
2fc348741b mon: include device class in 'osd tree' output 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:35:22 -04:00
Sage Weil
d0a3dd09ed mon: include class in 'osd df [tree]' output 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:35:22 -04:00
Sage Weil
116cf759c8 crush: hide device class shadow roots from tree dumper 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:35:21 -04:00
Sage Weil
8b21c6b6fd Merge pull request #16027 from liewegas/wip-crush-rule-class 
mon,crush: create crush rules using device classes for replicated and ec pools via cli

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2017-07-08 21:34:13 -05:00
Sage Weil
0c79c4ffac Merge pull request #16228 from smithfarm/wip-rados-upgrade-2 
tests: fix rados/upgrade/jewel-x-singleton and make workunit task handle repo URLs not ending in ".git"

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-08 21:32:36 -05:00
Sage Weil
ab9a661eaa mgr: implement 'service dump' and 'service status' 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:31:01 -04:00
Sage Weil
97cfc3cb69 mgr: allow/track service registrations 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:30:28 -04:00
Sage Weil
e084f594ee mon: include services in 'ceph -s' 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:30:28 -04:00
Sage Weil
3f69d083a0 mon: persist ServiceMap 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:30:28 -04:00
Sage Weil
7fce6382f2 mgr: add ServiceMap 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:30:27 -04:00
Sage Weil
563e040895 vstart.sh: give rgw daemons letter names 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:30:27 -04:00
Sage Weil
a22b256bad mgr: index daemon state by string service type 
If we use a string we can allow for other service names like
'rgw' and 'rbd-mirror' and 'iscsigw' and so on.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-08 22:30:27 -04:00
Sage Weil
91e5d5bc20 Merge pull request #15973 from majianpeng/bluefs-async-compact-log 
os/bluestore/BlueFS: clear current log entrys before dump all fnode,

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-08 21:29:59 -05:00
Jos Collin
8fbe8b8c0e Merge pull request #16214 from liupan1111/wip-fix-mutex 
common/Mutex.cc: fixed the error in comment

Reviewed-by: Jos Collin <jcollin@redhat.com>
 2017-07-09 01:02:04 +00:00