Commit Graph

79806 Commits

Author SHA1 Message Date
Patrick Donnelly
4bf53ce082
client: put MetaSession map container
Simplifies memory management and reduces fragmentation.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-17 07:02:13 -07:00
Wido den Hollander
e7e9c6de52
doc: Updated documentation for Zabbix Mgr module
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-10-17 15:53:47 +02:00
xie xingguo
4667280f8a osd/PrimaryLogPG: trigger auto-repair on full-object-size CRC error
There are still FileStore users and the full-object CRC might be able
to catch silently returned data errors. Since we support auto-repair now,
let's trigger an auto-repair process instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-17 20:23:05 +08:00
Kefu Chai
a27668bf5f common/lockdep: do not set std::string using braces
this silences follow warning from clang:

ceph/src/common/lockdep.cc:219:12: warning: braces around scalar initializer [-Wbraced-scalar-init]
    name = { "unknown" };
           ^~~~~~~~~~~~~
1 warning generated.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-17 20:11:40 +08:00
Radoslaw Zarzynski
923cc63088 Revert "bluestore/fio: Fixed problem with all objects having the same hash"
This reverts commit 0eb5359273.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2017-10-17 14:10:11 +02:00
Kefu Chai
1be9dd8165 common/event_socket.h: include <errno.h> to use errno
OSX needs this also.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-17 19:57:39 +08:00
Kefu Chai
6cfa275a58 Merge pull request #18348 from Yan-waller/wip-walle-1017readmecmake
README.md: bump up cmake to 2.8.12

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-17 19:51:51 +08:00
Yan Jun
bf7227b62a README.md: bump up cmake to 2.8.12
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-10-17 19:27:26 +08:00
Jos Collin
06f2295ad2 rgw: Access RGWConf through RGWEnv
Created functions rgw_conf_get_enable_ops_log(), rgw_conf_get_enable_usage_log() and
rgw_conf_get_defer_to_bucket_acls() and the necessary changes to provide the access of RGWConf through RGWEnv.

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-10-17 15:02:13 +05:30
Kefu Chai
42e85fe35d os/filestore: print out the error if do_read_entry() fails
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-17 17:08:59 +08:00
Wido den Hollander
fb6180859e
doc: Remove additional arguments when replacing OSD
It's not required to provide the --bluestore nor --osd-uuid option
to ceph-disk.

Using BlueStore is the default on master (e.g. Luminous) and thus
this option is not required.

When no OSD UUID is supplied ceph-disk will generate one, so we do
not need to supply one generated by uuidgen.

Signed-off-by: Wido den Hollander <wido@42on.com>
2017-10-17 11:05:23 +02:00
xie xingguo
024b5bcbf0 osd/PrimaryLogPG: do not use approx_size() for log trimming
There might be holes on log versions, thus the approx_size()
should (almost) always overestimate the actual number of log entries.
As a result, we might be at the risk of accessing violation
while searching for the oldest log entry to keep in the log list later.

Fix the above problem by counting the precise number of current
log entries instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-17 15:42:08 +08:00
Jiaying Ren
84d06876bb rgw: cleanup MIN macro
+ cleanup MIN macro
+ add std namespace

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-10-17 15:34:46 +08:00
Yan Jun
236f462b38 common/config: drop unused configuration item 'osd_backoff_on_down'
drop it for no more use.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
2017-10-17 15:10:50 +08:00
Jiaying Ren
18b5482b85 rgw: update outdated debug func name
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-10-17 15:03:25 +08:00
Jiaying Ren
96bb12a158 rgw: fix opslog uri as per Amazon s3
According to s3[1], current Request-URI opslog entry are missing:

+ request method
+ query string
+ http version number

[1] http://docs.aws.amazon.com/AmazonS3/latest/dev/LogFormat.html

Fixes: http://tracker.ceph.com/issues/20971

Reported-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-10-17 14:07:48 +08:00
Kefu Chai
ac643bcf86 Merge pull request #18081 from zhsj/revert-15089-add-mirror
doc: change cn mirror to ustc domain

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-17 13:07:19 +08:00
Kefu Chai
f990847a8f Merge pull request #18312 from shinobu-x/sk-buffer_20171015
common/buffer: cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-17 13:03:20 +08:00
Kefu Chai
82e3a760f7 Merge pull request #18318 from Linbing/wip-bluestore-compression
bluestore:  comp_min_blob_size init error

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-17 13:02:35 +08:00
Kefu Chai
08fad1f799 Merge pull request #18279 from lixiaoy1/rmrange
os/bluestore: use db->rm_range_keys to delete range of keys

Reviewed-by: Varada Kari <varada.kari@sandisk.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-17 13:01:30 +08:00
lisali
007d239c12 os/bluestore: use db->rm_range_keys to delete range of keys
As Key Value DB provides the rm_range_keys interface to remove
some range of keys, BlueStore should use the interface. DB can
provide more efficient ways.

