RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 17:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
74,960 Commits 216 Branches 0 Tags 1.8 GiB
f17516656e
Commit Graph

74960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ken Dreyer
e7e786a72e rpm: bump epoch ahead of RHEL base 
RHEL's ceph-common package is "1". Move our upstream packages' epoch
ahead of that, so that upstream will always override whatever is in
RHEL, even if it happens to have a higher NVR one day.

Fixes: http://tracker.ceph.com/issues/20508
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
 2017-07-05 09:37:19 -06: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
Yang Honggang
6ae403660e os/filestore/FileJournal: FileJournal::open() close journal file before return error 
After successfully opened journal in FileJournal::open(), the following
error returns will cause journal->open() in JournalingObjectStore::journal_replay()
failed and delete journal. In ~FileJournal(), we assert fd == -1. As we not cleanup
journal fd in FileJournal::open(), fd is not -1. This will generate a core.

Fixes: http://tracker.ceph.com/issues/20504
Signed-off-by: Yang Honggang <joseph.yang@xtaotech.com>
 2017-07-05 19:52:02 +08: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
Zhao Chao
51ab8abf75 rgw: add a new error code for non-existed subuser. 
When modify or delete non-existed subuser, a new error code
'NoSuchSubUser' is more specific than 'InvalidArgument'.

Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>
 2017-07-05 14:23:17 +08:00
xie xingguo
d8c4624116 os/bluestore: _do_remove:: less overhead; less code indention 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-05 13:47:55 +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
xie xingguo
2f244443cb os/bluestore: _do_remove::add sanity check 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-05 08:25:26 +08:00
xie xingguo
0ae5d92d42 os/bluestore: _do_clone_range:: narrow dirty range 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-05 08:25:26 +08: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
James Page
1341de99a0 debian: wrap-and-sort all files 
'wrap-and-sort -a -t' debian folder to apply consistent
ordering/formatting to all files.

This makes synchronization of debian package changes
between Ceph packages and Ubuntu packages easier to
manage.

Signed-off-by: James Page <james.page@ubuntu.com>
 2017-07-04 17:38:39 +01:00
Kefu Chai
d723b8a667 Merge pull request #15305 from wjwithagen/wip-wjw-HAVE_BABELTRACE 
cmake: Rewrite HAVE_BABELTRACE  option to WITH_

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-04 20:20:12 +08:00
Kefu Chai
c77919fe33 Merge pull request #16094 from zphj1987/master 
pybind/mgr/dashboard: fix get kernel_version error

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-04 18:38:29 +08:00
xie xingguo
1333c475c0 mon/OSDMonitor: introduce osd_pool_default_type config option 
In luminous we now have full support of ec pool, so it is not
good to continue hardcoding default pool type to "replicated".

Introduce a configurable osd_pool_default_type for this.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-04 18:22:09 +08:00
xie xingguo
bcbae604b8 osd/OSD: refactor update_osd_stat() to narrow lock 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-04 18:22:09 +08:00
xie xingguo
4c64fc1b41 osd/OSD: update check_full_status() to accept a pre-calculated ratio only 
We don't have to pass in the osd_stat, which is not necessary.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-04 18:22:08 +08:00
Peng Zhang
55ddcb2171 ceph-mgr:fix ceph-mgr web get kernel_version error 
fix :
File "/usr/lib64/ceph/mgr/dashboard/module.py", line 523, in _clients
client['version'] = client['kernel_version']
----------

change client['kernel_version'] to
client['client_metadata']['kernel_version']

Signed-off-by: Peng Zhang zphj1987@gmail.com
 2017-07-04 16:08:28 +08:00
Jiaying Ren
ac52531b0d rgw: silence compile warning in the rgw_rest.cc 
/root/jiaying/ceph/src/rgw/rgw_rest.cc: In member function ‘virtual int
RGWHandler_REST::read_permissions(RGWOp*)’:
/root/jiaying/ceph/src/rgw/rgw_rest.cc:1919:8: warning: ‘only_bucket’ may be used uninitialized in
this function [-Wmaybe-uninitialized]
   bool only_bucket;
           ^
	   [100%] Building CXX ob

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
 2017-07-04 15:25:45 +08:00
Josh Durgin
a7960ad4e9 Merge pull request #16093 from tchaikov/wip-20432 
osd: clear_queued_recovery() in on_shutdown()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-07-04 00:06:38 -07:00
Kefu Chai
a5471e7710 Merge pull request #15823 from jdurgin/wip-omap-tp-heartbeat 
osd/ReplicatedBackend: reset thread heartbeat after every omap entry …

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-07-04 14:46:18 +08:00
Yan Jun
e27f0474cb tools/rados: clean ups 
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
 2017-07-04 14:06:59 +08:00
Kefu Chai
6590014749 osd: clear_queued_recovery() in on_shutdown() 
otherwise when we are kicking the PG waiting in OSD's awaiting_throttle
queue, the queue is still holding a strong reference of it. then we will
have warnings like "pgid 0.7 has ref count of 2" when shutting down OSD,
because pgmap is also holding a reference of it.

we could clear the "awaiting_throttle" directly in OSD::shutdown(), but
clear_queued_recovery() is more consistent this way, because it is PG
which registered itself to the queue in OSD, it'd be better if PG can
remove itself from the OSD when it is shutting down itself.

Fixes: http://tracker.ceph.com/issues/20432
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-07-04 13:47:29 +08:00
Xie Xingguo
ce19fa331c Merge pull request #16081 from tsg-/tsg-affiliation 
mailmap, organizationmap: add affiliation for Tushar Gohad

Reviewed-by: Jos Collin <jcollin@redhat.com>
 2017-07-04 08:42:28 +08:00
Sage Weil
fc76fb7510 os/filestore: require experimental flag for btrfs 
This isn't strictly accurate since we're really deprecating, but the
message is appropriately scary and reflects the risk of data loss.

Signed-off-by: Sage Weil <sage@redhat.com>
 2017-07-03 12:16:53 -04:00
Patrick Donnelly
6eda735b06
Merge remote-tracking branch 'upstream/pull/16080/head' into HEAD 
* upstream/pull/16080/head:
  doc/mon: clean up `mds fail`/`mds deactivate` descriptions

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2017-07-03 09:11:25 -07:00
Jiaying Ren
3af3f4e84c doc: fix rgw placment rule pool config option 
actually we're checking '--data-pool' and '--data-extra-pool'
during the argument parsing.

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
 2017-07-03 23:39:10 +08:00
Sage Weil
080af6dd6f Merge pull request #15833 from Linbing/wip-osd-delete-MPing 
osd: osd does not using MPing Messages,do not include unused include

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-07-03 09:03:38 -05:00
John Spray
301d53a3c7 doc/mon: clean up mds fail/mds deactivate descriptions 
Fixes: http://tracker.ceph.com/issues/20424
Signed-off-by: John Spray <john.spray@redhat.com>
 2017-07-03 14:47:29 +01:00
Sage Weil
14f17b9c8c Merge pull request #16072 from tchaikov/wip-20453 
debian: workaround the bug in dpkg-maintscript-helper

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-07-03 08:37:25 -05:00
Sage Weil
a96ebf344f Merge pull request #15835 from SUSE/wip-flatten-systemd-target-hierarchy-master 
systemd: Add explicit Before=ceph.target

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
 2017-07-03 08:34:04 -05:00