Commit Graph

38050 Commits

Author SHA1 Message Date
Yunchuan Wen
b4720ae6a5 rbd: parse diff file header for diff merging
Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
2015-01-12 01:02:51 +00:00
MingXin Liu
c7cc6af705 rbd: write a diff description into the merged diff file
Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
2015-01-05 17:51:02 +08:00
MingXin Liu
bca862c317 rbd: parse merge-diff arguments
Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
2015-01-05 17:51:02 +08:00
MingXin Liu
0b6ab827e8 rbd: add an option merge-diff
Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
2015-01-05 17:51:02 +08:00
Haomai Wang
c37abeaf31 Merge pull request #3261 from tchaikov/async-msgr
AsyncMessenger: a trivial refactory and a fix

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-05 10:14:40 +08:00
Sage Weil
f5e3b9a610 Merge pull request #3286 from ceph/wip-10351
mount.ceph: avoid spurious error message

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-03 10:28:21 -08:00
Yan, Zheng
bdd0e3c4bd mount.ceph: avoid spurious error message
/etc/mtab in most modern distributions is a symbol link to
/proc/self/mounts.

Fixes: #10351
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-01-03 15:35:00 +08:00
Loic Dachary
dced90ba87 Merge pull request #3284 from ktdreyer/doc-rados-preflight-os
doc: rm reference to old Ubuntu release

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-02 18:54:47 +01:00
Ken Dreyer
274b989fec doc: rm reference to old Ubuntu release
Remove the reference to "Ubuntu 12.10" since this is EOL.

Clarify that we only recommend Ubuntu LTS releases.

(Since this information has a tendancy to become stale, perhaps this
whole paragraph should be removed here and we should simply point at the
main OS Recommendations page.)

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-01-02 10:37:10 -07:00
Loic Dachary
020983b0a5 Merge pull request #3223 from objoo/master
mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-01 22:52:24 +01:00
Kefu Chai
c8f56ab2a2 AsyncMessender: use IOV_MAX instead of IOV_LEN
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2014-12-31 10:45:00 +08:00
Kefu Chai
d49b694064 AsyncMessenger: s/sended/sent/
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2014-12-31 10:45:00 +08:00
Kefu Chai
c9da51de48 AsyncMessenger: should retry in case of EINTR
* if EINTR is returned, do_send() should return 0 or `continue`.
* reword the comment a little bit

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2014-12-31 10:45:00 +08:00
Sage Weil
169e8bd2cf msg: fix factory error message
Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-30 14:08:49 -08:00
Sage Weil
ec1f58a30d unittest_msgr: enable experiemntal async msgr
Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-30 14:08:38 -08:00
Sage Weil
51f5f12ca4 Merge pull request #3219 from yuyuyu101/wip-10383
Wip 10383: Fix unittest_msgr with AsyncMessenger bug

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-30 10:46:58 -08:00
Sage Weil
ecdc9fb2ec Merge pull request #3279 from ceph/wip-mon-janitorial-list
src/doc: add monitor janitorial list
2014-12-30 10:44:17 -08:00
Haomai Wang
fd877e0152 Merge pull request #3278 from mslovy/wip-y04
KeyValueStore:: do_transactions: clean up code which is never used

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2014-12-30 20:30:34 +08:00
Ning Yao
cef7a82584 KeyValueStore:: do_transactions: clean up code which is never used
clean up ops and bytes which is never used in do_transactions()

