Sage Weil
cf154f2668
Merge pull request #9345 from SUSE/wip_remove_mon_startup_magic
...
mon: remove ceph-create-keys from mon startup
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-11-04 17:14:37 -05:00
Owen Synge
cc441cbd6e
src/init-ceph.in:Remove ceph-create-keys for sysv
...
ceph-create-keys should not be started on boot of mons with sysv init.
Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:05:52 +01:00
Owen Synge
639385a7f4
systemd/CMakeLists.txt:Remove ceph-create-keys cmake
...
ceph-create-keys should not be started on boot of mons with systemd so should
not exist as 'After' or 'Wants' for the ceph-mon.service
Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:05:44 +01:00
Owen Synge
dc5fe8d415
systemd/ceph-mon@.service:Remove ceph-create-keys for mon in systemd
...
ceph-create-keys should not be started on boot of mons with systemd so should
not exist as 'After' or 'Wants' for the ceph-mon.service
Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:05:26 +01:00
Owen Synge
8bcb4646b6
systemd/ceph-create-keys@.service:Remove ceph-create-keys for systemd
...
ceph-create-keys should not be started on boot of mons with systemd so should
not exist in the systemd files
Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:05:17 +01:00
Owen Synge
4e27f27fbe
src/upstart/ceph-create-keys.conf:Remove ceph-create-keys for upstart
...
ceph-create-keys should not be started on boot of mons with upstart so should
not exist in the upstart files
Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:05:08 +01:00
Owen Synge
d5af77f309
debian/rules:Remove ceph-create-keys for deb packaging
...
ceph-create-keys should not be started on boot of mons with upstart so should
not exist in the deb.
Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:04:58 +01:00
Owen Synge
c2dd25f2f9
ceph.spec.in:Remove ceph-create-keys for systemd
...
ceph-create-keys should not be started on boot of mons with systemd so should
not exist in the rpm.
Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:04:40 +01:00
Tamilarasi Muthamizhan
9ffafc7bc5
Merge pull request #11749 from ceph/wip-17753
...
ceph-create-keys should not try forever to do things
2016-11-04 13:27:55 -07:00
Sage Weil
83d5df83aa
Merge pull request #11788 from liewegas/wip-bluestore-blackhole
...
os: make filestore_blackhole -> objectstore_blackhole
2016-11-04 13:37:50 -05:00
Sage Weil
20c3fd8f91
Merge pull request #11747 from jecluis/wip-17725
...
mon: MonmapMonitor: return success when monitor will be removed
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 13:13:09 -05:00
Sage Weil
9b1b510826
Merge pull request #9768 from cxwshawn/wip-tc1-fix
...
log: optimize header file dependency
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 13:01:08 -05:00
Sage Weil
40d266d9e5
Merge pull request #9288 from yuyuyu101/wip-add-shutdown-log
...
osd: print log when osd want to kill self
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 13:00:38 -05:00
Sage Weil
7dc62ca6d7
Merge pull request #11770 from liewegas/wip-kill-tbl
...
os/ObjectStore: remove legacy tbl support
Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-04 12:40:57 -05:00
Sage Weil
fde141e2c9
Merge pull request #11785 from Liuchang0812/patch-1
...
doc: Update crush-map.rst, fix a typo mistake
2016-11-04 11:09:12 -05:00
Sage Weil
d7c8f2d1d2
os/bluestore: implement blackhole
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-04 11:29:39 -04:00
Sage Weil
6c1fc6daa7
os: add objectstore_blackhole option; deprecate filestore_blackhole
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-04 11:29:32 -04:00
Yuri Weinstein
ef087a488d
Merge pull request #11531 from yuyuyu101/wip-rdma
...
msg/async: ibverbs/rdma support
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Mellanox <adirl@mellanox.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
2016-11-04 07:43:38 -07:00
Yuri Weinstein
a273ba6a57
Merge pull request #11637 from liupan1111/master
...
common: make l_finisher_complete_lat more accurate
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-11-04 07:38:18 -07:00
whu_liuchang
6735a681c5
Update crush-map.rst
...
fix typo
2016-11-04 22:14:39 +08:00
Sage Weil
648ea38d49
Merge pull request #11771 from liewegas/wip-bluestore-collection-end
...
os/bluestore: fix collection_list end bound off-by-one
Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-04 08:26:17 -05:00
Kefu Chai
23b591c0f9
Merge pull request #11784 from jcsp/wip-jcsp-docs
...
Documentation syntax cleanup
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 21:14:17 +08:00
John Spray
e7858ecf87
doc/cephfs: separate front page section for dev stuff
...
The "additional details" section was getting longer
and longer, and I don't want developer-only stuff
in there anyway.
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:30 +00:00
John Spray
1dcdf35455
doc/mgr: fix rst syntax in plugin guide
...
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:30 +00:00
John Spray
7d4c4c83d1
doc/cephfs: fix rst syntax in mantle.rst
...
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:29 +00:00
John Spray
e33355d228
cephfs/capabilities: fix rst syntax
...
Although we don't link this into built docs,
it generates warnings during build.
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:29 +00:00
John Spray
8111fea1ad
doc/cephfs: s/CephFS Quotas/Quotas/
...
This looks odd in the TOC (we're already
in the cephfs section)
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:29 +00:00
John Spray
6c38e3adb0
doc/cephfs: fix header depths
...
Some files had multiple top-level headers resulting in
subsections being listed in the TOC alongside the
main page header.
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:28 +00:00
John Spray
1e7e2a94ce
doc/cephfs: link in mantle doc
...
...and add a warning at the very top of the document
that it is not for ordinary user use.
Considered just not linking this in at all, but it
seems a shame to have it here but not be able to
e.g. google it and link to it.
Signed-off-by: John Spray <john.spray@redhat.com>
2016-11-04 13:07:28 +00:00
Jason Dillaman
1ad92a52e8
Merge pull request #11741 from trociny/wip-17219
...
rbd-nbd: disallow mapping images >2TB in size
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-04 08:54:41 -04:00
Jason Dillaman
740ac0581b
Merge pull request #11744 from trociny/wip-16962
...
rbd-mirror: snap protect of non-layered image results in split-brain
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-04 08:53:51 -04:00
Jason Dillaman
ff00d41275
Merge pull request #11755 from trociny/wip-17791
...
librbd: proper check for get_data_pool compatibility
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-04 08:52:54 -04:00
Kefu Chai
7cd371d914
Merge pull request #10852 from wido/doc-mon-dns
...
doc: Add docs about looking up Monitors through DNS
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 19:30:29 +08:00
Kefu Chai
bf4338a861
Merge pull request #11774 from wjwithagen/wip-wjw-test_bloom_filter
...
test_bloom_filter.cc: Fix a mismatch for the random_seed parameter
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 14:46:06 +08:00
Kefu Chai
36b7f28873
Merge pull request #11731 from kylinstorage/wip-avoid-unnecessary-verify
...
FileStore: Only verify split when it has been really done and done correctly
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 10:50:58 +08:00
Willem Jan Withagen
c1e4b2e429
test/common/test_bloom_filter.cc: Fix a mismatch for the random_seed parameter
...
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-11-03 22:59:36 +01:00
Sage Weil
ab0b6dffed
Merge pull request #11554 from mslovy/wip-fix-fiemap
...
os/FileStore: fix fiemap issue in xfs when #extents > 1364
Reviewed-by: Sage Weil <sage@redhat.com>
2016-11-03 13:19:37 -05:00
Ning Yao
fb119ac40e
test: add test for fiemap xfs issue when #extents > 1364
...
Signed-off-by: Ning Yao <yaoning@unitedstack.com>
2016-11-04 02:16:06 +08:00
Ning Yao
1a1c126d80
FileStore:: fix fiemap issue in xfs when #extents > 1364
...
Signed-off-by: Ning Yao <yaoning@unitedstack.com>
2016-11-04 02:15:58 +08:00
Sage Weil
3941f630d0
os/kstore: fix collection_list end bound off-by-one
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-03 14:14:33 -04:00
Sage Weil
a115062fa5
os/bluestore: fix collection_list end bound off-by-one
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-03 14:14:23 -04:00
Sage Weil
592a4753b2
ceph_test_objectstore: test collection_list end bound
...
Ensure that it is not included in the result!
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-03 14:14:07 -04:00
Kefu Chai
6478a3dd1d
Merge pull request #11617 from umullan/brokenlinks
...
doc: Fixing the broken hyperlinks by pointing to correct documentation.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 01:03:10 +08:00
Sage Weil
1014850996
Merge pull request #10707 from SUSE/wip-fix-suse-usermod
...
rpm: Remove trailing whitespace in usermod command (SUSE)
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-11-03 11:29:02 -05:00
Orit Wasserman
40ba752410
Merge pull request #11494 from aclamk/wip-rgw-compression
...
[RGW] Wip rgw compression
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-11-03 17:25:02 +01:00
Jianpeng Ma
ac898e61cb
osd/ReplicatedBackend: let MOSDRepOP record the correctly largest_data_off_in_data_bl.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-11-03 12:08:25 -04:00
Jianpeng Ma
2b0ea15b56
os/ObjectStore: fix bug about calc largest_data_off_in_data_bl.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-11-03 12:08:25 -04:00
Jianpeng Ma
a72a1c2d26
os/ObjectStore: remove the legacy tbl support completely.
...
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-11-03 12:08:25 -04:00
Sage Weil
6d6d4b3243
os/bluestore: fix build error
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-03 11:10:14 -04:00
Matt Benjamin
2e2ca3b620
Merge pull request #11768 from linuxbox2/xio-build-2
...
xio: fix build
2016-11-03 11:07:17 -04:00