Loic Dachary
b782030e87
Merge pull request #3472 from armaseg/master
...
doc: Some files still use http://ceph.newdream.net
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-23 15:20:57 +01:00
Armando Segnini
33f0afdd15
doc: Some files still use http://ceph.newdream.net
...
This probably redirects to http://ceph.com but ceph.newdream.net still appears in some places
http://tracker.ceph.com/issues/10615 Fixes : #10615
Related: #9922
Signed-off-by: Armando Segnini <armando.segnini@telecom-bretagne.eu>
2015-01-23 12:28:58 +01:00
Loic Dachary
1766351427
Merge pull request #3469 from tchaikov/fix-bashism-in-ceph-debugpack
...
ceph-debugpack: fix bashism of {1..10}
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-23 09:57:25 +01:00
Sage Weil
2d60db3b8c
Merge pull request #3449 from wonzhq/rocksdb-del
...
RocksDBStore: filterpolicy is not deleted when RocksDBStore destructs
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-22 20:03:51 -08:00
Kefu Chai
2f9b3bdcd3
ceph-debugpack: fix bashism of {1..10}
...
* replaces {1..10} with $(seq 10)
* fixes 772220@bugs.debian.org
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
2015-01-23 10:53:16 +08:00
Sage Weil
026c9cb21c
Merge pull request #3467 from ktdreyer/wip-packaging-description-formatting
...
ceph.spec.in: standardize capitalization and punctuation
2015-01-22 15:51:06 -08:00
Ken Dreyer
fff3cf91de
ceph.spec.in: capitalization and punctuation
...
Ensure that each sub-package's %description starts with a capital letter
and ends with a dot.
rpmlint has a rule that checks the Summary field, but not %description
(yet).
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-01-22 16:45:28 -07:00
Sage Weil
dd3ebf38d9
Merge pull request #3424 from dachary/wip-reuse-dmcrypt
...
ceph-disk: do not reuse partition if encryption required
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-22 14:45:04 -08:00
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
Zhiqiang Wang
623915127f
RocksDBStore: filterpolicy is not deleted when RocksDBStore destructs
...
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-01-22 16:13:39 +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