Commit Graph

38650 Commits

Author SHA1 Message Date
Xinze Chi
2ce38db164 osd: fix some compile warning
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-01-21 09:10:48 +00:00
Loic Dachary
84c2c25dbe Merge pull request #3433 from FrankYu/master
Doc: Fix the typo in doc/rbd/rados-rbd-cmds.rst

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-21 09:54:42 +01:00
Frank Yu
b9be97f715 Doc: Fix the typo in doc/rbd/rados-rbd-cmds.rst
Fix the typo in doc/rbd/rados-rbd-cmds.rst, also add explanation/example
when creating an image without specifying pool.

Signed-off-by: Frank Yu <flyxiaoyu@gmail.com>
2015-01-21 16:47:41 +08:00
Sage Weil
35badbc66c Merge pull request #3427 from jdurgin/wip-cram
test: fix rbd cli tests for new feature bit

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-20 19:28:51 -08:00
Josh Durgin
fe93f73aac test: fix rbd cli tests for new feature bit
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-01-20 17:13:10 -08:00
Josh Durgin
946958c13c qa: disable automatic locking for manual locking test
Automatic locking hides the ESHUTDOWN from the caller, which is how
this test detects that blacklisting works.

Fixes: #10592
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2015-01-20 15:56:12 -08:00
Vu Pham
c68ecc7431 xio: Enable xio option to call fork init
Ceph fork when running as daemon. This fix call xio option to enforce
Accelio to explicitly call ibv_fork_init() to avoid cq overrun issue.

Signed-off-by: Vu Pham <vu@mellanox.com>
2015-01-20 15:24:49 -08:00
Dong Yuan
b1b299d337 osd: revert d427ca3540
d427ca3540 reversed the order of localt
and op_t, while some logic depends on the order of localt and op_t.

This commit revert d427ca3540.

Fix http://tracker.ceph.com/issues/10534.

Change-Id: I5adba561d10274e3d12f89418a755c39e5e5f086
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
2015-01-20 13:17:24 -08:00
Dong Yuan
46347fccc1 osd: Transction::append SHOULD NOT modify other.op_bl
the other.op_bl SHOULD NOT be changes during append operation,
we use additional bufferlist to avoid this problem

Change-Id: I5d4a8c9ed3d0b926ca4bbdcdadf72cb4d5fde53c
Signed-off-by: Dong Yuan <yuandong1222@gmail.com>
2015-01-20 13:17:24 -08:00
Sage Weil
64a4cb8b1d Merge pull request #3408 from ceph/wip-10257
mon: PGMonitor: several stats output error fixes

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-20 11:30:00 -08:00
Loic Dachary
58ab125d93 Merge pull request #3423 from yuyuyu101/rename-test-msgr
test_msgr: Rename unittest_msgr to ceph_test_msgr

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-20 19:21:33 +01:00
Loic Dachary
68af510914 ceph-disk: do not reuse partition if encryption required
If encryption is required, an existing journal partition must not be
reused. If an existing partition that was not prepared with ceph-disk is
found and reused, the caller will assume it is encrypted although it is
not.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-01-20 19:07:29 +01:00
Haomai Wang
48963babff test_msgr: Rename unittest_msgr to ceph_test_msgr
Because ceph_test_msgr will run a lot of times than unittest expected,
move it into qa suites.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-21 00:59:28 +08:00
Joao Eduardo Luis
b311e7c362 mon: PGMonitor: skip zeroed osd stats on get_rule_avail()
Fixes: #10257

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-20 16:18:44 +00:00
Joao Eduardo Luis
8be6a6ab2a mon: PGMonitor: available size 0 if no osds on pool's ruleset
get_rule_avail() may return < 0, which we were using blindly assuming it
would always return an unsigned value.  We would end up with weird
values if the ruleset had no osds.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-20 16:13:48 +00:00
Loic Dachary
079fac2e82 Merge pull request #3192 from gravitystorm/patch-1
Replace placeholder with 'gateway'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-20 17:02:19 +01:00
Andy Allan
e84f27e343 doc: Replace placeholder with 'gateway'
This section is where all the placeholders are replaced by example text, this one had been missed out.

Signed-off-by: Andy Allan <github@gravitystorm.co.uk>
2015-01-20 15:47:07 +00:00
Sage Weil
72e146ce29 Merge pull request #3414 from vuhuong/wip-cmake-fix
cmake: Fix CMakelist.txt to remove depleted files

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-20 07:45:15 -08:00
Loic Dachary
2b86479b4c Merge pull request #3419 from Nairolf21/wip-documentation
doc: Introduce the term MON at http://ceph.com/docs/master/rados/

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-20 14:22:53 +01:00
nairolf21
88b1032194 Introduce the term MON at http://ceph.com/docs/master/rados/
http://tracker.ceph.com/issues/10203 Fixes:#10203

Signed-off-by: Florian Coste <fcoste21@gmail.com>
2015-01-20 14:19:26 +01:00
Loic Dachary
b7cc6afb19 Merge pull request #3421 from hazem92/wip-documentation
doc: mon should be listed before osd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-20 14:13:21 +01:00
Hazem
08faee0752 doc: mon should be listed before osd
When deploying a Ceph cluster, the mon must be run first.
In the list shown at http://ceph.com/docs/master/rados/configuration/
it would therefore be better to have mon listed before osd.

http://tracker.ceph.com/issues/10204 Fixes: #10204

