Yehuda Sadeh
45722ecbe4
Merge pull request #11343 from ceph/wip-civetweb-1.8
...
Update version of civetweb to 1.8
2016-11-05 12:53:23 -07:00
Kefu Chai
916d46172f
Merge pull request #11251 from stiopaa1/osd_replicatedpg_removeCount2
...
osd/ReplicatedPG: remove unneeded use of count
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-06 01:50:37 +08:00
Jason Dillaman
5e03f4880b
Merge pull request #11510 from vshankar/wip-17356
...
librbd: batch object map updates during trim
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-05 13:15:27 -04:00
Jason Dillaman
8adf3848ef
Merge pull request #11766 from trociny/wip-rbd-info-fix-upgrade-client
...
librbd: snap_get_limit compatibility check
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-11-05 13:15:08 -04:00
Sage Weil
4f1070c331
Merge pull request #10907 from jecluis/wip-mon-features
...
mon: have mon-specific features & rework internal monmap structures
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-05 07:58:14 -05:00
Sage Weil
aa5b8e7e4c
Merge pull request #11772 from liewegas/wip-sortbitwise
...
osd,mon: require sortbitwise flag to upgrade beyond jewel
2016-11-05 07:57:17 -05:00
Sage Weil
b7f8e099e1
Merge pull request #11791 from liewegas/wip-remove-move-ranges
...
os: remove move_ranges_destroy_src
2016-11-05 07:57:07 -05:00
Kefu Chai
a7e42ab89a
Merge pull request #10447 from stiopaa1/msg_pipe_moveDelayedDelivery2
...
msg/Pipe: move DelayedDelivery class to cc file
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-05 14:53:13 +08:00
Sage Weil
b009f5a8ed
Merge pull request #11780 from xiexingguo/xxg-wip-bluestore-1104
...
os/bluestore: a few more cleanups
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-11-04 21:33:54 -05:00
Sage Weil
b231a67da4
Merge pull request #11498 from liewegas/wip-stop-at-jewel
...
mon: prevent post-jewel OSDs from booting if require_jewel_osds is not set
2016-11-04 21:24:50 -05:00
xie xingguo
e7f2c03de1
os/bluestore: fix output message when passing the end of list range
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:28:30 +08:00
xie xingguo
f046343508
os/bluestore: fix typo in comments
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:26:36 +08:00
xie xingguo
c96ecc521b
os/bluestore: add sanity check against collection existence
...
To keep pace with other methods.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:26:12 +08:00
xie xingguo
4ebc5ab420
os/bluestore: narrow boundary check for fiemap
...
By including off-by-one.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-05 08:26:07 +08:00
Sage Weil
d95d522846
Merge pull request #11527 from wjwithagen/wip-wjw-readable.sh
...
test/encoding/readable.sh: fix shell script warning
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 17:16:32 -05:00
Sage Weil
2812e093c2
Merge pull request #11775 from jdurgin/wip-jewel-osds-warning
...
mon/OSDMonitor: remove duplicate jewel/kraken flag warning
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-04 17:15:30 -05:00
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
a006087bd4
os: remove move_ranges_destroy_src
...
We are going to take a different path (rollback support in ObjectStore
instead of roll-forward via splicing data from a temp object).
Signed-off-by: Sage Weil <sage@redhat.com>
2016-11-04 14:22:05 -04: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