Sage Weil
3a85938487
Merge pull request #16019 from wido/mgr-plugin-zabbix
...
mgr: Zabbix monitoring module
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-06 21:38:01 -05:00
Sage Weil
5870a68c00
Merge pull request #15647 from gmayyyha/format-config-show
...
common,config: OPT_FLOAT and OPT_DOUBLE output format in config show
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-06 21:25:19 -05:00
Sage Weil
4e64eac6eb
Merge pull request #15743 from yuyuyu101/wip-20330
...
msg: make listen backlog an option, increase from 128 to 512
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-06 21:24:22 -05:00
Sage Weil
ac494360b8
Merge pull request #15781 from kchiu/wip-filejournal-fix
...
os/filestore: call committed_thru when no journal entries are replayed
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-06 21:23:56 -05:00
Sage Weil
f19ea97706
Merge pull request #15810 from liupan1111/wip-precise
...
msg/async: make recv_stamp more precise
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-07-06 21:22:37 -05:00
Sage Weil
9038bb3d62
Merge pull request #16159 from tchaikov/wip-20432
...
Context: C_ContextsBase: delete enclosed contexts in dtor
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-06 21:21:57 -05:00
Jos Collin
de48170886
Merge pull request #15878 from renhwztetecs/renhw-wip-common-dns
...
common: Update the error string when res_nsearch() or res_search() fails
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Sage Weil <sweil@redhat.com>
2017-07-07 01:40:52 +00:00
Sage Weil
2e7353a07b
Merge pull request #16171 from wjwithagen/wip-wjw-freebsd-nobtrfs
...
os/filestore: Exclude BTRFS on FreeBSD
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-06 14:07:34 -05:00
Yuri Weinstein
676e1c9b7c
Merge pull request #15670 from rzarzynski/wip-rgw-postobj-get_params-error-handling
...
rgw: fix error handling in get_params() of RGWPostObj_ObjStore_S3.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-06 08:47:02 -07:00
Yuri Weinstein
4ba3e87ec5
Merge pull request #15700 from mikulely/olh-cleanup
...
rgw: cleanup rgw-admin duplicated judge during OLH GET/READLOG
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-06 08:46:33 -07:00
Yuri Weinstein
5bbc50a3d1
Merge pull request #15777 from oritwas/wip-rgw-no-log-meta
...
rgw: log_meta only for more than one zone
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-06 08:46:12 -07:00
Yuri Weinstein
e71ae950af
Merge pull request #15827 from joscollin/wip-CID1412979-uninitialized-members
...
rgw: Uninitialized member in LCRule
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-06 08:45:07 -07:00
Yuri Weinstein
5dea731aee
Merge pull request #15938 from shashalu/fix-data-sync-run
...
rgw: fix radosgw-admin data sync run crash
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-06 08:44:12 -07:00
Yuri Weinstein
d19ece90ee
Merge pull request #15949 from joscollin/wip-cleanup-rgw-rest-warning
...
rgw: silence warning from -Wmaybe-uninitialized
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-06 08:43:41 -07:00
Yuri Weinstein
c3ecb0dfb9
Merge pull request #15960 from aclamk/fix-rgw-cryptopp-compilation
...
radosgw: fix compilation with cryptopp
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-07-06 08:43:25 -07:00
Yuri Weinstein
4057240d02
Merge pull request #15965 from mdw-at-linuxbox/signature
...
rgw: fix s3 object uploads with chunked transfers and v4 signatures.
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2017-07-06 08:42:50 -07:00
Kefu Chai
f4d602b1a3
Merge pull request #16156 from tchaikov/wip-20524
...
osd/filestore: Revert "os/filestore: move ondisk in front
Reviewed-by: Pan Liu <liupan1111@gmail.com>
2017-07-06 23:00:58 +08:00
Willem Jan Withagen
ac3e817385
filestore: Exclude BTRFS on FreeBSD
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-06 14:20:02 +02:00
Kefu Chai
8f8da0e765
Merge pull request #16155 from majianpeng/man-rados-add-offset
...
doc/rados.8: add offset option for put command
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-06 17:02:48 +08:00
Jianpeng Ma
82a5e82f73
doc/rados.8: add offset option for put command.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-07-06 21:55:11 +08:00
Kefu Chai
18ff5d6e59
Context: C_ContextsBase: delete enclosed contexts in dtor
...
there are chances that these contexts are never finished/completed
Fixes: http://tracker.ceph.com/issues/20432
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-06 16:10:02 +08:00
Kefu Chai
41531785ce
Merge pull request #16032 from tanghaodong25/bluestore-aio-submit
...
os/bluestore/KernelDevice: batch aio submit
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-06 16:01:49 +08:00
Kefu Chai
903aa4b090
Merge pull request #16086 from liewegas/wip-btrfs-experimental
...
os/filestore: require experimental flag for btrfs
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-06 16:00:48 +08:00
Kefu Chai
797dadc81b
Revert "os/filestore: move ondisk in front, so that return oncommit earlier, and improve write op performance."
...
This reverts commit 21f167cf39
.
Fixes: http://tracker.ceph.com/issues/20524
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-06 14:07:29 +08:00
huanwen ren
351a8a82b1
common: add query_str when res_search() failed
...
I don't know the abort information about DNS Resolver,
if not add "query_str".
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2017-07-06 13:39:34 +08:00
Yehuda Sadeh
08051155a4
Merge pull request #16026 from linuxbox2/wip-tag-timeout-secs
...
rgw: cls: ceph::timespan tag_timeout wrong units
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-07-05 11:22:35 -07:00
Sage Weil
1174a2fbab
Merge pull request #15873 from ztczll/zl
...
osd: check queue_transaction return value
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-07-05 10:47:23 -05:00
Sage Weil
294756e457
Merge pull request #16048 from Yan-waller/wip-waller-0630mon
...
mon/mgr: add detail error infomation
Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-05 10:46:55 -05:00
Sage Weil
d02c9a5b01
Merge pull request #16122 from tchaikov/wip-qa-warning-msg
...
qa/tasks/ceph: should be "Waiting for all PGs", not "all osds"
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-05 10:26:56 -05:00
Kefu Chai
1f47aff086
Merge pull request #16117 from majianpeng/bluestore-move-object-exist-in-assign-nid
...
os/bluestore: move object exist in assign nid
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-05 23:05:23 +08:00
Jianpeng Ma
d34444be01
os/bluestore/BlueStore: move "onode::exists=true" in _assign_nid.
...
If object has nid, it always set exists =true in get_onode.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-07-05 23:33:47 +08:00
Kefu Chai
045d227cfa
Merge pull request #16110 from javacruft/wrap-and-sort
...
debian: wrap-and-sort all files
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-05 21:57:21 +08:00
Kefu Chai
b7df96b8e5
Merge pull request #15642 from wjwithagen/wip-wjw-freebsd-ceph-disk-zap
...
ceph_disk/main.py: Allow FreeBSD zap a OSD disk
Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-05 21:52:29 +08:00
Jos Collin
f635570153
Merge pull request #16084 from mikulely/fix-data-pool-cli
...
rgw,test: fix rgw placement rule pool config option
Reviewed By: Jos Collin <jcollin@redhat.com>
2017-07-05 12:48:37 +00:00
Mykola Golub
4968f38b3e
Merge pull request #16024 from dillaman/wip-19035
...
rbd: do not attempt to load key if auth is disabled
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-07-05 14:53:45 +03:00
Mykola Golub
2a9f56f818
Merge pull request #15860 from dillaman/wip-20168
...
librbd: fail IO request when exclusive lock cannot be obtained
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-07-05 14:52:55 +03:00
Kefu Chai
d14705663a
Merge pull request #16118 from IlsooByun/fix-spdk-build-error
...
os/bluestore: fix build errors when spdk is on
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-07-05 19:15:19 +08:00
Kefu Chai
2cae544cf2
qa/tasks/ceph: should be "Waiting for all PGs", not "all osds"
...
amend the warning message
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-07-05 18:58:58 +08:00
Kefu Chai
b0de4e2788
Merge pull request #15265 from cooldavid/pr-osd-historic-op
...
osd: Preserve OSDOp information for historic ops
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-05 18:51:42 +08:00
Kefu Chai
4fd72b48c4
Merge pull request #15964 from tchaikov/wip-5249
...
mon/MonClient: respect the priority in SRV RR
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
2017-07-05 18:48:29 +08:00
Kefu Chai
6cc0122637
Merge pull request #15780 from wjwithagen/wip-wjw-freebsd-use-ceph_to_hostos_errno
...
core: make the conversion from wire error to host OS work
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-05 18:46:21 +08:00
Willem Jan Withagen
356c919531
core: make the conversion from wire error to host OS work
...
- The key change is the type of rval,
that will call the conversion when en/decoded
- Remainder is fixes for the type change and promotions
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-05 11:39:50 +02:00
Wido den Hollander
bcf3a7edcb
mgr: Zabbix monitoring module
...
This ceph-mgr module will pull various values from the Ceph cluster
and send them to a Zabbix Server using zabbix_sender.
This requires the zabbix_sender executable to be present on the system
running ceph-mgr as it will be invoked to send data to Zabbix.
A Zabbix template can be found in this directory which can be used
to easily get data from your Ceph cluster into Zabbix.
More information is available in the README file found in the module's
directory.
Signed-off-by: Wido den Hollander <wido@42on.com>
2017-07-05 11:06:19 +02:00
Kefu Chai
ecc6b8cb9c
Merge pull request #15897 from yuyuyu101/wip-20390
...
msg/async: increase worker reference with local listen table enabled backend
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-05 15:06:21 +08:00
Kefu Chai
04e0ef541d
Merge pull request #15754 from tchaikov/wip-test-auth-caps
...
qa/suites: add test exercising workunits/mon/auth_caps.sh
Reviewed By: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
2017-07-05 15:05:21 +08:00
Kefu Chai
dadd73f03d
Merge pull request #16011 from hsepeng/cache-osd-bugfix
...
osd/PrimaryLogPG solve cache tier osd high memory consumption
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-05 15:04:24 +08:00
Kefu Chai
ab06dd445d
Merge pull request #13918 from liupan1111/wip-fix-performance-filestore
...
os/filestore: queue ondisk completion before apply work
Reviewed-by: Sage Weil <sage@redhat.com>
2017-07-05 15:00:44 +08:00
Kefu Chai
33b68a42ee
Merge pull request #16051 from liewegas/wip-20381
...
os/bluestore: fix deferred_aio deadlock
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-07-05 14:59:32 +08:00
Ilsoo Byun
8134620ad4
os/bluestore: fix build errors when spdk is on
...
- remove pthread library link from dpdk cmake
- fix the bugs of NVMEDevice
Signed-off-by: Ilsoo Byun <ilsoo.byun@sk.com>
2017-07-05 01:42:10 -04:00
John Spray
b363e58530
Merge pull request #15958 from liewegas/wip-mgr-modules
...
mgr,mon: enable/disable mgr modules via 'ceph mgr module ...' commands
Reviewed-by: John Spray <john.spray@redhat.com>
2017-07-05 00:04:59 +01:00