Signed-off-by: Hazem <hazem.amara@telecom-bretagne.eu>
2015-01-20 14:10:45 +01:00
Loic Dachary
852ea87447 Merge pull request #3420 from Anols/wip-documentation
doc: missing the reference to "ceph-deploy-new"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-20 13:36:09 +01:00
Loic Dachary
119add673c Merge pull request #3418 from ThomasCantin/wip-documentation
doc: Network Configuration Reference duplicate string #3418 

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-20 12:15:32 +01:00
Anols
6b1c92c287 Doc : Documentation#10205
Missing the reference of "ceph-deploy-new".

https://tracker.ceph.com/issues/10205

Signed-off-by: AYARI <ayari_anis@live.fr>
2015-01-20 12:06:07 +01:00
ThomasCantin
b8dd228cad doc bug 10206 2015-01-20 11:32:24 +01:00
Josh Durgin
8d1de54b30 Merge pull request #3164 from ceph/wip-librbd-rados-stub
librados test driver and librbd unit test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-20 00:11:22 -08:00
Josh Durgin
ae6bd610e2 Merge pull request #3411 from ceph/wip-10576
ceph_test_rados_api_misc: do not assert rbd feature match

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-19 22:26:02 -08:00
Sage Weil
9147c62989 ceph_test_rados_api_misc: do not assert rbd feature match
This test fails on upgrades when we (or the server) have new
features.  Make it less fragile.

Fixes: #10576
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-19 18:28:20 -08:00
Vu Pham
ffee996eb6 cmake: Fix CMakelist.txt to remove depleted files
- remove depleted tools/ceph_mon_store_converter_srcs
- replace librbd source file (WatchCtx.cc to ImageWatcher.cc)

Signed-off-by: Vu Pham <vu@mellanox.com>
2015-01-19 12:56:48 -08:00
Sage Weil
0ab0ce7e2d Merge pull request #3334 from dachary/wip-10216-jerasure-sync
erasure-code: update jerasure/gf-complete submodules
2015-01-19 12:39:36 -08:00
Sage Weil
82ad6c5c9f Merge pull request #3375 from XinzeChi/wip-journal-seq
osd: fix journal header.committed_up_to

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-19 12:39:04 -08:00
Sage Weil
dd99b7d989 Merge pull request #3320 from wonzhq/lfn_open
FileStore: return error if get_index fails in lfn_open

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-19 12:38:28 -08:00
Sage Weil
01af73bc45 Merge pull request #3211 from yuyuyu101/wip-10172
AsyncMessenger: Bind thread to core, use buffer read and fix some bugs
2015-01-19 12:38:01 -08:00
Sage Weil
075012bd18 Merge pull request #3221 from ceph/wip-9440
mon: log health changes to clog

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-19 12:36:26 -08:00
Sage Weil
8318a2e5e2 Merge pull request #3382 from xinxinsh/wip-fix
fix command 'ceph pg dump_stuck degraded'

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-19 12:35:58 -08:00
Sage Weil
d53275c6de ceph_test_objectstore: fix keyvaluestore name
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-19 12:33:20 -08:00
Samuel Just
738f8687d5 PGBackend: do not update oi digest on inconsistent object
Otherwise, repair can race with the oi update.  Also, it doesn't really
make sense to update the oi attr if the object is inconsistent.

Fixes: #10524
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-01-19 12:08:42 -08:00
Mykola Golub
8ab3c41db7 osd: new pool safeguard flags: nodelete, nopgchange, nosizechange
* nodelete - pool can't be deleted
* nopgchange - pool's pg and pgp num can't be changed
* nosizechange - pool's size and min size can't be changed

This is intended to help some poor admin to avoid a very bad day.

Fixes: #9792 (but in a different way than it was proposed there)
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-19 21:50:28 +02:00
Gregory Farnum
c15f2d5056 Merge pull request #3338 from ceph/wip-recover-dentries
#9883 tools/cephfs: add recover_dentries to journaltool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-19 10:50:56 -08:00
Josh Durgin
f9f695c017 Merge pull request #3400 from kylinstorage/fix-rbd-watch
fix rbd watch command for v2 image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-19 09:39:51 -08:00
Yehuda Sadeh
0dca07379b Merge remote-tracking branch 'origin/wip-bi-sharding-3' 2015-01-19 09:33:46 -08:00
Yehuda Sadeh
6613358ddc Revert "Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next"
This reverts commit f79d8f24e9, reversing
changes made to 896c8899ac.
2015-01-19 09:26:00 -08:00
Yehuda Sadeh
f79d8f24e9 Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next 2015-01-19 09:14:32 -08:00
Josh Durgin
ac93c28522 Merge pull request #3396 from leseb/doc-openstack-fix-glance
doc: Fix OpenStack Glance configuration

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-19 08:38:37 -08:00
Sage Weil
ce1e1fe4b2 Merge pull request #3401 from FrankYu/master
Doc: rbd-snapshot: Fix the typo
2015-01-19 08:34:32 -08:00
Loic Dachary
b5e79a8842 Merge pull request #3374 from dachary/wip-mailmap
mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-19 17:06:46 +01:00
John Spray
66f3bd6278 tools: output per-event errors from recover dentries 2015-01-19 15:16:46 +00:00
John Spray
3e15fd5f06 tools: handle hardlinks in recover_dentries
Signed-off-by: Johh Spray <john.spray@redhat.com>
2015-01-19 14:09:34 +00:00
John Spray
9d91757559 tools: recover_dentries efficiency
Avoid a redundant stat, and gather updates to a frag
into a single OMAP get/set.

Still could be heaps more efficient in the case of
many updates to the same dirs by adding in a little
cache and batching the updates.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-19 14:09:34 +00:00