RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-22 03:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,613 Commits 211 Branches 394 Tags 1.2 GiB
a4a9ec9d4d
Commit Graph

38613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Just
a4a9ec9d4d Merge pull request #3363 from liewegas/wip-cache-fix 
osd: fix ReplicatedPG::cancel_proxy_read_ops()

Reviewed-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
 2015-01-22 11:10:37 -08:00
Samuel Just
266cf2e5fa Merge pull request #3365 from liewegas/wip-peering 
osd: new activating pg state between peering and active

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-22 11:09:36 -08:00
Sage Weil
a76641b52f Merge pull request #3425 from vuhuong/wip-xio-fork 
xio: Enable xio option to call fork init

Reviewed-by: Matt Benjamin <matt@cohortfs.com>
 2015-01-22 08:20:51 -08:00
Sage Weil
f28ce7f481 Merge pull request #3453 from FrankYu/master 
Doc: Fix the extra blank space in doc/start/quick-rbd.rst
 2015-01-22 08:16:28 -08:00
Sage Weil
8cc3e17b24 Merge pull request #3451 from xiaoxichen/fix_memstore_statfs 
Fix memstore free space caculation

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-22 08:15:59 -08:00
Frank Yu
b04f698f56 Doc: Fix the extra blank space in doc/start/quick-rbd.rst 
Signed-off-by: Frank Yu <flyxiaoyu@gmail.com>
 2015-01-22 20:58:54 +08:00
Loic Dachary
db24cee59f Merge pull request #3450 from zhouyuan/rgw_doc_typo 
doc: Fix a typo in radosgw-admin doc

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-01-22 10:15:51 +01:00
Xiaoxi Chen
804deec15b Fix memstore free space caculation 
Originally if memstore run out of space, it will report a very
large positive number as free space. For example:

root@bigmem:~# rados df
pool name                 KB      objects       clones     degraded      unfound           rd        rd KB           wr        wr KB
rbd                 12366704        92240            0            0           0            0            0        92240     12366704
  total used        12375877        92240
  total avail   36028797009199167
  total space        2611076

st->f_bavail = st->f_blocks - used_bytes / st->f_bsize

This is due to used_bytes is an unsigned value, so compiler make the whole statement unsigned.

Fix it by adding explicit type cast,

st->f_bavail = long(st->f_blocks) - long(used_bytes / st->f_bsize)

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
 2015-01-22 16:19:44 +08:00
Yuan Zhou
9ad9ba8d10 doc: Fix a typo in radosgw-admin doc 
Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
 2015-01-22 13:31:47 +08:00
Yehuda Sadeh
6f44f7a0a9 Revert "Revert "Merge remote-tracking branch 'origin/wip-bi-sharding-3' into next"" 
Following a merge of next to master, the feature got reverted (because
it was reverted on next). Undoing.

This reverts commit 6613358ddc.
 2015-01-21 17:30:32 -08:00
Samuel Just
09c11071f8 Merge pull request #3246 from ceph/wip-9780-9781 
ceph-objectstore-tool import/export and related fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-21 16:49:19 -08:00
Josh Durgin
07038a79f3 Merge branch 'next' 2015-01-21 16:11:43 -08:00
Yehuda Sadeh
4d7a6a755e Merge pull request #3251 from theanalyst/fix/rgw/s3-10062 
wip: rgw: check keystone auth also for s3 post requests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-01-21 15:29:38 -08:00
Sage Weil
9d382e5a7c Merge pull request #3381 from liewegas/wip-pg-stat-updates 
osd: avoid spamming monitor with unchanged pg stats

Reviewed-by: Samuel Just <sjust@redhat.com>
 2015-01-21 13:53:16 -08:00
Sage Weil
e203673c03 Merge pull request #3393 from ceph/wip-osd-df 
osd: ceph osd df [tree] command

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-21 13:52:53 -08:00
Sage Weil
6633f8a3ed Merge pull request #3409 from trociny/wip-osd_pool_flags 
osd: new pool safeguard flags: nodelete, nopgchange, nosizechange

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-01-21 13:52:29 -08:00
Jason Dillaman
4d3b49e9d6 rbd: ensure aio_write buffer isn't invalidated during image import 
The buffer provided to aio_write shouldn't be invalidated until
after aio_write has indicated that the operation has completed.

Fixes: #10590
Backport: giant
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-01-21 12:23:16 -08:00
Jason Dillaman
3487683321 Merge pull request #3426 from jdurgin/wip-10592 
qa: disable automatic locking for manual locking test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2015-01-21 14:59:57 -05:00
João Eduardo Luís
9dc89b2353 Merge pull request #3259 from trociny/pg_dump_plain 
mon: improvements for 'ceph pg dump' in plain format

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
 2015-01-21 18:30:52 +00:00
Loic Dachary
2c3dc37236 Merge pull request #3431 from XinzeChi/wip-compile-warning 
osd: fix some compile warning

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-01-21 16:56:52 +01:00
Gregory Farnum
373473d35e Merge pull request #3436 from ceph/wip-10579 
qa: move fs quota to its own dir

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-01-21 07:08:27 -08:00
John Spray
a0af5de972 qa: move fs quota to its own dir 
This is because running fs/misc on a kclient
should not include quota (quota not supported
on kernel client).

Fixes: #10579
Signed-off-by: John Spray <john.spray@redhat.com>
 2015-01-21 14:36:58 +00:00
Yan, Zheng
21b11a0e51 Merge pull request #3402 from ceph/wip-10388 
#10388 PerfCounters for MDCache: strays and recovery
 2015-01-21 22:32:24 +08:00
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
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
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