Signed-off-by: Xiaoyan Li <xiaoyan.li@intel.com>
2017-10-17 06:56:44 -04:00
Kefu Chai
e6a7597243 Merge pull request #18320 from shinobu-x/sk-include_unordered_x
include: Remove unused header, ciso646

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-10-17 12:59:35 +08:00
Kefu Chai
c9414decf6 Merge pull request #18319 from shinobu-x/sk-osd_20171016
osd: Don't include same header twice

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-10-17 12:59:05 +08:00
Patrick Donnelly
99786598f7
ptl-tool: load labeled PRs
This lets you label in GitHub the PRs you want to test/merge.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-16 21:17:11 -07:00
Kefu Chai
ac1e13ce63 qa/tasks/ceph: add "create_rbd_pool" option
True by default, but we can opt not to create the "rbd" pool.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-17 11:15:32 +08:00
Kefu Chai
da6f7a8100 mon/OSDMonitor: bypass checks if pg_temp.forced
originally, monitor ignores the pg_temp messages sent from replica osds,
but to re-trigger peering if replica osd's pg number drops down below
the setting, we need to bypass the checks.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-17 11:15:32 +08:00
Kefu Chai
6335bf7910 messages/MOSDPGTemp: add forced field
the monitor is supposed to bypass some checks if `forced` is true.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-17 11:15:32 +08:00
Kefu Chai
c6b71ebf6b osd: print osd as "osd.$osdid" in log message
easier to read this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-17 11:15:32 +08:00
Kefu Chai
34f524c96b Merge pull request #18332 from rzarzynski/wip-testfio-fix-build-error
test/fio: fix building of the fio_ceph_objectstore plugin.

Reviewed-By: Casey Bodley <cbodley@redhat.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
2017-10-17 10:21:15 +08:00
Jason Dillaman
ecec3217b6 Merge pull request #17134 from PCzhangPC/metaexin
rbd: export/import image-meta when we export/import an image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-10-16 21:00:08 -04:00
Jason Dillaman
be8e006c17 Merge pull request #18249 from PCzhangPC/addrwpro
rbd: show read:write proportion in the infomation of readwrite bench test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-10-16 20:59:49 -04:00
Sage Weil
7aca8af662 os/bluestore: fsync on _write_bdev_label
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 17:46:03 -05:00
Sage Weil
4b468c989f ceph-bluestore-tool: implement 'set-label-key' and 'rm-label-key'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 17:45:54 -05:00
Sage Weil
0b0550c967 os/bluestore: make _write_bdev_label static and public
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 17:42:29 -05:00
Jianpeng Ma
aac1a20139 msg/async: batch handle numevents.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-17 04:54:45 +08:00
Yuri Weinstein
44c89bd0f0 Merge pull request #18271 from cbodley/wip-21772
rgw: fix bilog entries on multipart complete

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-10-16 12:58:37 -07:00
Yuri Weinstein
f880c5d961 Merge pull request #18212 from shashalu/clean-up-radosgw-admin
rgw: drop "realm remove" in radosgw-admin

Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-10-16 12:58:05 -07:00
Sage Weil
7b91e50dbd doc/man/8/ceph-bluestore-tool: add man page
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Sage Weil
cdee8b26b9 common/options: document 'key', 'keyfile', 'keyring'
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Sage Weil
4785345ace ceph-bluestore-tool: fix show-label to use dev name as key
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Sage Weil
5e486c2bd3 ceph-bluestore-tool: drop "action ..." print
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Sage Weil
2d217367af ceph-bluestore-tool: only infer devs if devs.empty()
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Sage Weil
72ee7e29fb ceph-bluestore-tool: implement prime-osd-dir
This populates an osd dir based on the metadata in a bluestore
device label.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Sage Weil
8d07fa5ad0 os/bluestore: keep meta items for extra bdev paths
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Radoslaw Zarzynski
23f018c859 test/fio: fix building of the fio_ceph_objectstore plugin.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2017-10-16 19:11:17 +02:00
Jason Dillaman
43b94729ed Merge pull request #18313 from Carbenium/rbd-map-crash
rbd: fix crash during map when "rw" option is specified

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-10-16 12:02:27 -04:00
Sage Weil
d4e0c46d89 vstart.sh: specify block files
This is mostly just to test ceph-bluestore-tool prime-osd-dir.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 10:56:25 -05:00
Sage Weil
65b707358e osd: store osd cephx key in "osd_key" meta slot
Note that this *only* works with --mkkey (deprecated except for
vstart.sh) and --key <key>.  If you write out a full keyring before
running --mkfs it doesn't get populated.  Users should pass --key
instead of --keyring in that case.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 10:56:25 -05:00
Sage Weil
75400ead30 ceph-osd: mkkey before mkfs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 10:56:25 -05:00
Sage Weil
33b8e8e86f os/bluestore: store meta values in main device label
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 10:56:24 -05:00