]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Xiaoxi Chen [Wed, 29 Apr 2015 05:45:52 +0000 (13:45 +0800)]
os/Newstore: flush_commit return true on STATE_KV_DONE
There is a racing condition here, if the flush_commit() call
happened after _txc_finish_kv and before next state, the context
was pushed to on_commits but no one will handle the context since
we already pass _txc_finish_kv. This bug can be easily reproduce
by putting a sleep(5) after _txc_finish_kv, and trigger the bug by
ceph-osd -i 0 --mkfs.
Fix this bug by return true directly when state >= STATE_KV_DONE(instead
of > in previous code). We already persist the data in STATE_KV_DONE so
it's safe for us to do this.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Zhiqiang Wang [Tue, 28 Apr 2015 08:24:16 +0000 (16:24 +0800)]
os/NewStore: avoid dup the data of the overlays in the WAL
When writing all the overlays, there is no need to dup the data in WAL.
Instead, we can reference the overlays in the WAL, and remove these
overlays after commiting them to the fs. When replaying, we can get
these data from the referenced overlays. Doing this way, we can save a
write and a deletion for each of the overlay data in the db.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Sage Weil [Tue, 28 Apr 2015 16:47:09 +0000 (09:47 -0700)]
os/newstore: fix multiple aio case
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 28 Apr 2015 16:28:13 +0000 (09:28 -0700)]
os/newstore: more conservative default for aio queue depth
There appears to be a kernel aio bug when the queue depth is small.
Signed-off-by: Sage Weil <sage@redhat.com>
Xiaoxi Chen [Tue, 28 Apr 2015 12:56:13 +0000 (20:56 +0800)]
os/newstore:close fd after writting with O_DIRECT
fix bug in
2b4c60e0a521ad10b94bbc82865b49f2d28c2ac9
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Zhiqiang Wang [Tue, 28 Apr 2015 08:41:39 +0000 (16:41 +0800)]
os/NewStore: need to increase the wal op length when combining overlays
Need to add the length of the combining overlays to the length of the
wal op.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Xiaoxi Chen [Fri, 17 Apr 2015 08:14:41 +0000 (16:14 +0800)]
os/Newstore:Fix collection_list_range
We need to rule out hobject_t::max before calling get_object_key
(in which will call get_filestore_key_u32 and get an assert failure)
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Sage Weil [Mon, 27 Apr 2015 21:42:55 +0000 (14:42 -0700)]
os/newstore: fix race in _txc_aio_submit
We cannot rely on the iterator pointers being valid after we submit the
aio because we are racing with the completion. Make our loop decision
before submitting and avoid dereferencing txc after that point.
Signed-off-by: Sage Weil <sage@redhat.com>
Xiaoxi Chen [Mon, 27 Apr 2015 08:28:33 +0000 (16:28 +0800)]
os/newstore : Do not need to call fdatasync if using direct.
skip ::fdatasync if in direct mode.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Zhiqiang Wang [Mon, 27 Apr 2015 08:27:21 +0000 (16:27 +0800)]
osd/NewStore: fix for skipping the overlay in _do_overlay_trim
When the offset of the write starts at the end of the overlay, that is,
p->first + p->second.length == offset, the overlay could be skipped as
well.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Zhiqiang Wang [Mon, 27 Apr 2015 08:15:26 +0000 (16:15 +0800)]
os/NewStore: combine contiguous overlays when writing all the overlays
Combine contiguous overlay writes to reduce the numbers of WAL writes
and fs writes.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Xiaoxi Chen [Mon, 27 Apr 2015 07:49:28 +0000 (15:49 +0800)]
os/Nestore: batch cleanup
batch cleanup wal.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Sage Weil [Fri, 24 Apr 2015 20:41:35 +0000 (13:41 -0700)]
os/newstore: fix _txc_aio_submit
The aios may complete before _txc_aio_submit completes. In fact, the aio
may complete, commit to the kv store, and then queue more wal aio's before
we finish the loop. Move aios to a separate list to ensure we only submit
them once and do not right another CPU adjusting the list.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 23 Apr 2015 21:51:51 +0000 (14:51 -0700)]
os/newstore: throttle over entire write lifecycle
Take a global throttle when we submit ops and release when they complete.
The first throttles cover the period from submit to commit, while the wal
ones also cover the async post-commit wal work. The configs are additive
since the wal ones cover both periods; this should make them reasonably
idiot-proof.
Signed-off-by: Sage Weil <sage@redhat.com>
Zhiqiang Wang [Thu, 23 Apr 2015 02:34:37 +0000 (10:34 +0800)]
os/NewStore: data_map shouldn't be empty when writing all overlays
This should be an assert instead of creating new data_map.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Zhiqiang Wang [Thu, 23 Apr 2015 02:25:15 +0000 (10:25 +0800)]
os/NewStore: clear the shared_overlays after writing all the overlays
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Zhiqiang Wang [Thu, 23 Apr 2015 01:41:35 +0000 (09:41 +0800)]
os/NewStore: don't clear overlay in the create/append case of write
Shouldn't clear the overlay in the create/append case of write.
Otherwise, this removes the overlay data and leads to data loss.
Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Sage Weil [Tue, 28 Jul 2015 17:24:00 +0000 (13:24 -0400)]
os/newstore: debug io_submit EAGAIN
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 23 Apr 2015 00:22:32 +0000 (17:22 -0700)]
os/newstore: release wal throttle when wal completes, not when queued
If we take the aio path, the io is queued immediately and the resources
are released back to the pool. Instead release them when wal completes.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 28 Jul 2015 17:22:50 +0000 (13:22 -0400)]
os/newstore: todo
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 21 Apr 2015 00:10:19 +0000 (17:10 -0700)]
os/newstore: move toward state-machine
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 20 Apr 2015 22:33:11 +0000 (15:33 -0700)]
os/newstore: use aio for wal writes, too
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 20 Apr 2015 19:48:38 +0000 (12:48 -0700)]
os/newstore: a few comments about wal
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 20 Apr 2015 19:49:46 +0000 (12:49 -0700)]
os/newstore: combined O_DSYNC with O_DIRECT
This avoids the need for an explicit fdatasync when doing O_DIRECT.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 20 Apr 2015 17:34:04 +0000 (10:34 -0700)]
os/newstore: basic aio support
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 20 Apr 2015 17:33:14 +0000 (10:33 -0700)]
os/Newstore: add newstore_db_path option
The load of Keyvalue DB is heavy, allow user to put
DB to a seperate(fast) device.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Sage Weil [Thu, 16 Apr 2015 23:30:31 +0000 (16:30 -0700)]
os/newstore: throttle wal work
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 16 Apr 2015 23:01:12 +0000 (16:01 -0700)]
os/newstore: show # o_direct buffers in debug output
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 16 Apr 2015 22:01:20 +0000 (15:01 -0700)]
os/newstore: use a threadpool for applying wal events
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 16 Apr 2015 21:08:55 +0000 (14:08 -0700)]
os/newstore: rebuild buffers to be page-aligned for O_DIRECT
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 16 Apr 2015 00:10:48 +0000 (17:10 -0700)]
ceph_test_objectstore: fix omap test cleanup
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 15 Apr 2015 22:35:16 +0000 (15:35 -0700)]
os/newstore: use fdatasync instead of fsync
On XFS at least, fdatasync is sufficient to make data readable.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 15 Apr 2015 17:35:26 +0000 (10:35 -0700)]
os/newstore: update todo
Signed-off-by: Sage Weil <sage@redhat.com>
Xiaoxi Chen [Wed, 15 Apr 2015 16:10:08 +0000 (00:10 +0800)]
os/Newstore: Check onode.omap_head in valid() and next()
The db iter will be set to KeyValueDB::Iterator() if onode.omap_head
not present. In that case if we touch the db iter we will get a segmentation
fault.
Prevent to touch the db iter when onode.omap_head is invalid(equals to 0).
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Xiaoxi Chen [Wed, 15 Apr 2015 08:22:28 +0000 (16:22 +0800)]
Use .str() to output a stringstream.
a nit.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Xiaoxi Chen [Mon, 13 Apr 2015 08:21:00 +0000 (16:21 +0800)]
os/Newstore: Allow gap in _do_write append mode
We can allow some gap so we only need to ensure
onode.size <= offset.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Xiaoxi Chen [Wed, 8 Apr 2015 15:35:50 +0000 (23:35 +0800)]
Implement get_omap_iterator
implemented get_omap_iterator
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Xiaoxi Chen [Sun, 12 Apr 2015 03:28:13 +0000 (11:28 +0800)]
os/KeyValueDB: Add raw_key() interface for IteratorImpl
raw_key() is useful to split out the prefix.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Xiaoxi Chen [Fri, 10 Apr 2015 01:39:44 +0000 (09:39 +0800)]
test/store_test Add get_omap_iterator test cases
omap iterator test cases include:
iter aganist omap
lower_bound
upper_bound
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Sage Weil [Mon, 17 Aug 2015 19:23:19 +0000 (15:23 -0400)]
os/newstore: drop sync()
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Aug 2015 19:23:03 +0000 (15:23 -0400)]
os/newstore: drop sync()
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Aug 2015 19:22:42 +0000 (15:22 -0400)]
os/newstore: drop flush
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 17 Aug 2015 19:22:26 +0000 (15:22 -0400)]
os/newstore: drop sync_and_flush
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 10 Apr 2015 23:55:18 +0000 (16:55 -0700)]
os/newstore: use FS::zero()
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 10 Apr 2015 23:49:07 +0000 (16:49 -0700)]
os/newstore: use O_DIRECT is write is page-aligned
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 10 Apr 2015 23:35:40 +0000 (16:35 -0700)]
os/newstore: pass flags to _{open,create}_fid
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 10 Apr 2015 23:33:00 +0000 (16:33 -0700)]
os/newstore: drop unused FragmentHandle
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 10 Apr 2015 22:29:16 +0000 (15:29 -0700)]
os/newstore: do not call completions from kv thread
Reads may call wait_wal() holding user locks, and so we cannot block
progress on WAL completion/flushing by calling callbacks that may take
user locks.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 10 Apr 2015 21:28:13 +0000 (14:28 -0700)]
os/newstore: let wal cleanup kv txn get batched
No need to trigger another sync kv commit here; just let the next KV
commit catch it.
We could possibly do a bit better here by not waking up the kv thread at
all...
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 10 Apr 2015 18:54:01 +0000 (11:54 -0700)]
os/newstore: fix off-by-one on overlay_max_length
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 9 Apr 2015 17:52:06 +0000 (10:52 -0700)]
os/newstore: use lower_bound for finding overlay extents in map
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 9 Apr 2015 16:16:03 +0000 (09:16 -0700)]
os/newstore: use overlay even if it is a new object or append
This avoids the fsync for small writes.
Signed-off-by: Sage Weil <sage@redhat.com>
Xiaoxi Chen [Wed, 8 Apr 2015 16:13:10 +0000 (00:13 +0800)]
os/Newstore:Change assert in get_onode
db->get will return negtive when key is not found.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Sage Weil [Tue, 7 Apr 2015 22:24:16 +0000 (15:24 -0700)]
os/newstore: open by handle
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 7 Apr 2015 22:22:09 +0000 (15:22 -0700)]
os/newstore: use fs abstaction layer
Signed-off-by: Sage Weil <sage@redhat.com>
Xiaoxi Chen [Tue, 7 Apr 2015 08:41:27 +0000 (16:41 +0800)]
os/newstore: cap fid_max below newstore_max_dir_size
Prevent fid_max over the max_dir_size when preallocation.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Sage Weil [Tue, 7 Apr 2015 18:25:00 +0000 (11:25 -0700)]
os/newstore: keep smallish overlay extents in kv db
If we have a small overwrite, keep the extent in the key/value database.
Only write it back to the file/fragment later, and when we do, write them
all at once.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Aug 2015 14:10:54 +0000 (10:10 -0400)]
os/newstore: assigned unique nid to each new object
Use this as the key for omap (omap_head), but keep the omap_head field
so that we can tell when no omap data is present.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 28 Jul 2015 16:59:39 +0000 (12:59 -0400)]
os/newstore: consolite collection_list to a single implementation
Signed-off-by: Sage Weil <sage@redhat.com>
Xiaoxi Chen [Fri, 3 Apr 2015 01:48:43 +0000 (09:48 +0800)]
Clear removed_collections after reap
Previous code forgot to clear the removed_collections queues
after reaped the collections in _reap_collection.
Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Sage Weil [Wed, 1 Apr 2015 21:44:45 +0000 (14:44 -0700)]
os/newstore: ref count OpSequencer
Our OpSequencer may live longer than the ObjectStore::Sequencer interface
object does.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 1 Apr 2015 16:46:53 +0000 (09:46 -0700)]
os/newstore: send complete overwrite to a new fid
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Aug 2015 14:10:25 +0000 (10:10 -0400)]
os/newstore: clone omap
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 18 Aug 2015 14:09:20 +0000 (10:09 -0400)]
newstore: initial version
This includes a bunch of new ceph_test_objectstore tests, and a ton of fixes
to existing tests so that objects actually live inside the collections they
are written to.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 27 Mar 2015 23:07:10 +0000 (16:07 -0700)]
vstart.sh: debug newstore
Sage Weil [Tue, 1 Sep 2015 17:37:46 +0000 (13:37 -0400)]
Revert "os/Makefile.am: add os/fs/XFS.cc"
This reverts commit
32331ede41ef5b1dc4eb85304d2e86d7c027c75c .
Doh, this is in a conditional below.
David Zafman [Tue, 1 Sep 2015 17:25:08 +0000 (10:25 -0700)]
Merge pull request #5173 from ceph/wip-12000-12200
Fast read for erasure coding pool and erasure code error handling
Error handling
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Fast Read
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Sage Weil [Tue, 1 Sep 2015 17:18:21 +0000 (13:18 -0400)]
os/Makefile.am: add os/fs/XFS.cc
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Tue, 1 Sep 2015 11:00:46 +0000 (19:00 +0800)]
Merge pull request #5695 from tchaikov/wip-12012
osd: translate sparse_read to read for ecpool
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 28 Aug 2015 03:36:49 +0000 (11:36 +0800)]
ceph_test_rados_api_aio: add a test for aio_sparse_read
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 27 Aug 2015 14:57:16 +0000 (22:57 +0800)]
ceph_test_rados_api_io: add tests for sparse_read
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 26 Aug 2015 07:41:13 +0000 (15:41 +0800)]
ceph_test_rados: also send sparse_read in ReadOp
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 28 Aug 2015 06:27:53 +0000 (14:27 +0800)]
osd: should use ec_pool() when checking for an ecpool
we were using pool.info.require_rollback() in do_osd_ops() when
handling OP_SPARSE_READ to tell if a pool is an ecpool. should
use pool.info.ec_pool() instead.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 27 Aug 2015 14:57:49 +0000 (22:57 +0800)]
osd: translate sparse_read to read for ecpool
Fixes: #12012
Signed-off-by: Kefu Chai <kchai@redhat.com>
David Zafman [Tue, 1 Sep 2015 02:28:18 +0000 (19:28 -0700)]
osd: Fix the diagnostic logging mostly to dout(20)
Signed-off-by: David Zafman <dzafman@redhat.com>
Loic Dachary [Mon, 31 Aug 2015 20:35:12 +0000 (22:35 +0200)]
Merge pull request #5652 from dachary/wip-mailmap
mailmap updates
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Fri, 28 Aug 2015 20:54:49 +0000 (16:54 -0400)]
ceph.spec: package cls_numops
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 31 Aug 2015 17:50:11 +0000 (13:50 -0400)]
Merge pull request #5684 from liewegas/wip-hammer-corpus
add hammer objects to ceph-object-corpus
Sage Weil [Mon, 31 Aug 2015 17:31:06 +0000 (13:31 -0400)]
Merge pull request #5451 from XinzeChi/wip-recovery-attr
bug fix: osd: do not cache unused buffer in attrs
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 31 Aug 2015 15:33:13 +0000 (11:33 -0400)]
Merge pull request #5357 from ceph/wip-12325
mon: LogMonitor: handle boolean options consistently
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Mon, 31 Aug 2015 15:29:14 +0000 (11:29 -0400)]
Merge remote-tracking branch 'gh/infernalis'
Sage Weil [Mon, 31 Aug 2015 15:08:46 +0000 (11:08 -0400)]
Merge pull request #5622 from ceph/wip-memstore
MemStore locking enhancements and bufferlist alternative
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Sage Weil [Mon, 31 Aug 2015 15:06:52 +0000 (11:06 -0400)]
Merge pull request #5705 from dachary/wip-12786-centos-systemd
ceph-disk: {CentOS,RHEL} >= 7 && Fedora >= 22 are systemd
Reviewed-by: Travis Rhoden <trhoden@redhat.com>
Sage Weil [Mon, 31 Aug 2015 15:06:27 +0000 (11:06 -0400)]
Merge pull request #5699 from dachary/wip-11881-multipath
ceph-disk: add multipath support
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Mon, 31 Aug 2015 14:33:15 +0000 (22:33 +0800)]
Merge pull request #5655 from duduribeiro/patch-1
doc: update ruby doc with the aws-sdk gem usage
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kadu Ribeiro [Tue, 25 Aug 2015 01:25:57 +0000 (22:25 -0300)]
doc: update ruby doc with the aws-sdk gem usage
Since I'm using ceph with the `aws-sdk` gem (https://github.com/aws/aws-sdk-ruby) instead `aws-s3` (https://github.com/marcel/aws-s3) because the aws-s3 have a trouble with the new active support (https://github.com/marcel/aws-s3/issues/98) (and the downgrade active-support wasn't a option), I proposed change the doc to receive the usage instructions with the aws-sdk gem.
I used ceph with aws-sdk gem with this commands.
Thanks so much
Signed-off-by: Carlos E Ribeiro <mail@carlosribeiro.me>
Sage Weil [Mon, 31 Aug 2015 14:16:10 +0000 (10:16 -0400)]
Merge pull request #4869 from joaquimrocha/cls_numops
CLS numops
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
Gregory Farnum [Mon, 31 Aug 2015 14:12:19 +0000 (15:12 +0100)]
Merge pull request #5724 from ceph/wip-i386
perf_serialize: fix i386 build
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Mon, 31 Aug 2015 13:24:02 +0000 (09:24 -0400)]
Merge pull request #5713 from yuyuyu101/wip-12798
Fix keyvaluestore fails ceph_test_objectstore
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 31 Aug 2015 10:12:43 +0000 (18:12 +0800)]
Merge pull request #5603 from wonzhq/doc-read-recency
doc: add the description for min_read_recency_for_promote
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 31 Aug 2015 09:43:52 +0000 (17:43 +0800)]
Merge pull request #5460 from ceph/port/new
OSX and BSD derivatives port
Reviewed-by: Kefu Chai <kchai@redhat.com>
Joao Eduardo Luis [Mon, 31 Aug 2015 09:17:58 +0000 (10:17 +0100)]
Merge pull request #4896 from xinxinsh/wip-monitor-dump-transaction
MonitorDBStore : make monitor transaction more readable
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Sat, 29 Aug 2015 13:33:31 +0000 (21:33 +0800)]
make: do not compile XFS.cc if --without-libxfs
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 29 Aug 2015 12:53:40 +0000 (20:53 +0800)]
os/fs: include <sys/mount.h> on osx
Signed-off-by: Kefu Chai <kchai@redhat.com>
Yan, Zheng [Mon, 17 Aug 2015 02:51:58 +0000 (10:51 +0800)]
test_c_headers: don't use -Werror option for clang
When using clang to compile ceph, there are lots of warnings:
clang: warning: argument unused during compilation: '-Wp,-D_FORTIFY_SOURCE=2'
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Yan, Zheng [Mon, 17 Aug 2015 02:44:44 +0000 (10:44 +0800)]
ceph: use 'sed -ie' to edit file in-place
On OSX, 'sed -i script' does not work, because it considers 'script'
as suffix of backup file. 'sed -ie script' works on both OSX and Linux.
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Yan, Zheng [Fri, 14 Aug 2015 14:52:09 +0000 (22:52 +0800)]
client: fix compile error on OSX
On OSX, type of the 3rd parameters of getgrouplist is 'int *'
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Yan, Zheng [Fri, 14 Aug 2015 14:27:16 +0000 (22:27 +0800)]
common/blkdev: fix complie error on OSX/FreeBSD
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Yan, Zheng [Fri, 14 Aug 2015 14:06:11 +0000 (22:06 +0800)]
common/admin_socket: fix compile error on OSX
Invalid operands to binary expression ('__bind<int &, sockaddr *,
unsigned long>' and 'int')
Without :: clang confuses C bind function and std::bind().
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Yan, Zheng [Fri, 14 Aug 2015 13:56:16 +0000 (21:56 +0800)]
tests: only use posix_fadvise on linux
Signed-off-by: Yan, Zheng <zyan@redhat.com>