Commit Graph

38640 Commits

Author SHA1 Message Date
Josh Durgin
9a3ac5ff61 Merge pull request #3464 from ceph/wip-10614
test/librbd/fsx.c: disable RBD exclusive locking for krbd

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-22 13:28:25 -08:00
João Eduardo Luís
f31910d81c Merge pull request #3285 from ceph/wip-10439
pybind: ceph_argparse: validate incorrectly formed targets

Reviewed-by: Dan Mick <dan.mick@redhat.com>
2015-01-22 21:25:00 +00:00
Josh Durgin
448a3c3335 Merge remote-tracking branch 'origin/next' 2015-01-22 13:05:12 -08:00
Jason Dillaman
a6eadaefb7 rbd image_read.sh: disable exclusive locking
Until the kernel supports RBD exclusive locking, this test
has been updated to create shared images (exclusive locking
disabled).

Fixes: #10613
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-22 13:03:40 -08:00
Gregory Farnum
33a68604b5 Merge pull request #3458 from liewegas/wip-vstart
vstart.sh: pull default CEPH_PORT from .ceph_port

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-22 11:34:06 -08:00
Sage Weil
f13cda592d Merge pull request #3317 from ceph/wip-10474
FileJournal: Fix hang in FileJournal::close()

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-22 11:26:51 -08:00
Sage Weil
235d97a66a Merge pull request #3460 from athanatos/wip-10524
Wip 10524

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-22 11:19:47 -08:00
Sage Weil
edd345a7bd Merge pull request #3461 from athanatos/wip-10535
ceph_test_objectstore: enable keyvaluestore experimental option

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-22 11:15:46 -08:00
Sage Weil
ded972ed20 Merge pull request #3462 from athanatos/wip-10536
ReplicatedPG::_scrub: don't record digests for snapdirs

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-22 11:14:50 -08:00
Sage Weil
b5a8f8026d Merge pull request #3459 from athanatos/wip-10603
ObjectStore::_update_op: treat CLONERANGE2 like CLONE

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-22 11:12:06 -08:00
Samuel Just
387a37980f Merge pull request #3350 from liewegas/wip-10477
osd: populate blocked_by with peers we are trying to activate

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-22 11:11:35 -08:00
Sage Weil
2a38fb80c7 Merge pull request #3457 from athanatos/wip-txn-append
Wip txn append

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-22 11:11:22 -08:00
Samuel Just
1afd1c6527 Merge pull request #3351 from liewegas/wip-10512
osd: fix blocked vs blocking rqeuest requeue order on interval change

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-01-22 11:10:58 -08:00
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
f51ff28f87 vstart.sh: pull default CEPH_PORT from .ceph_port
This lets you put a unique port in .ceph_port in your working dir and
vstart.sh instances will avoid each other without having to pass
CEPH_PORT=... to each one each time.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-22 11:06:23 -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
David Zafman
07eadc453c FileJournal: Fix hang in FileJournal::close()
On FileStore::umount() when stopping and in ENOSPC condition,
don't let write_thread_entry() get stuck in commit_cond.Wait(write_lock).

Fixes: #10474

Signed-off-by: David Zafman <dzafman@redhat.com>
2015-01-22 07:04:09 -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
Jason Dillaman
2e8bb1ebfb test/librbd/fsx.c: disable RBD exclusive locking for krbd
Until the kernel supports RBD exclusive locking, this test
has been updated to disable the new feature.

Fixes: #10614
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-01-22 01:10:30 -05: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
Samuel Just
dc11ef13ce PGBackend: fix and clarify be_select_auth_object
Previously, auth would end up containing every object without a
self-evident defect -- even if they did not match each other.  Instead
of filtering out the non-matching items there, be_compare_scrubmaps now
returns one valid object and be_compare_scrubmaps gathers the other
which match it.

We can be smarter by doing this in be_select_auth_object and selecting
the largest matching set, but for now this is simpler.

Fixes: 10524
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-01-21 16:32:10 -08:00
Josh Durgin
07038a79f3 Merge branch 'next' 2015-01-21 16:11:43 -08:00
Samuel Just
b18b14b18c ObjectStore::_update_op: treat CLONERANGE2 like CLONE
Fixes: #10603
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-01-21 16:01:57 -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
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