Commit Graph

75317 Commits

Author SHA1 Message Date
Yehuda Sadeh
c7e869c431 Merge pull request #16177 from Synesis-LLC/fix_rgw_crash_ec_data_pool
rgw: fix not initialized vars which cause rgw crash with ec data pool

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-10 09:53:18 -07:00
Yuri Weinstein
423652ceb0 Merge pull request #15467 from joke-lee/fix-aws-v2-signature-X-Amz-Date-priority
rgw:fix s3 aws v2 signature priority between header['X-Amz-Date'] and header['Date']

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-10 09:39:37 -07:00
Yuri Weinstein
0ccf2d72a5 Merge pull request #16033 from zhaochao/rgw-add-a-new-errcode-for-non-existed-user
rgw: add a new error code for non-existed user.

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-10 09:34:44 -07:00
Yuri Weinstein
ad5703ba1b Merge pull request #16185 from smithfarm/wip-lease-stack-spawn
rgw: lease_stack: use reset method instead of assignment

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-10 09:31:08 -07:00
Yuri Weinstein
34bd1509f2 Merge pull request #16204 from jimifm/wip-rgw_frontend
rgw/rgw_frontend.h: Return negative value for empty uid in RGWLoadGenFrontend::init()

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-10 09:30:33 -07:00
Sage Weil
124787272d Merge pull request #16016 from liewegas/wip-osd-df
mon: include device class in tree view; hide shadow hierarchy

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-10 10:39:43 -05:00
Sage Weil
b5f81e7313 qa/tasks/ceph.py: no osd id to 'osd create' command
This isn't recognized by hammer, and we don't need it for jewel.

Fixes: http://tracker.ceph.com/issues/20548
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 10:43:16 -04:00
Sage Weil
917a6f9ba4 doc/start/quick-ceph-deploy: fix typos etc
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 10:04:24 -04:00
John Spray
44bce9e02c Merge pull request #15858 from liewegas/wip-mgr-servicemap
mgr,librados: service map

Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-10 15:03:07 +01:00
Sage Weil
43bfe1768a doc/start/intro: add parens to cephfs section
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:57:42 -04:00
Sage Weil
fa8514e22d doc/mgr/dashboard: update dashboard docs to reflect new defaults
Also add not about load balancer.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:48:50 -04:00
Sage Weil
f7b87095ca doc/start/quick-deph-deploy: update quick deploy instructions
- include mgr
- simplify
- remove references to old stuff as new

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:38:16 -04:00
Sage Weil
5b07144b81 doc/start/quick-ceph-deploy: drop redundant warning
This is part of preflight.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:38:16 -04:00
Sage Weil
7678c4a314 doc/start: simplify quick start install process
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:38:16 -04:00
Sage Weil
7cfc79c862 doc/start: rename Installation (quick) -> Installation (ceph-deploy)
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:38:15 -04:00
Sage Weil
7a7716f7a8 doc/start/os-recommendations: updates
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:38:15 -04:00
Sage Weil
fc3369c5e6 doc/start/intro: updates
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:38:15 -04:00
Sage Weil
2a3906b831 test/mon/osd-crush-tree.rng: fix expected xml schema for osd tree
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:31:54 -04:00
Sage Weil
c4b44e1579 test/cli/osdmaptool/tree.t: fix
Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-10 09:25:09 -04:00
Alfredo Deza
f04defe1b8 Merge pull request #16049 from fullerdj/wip-djf-key-timeout
ceph-create-keys: add an argument to override default 10-minute timeout

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-07-10 07:52:24 -04:00
Jos Collin
40379052ef Merge pull request #16236 from shashalu/clean-up-RGWRemoteDataLog-unused-function
rgw: drop unused function RGWRemoteDataLog::get_shard_info()

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-10 11:23:24 +00:00
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