Signed-off-by: Ning Yao <zay11022@gmail.com>
2014-12-30 10:53:21 +00:00
Joao Eduardo Luis
dfd6a382cd src/doc: add monitor janitorial list
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-12-30 10:10:52 +00:00
Sage Weil
dfee5e5337 Merge pull request #3274 from ceph/wip-10341
tools: ceph-monstore-tool: refactor cli parsing

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-29 16:28:57 -08:00
Sage Weil
af03583c25 Merge pull request #3275 from liewegas/wip-experimental
mark some features experimental and warn accordingly

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2014-12-29 14:22:17 -08:00
Sage Weil
b7b4534d78 common: log which experimental features are enabled.
This will appear in the logs regardless of whether or not the features
get used/enabled via other config options.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-29 14:19:14 -08:00
Sage Weil
55405db537 ms: mark async messenger experimental
Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-29 14:19:14 -08:00
Sage Weil
44ce7cc1de os: rename keyvaluestore-dev -> keyvaluestore; mark experimental
Use a clean name for keyvaluestore (no -dev suffix), but mark as
experimental to ensure users know what they are signing up for.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-29 14:19:14 -08:00
Sage Weil
8a559720fb common: add 'enable experimental data corrupting features'
Signed-off-by: Sage Weil <sage@redhat.com>
2014-12-29 14:19:13 -08:00
Sage Weil
d54295e5a8 Merge pull request #3265 from yuyuyu101/coverify-fix
Event: Avoid illegal multiplication for memset

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-29 10:56:23 -08:00
John Wilkins
9b3c0b6140 Merge pull request #3260 from nilamdyuti/wip-doc-ceph-object-gateway
doc: Updates information for SSL configuration in Ceph Object Gateway installation.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
2014-12-29 10:39:24 -08:00
Joao Eduardo Luis
783956ccb6 tools: ceph-monstore-tool: validate start/stop vals
on commands that use 'start' and 'stop'/'end' values, we should validate
them and inform the user when 'stop' > 'start'.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-12-29 17:50:28 +00:00
Joao Eduardo Luis
60e9c3f003 tools: ceph-monstore-tool: output number of paxos versions dumped
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-12-29 17:50:28 +00:00
Joao Eduardo Luis
b27ca4c024 tools: ceph-monstore-tool: raw map to stdout if outfile not specified
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-12-29 17:50:28 +00:00
Joao Eduardo Luis
68f3b77ddd tools: ceph-monstore-tool: use subcmd parser helper
reduces the noise in the code

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-12-29 17:50:28 +00:00
Joao Eduardo Luis
a186ee1229 tools: ceph_monstore_tool: add sub-command parser helper function
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-12-29 17:50:28 +00:00
Joao Eduardo Luis
fe662c5ae2 tools: ceph-monstore-tool: a cli that works
Fixes: #10341

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2014-12-29 17:50:28 +00:00
Haomai Wang
793c32d5f1 Event: Avoid illegal multiplication for memset
Because "file_events" is "FileEvent" type and adding an integral value to
this pointer automatically scales that value by the size.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-12-28 21:31:35 +08:00
Yann Dupont
4193594cff mailmap: Chris Holcombe affiliation 2014-12-27 01:11:31 +01:00
Yann Dupont
bb09b20e53 mailmap: Alfredo Deza affiliation : Fix Typo.
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-12-27 01:11:31 +01:00
Yann Dupont
f3fd07cb23 mailmap: Christos Stavrakakis affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-12-27 01:11:31 +01:00
Yann Dupont
a8542d0e11 mailmap: Ning Yao affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-12-27 01:11:31 +01:00
Yann Dupont
9636dfca37 mailmap: Shishir Gowda affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-12-27 01:11:31 +01:00
Yann Dupont
eb659ce61a mailmap: David Anderson affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-12-27 01:11:31 +01:00
Yann Dupont
977db4fe86 mailmap: Matt Benjamin affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-12-27 01:11:31 +01:00
Yann Dupont
6cea1e3c98 mailmap: Yunchuan Wen affiliation
Signed-off-by: Yann Dupont <yann@objoo.org>
2014-12-27 01:11:30 +01:00
Haomai Wang
3f83e88008 Merge pull request #3255 from tchaikov/async-leak
AsyncMessenger: fix the leak of file_events
2014-12-26 22:42:33 +08:00
Nilamdyuti Goswami
fe44cd3199 doc: Updates information for SSL configuration in Ceph Object Gateway installation.
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
2014-12-26 19:58:57 +05:30
Kefu Chai
25cf82e2c8 AsyncMessenger: reset newly allocated file_events
* otherwise there is chance that Event could take them as already
  initialized ones even they are filled with random bits from heap.
2014-12-26 16:28:26 +08:00
Sage Weil
ec3b0e1166 Merge pull request #3257 from mslovy/wip-y02
PG:: filter_snapc: Return immediately if no snapc need to trim

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-25 20:52:06 -08:00
Sage Weil
3b14321536 Merge pull request #3256 from majianpeng/fix4
FileJournal: Don't cache journal data if journal w/o directio mode

Reviewed-by: Sage Weil <sage@redhat.com>
2014-12-25 20:48:40 -08:00
Ning Yao
852aab64f6 PG:: filter_snapc: Return immediately if no snapc need to trim
we can return immediately if no snapc need to trim. Do not iterater snapc vector and do extra judgement and ops.

Signed-off-by: Ning Yao <zay11022@gmail.com>
2014-12-26 04:20:35 +00:00
Jianpeng Ma
45fb9a3b5d FileJournal: Don't cache journal data if journal w/o directio mode
Only read journal data in osd starting.So no need to keep journal
data in kernel cache/buffer.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2014-12-26 09:58:24 +08:00