]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Greg Farnum [Wed, 13 Jan 2016 01:57:04 +0000 (17:57 -0800)]
Merge branch 'wip-root-metadata' of git://github.com/jcsp/ceph into greg-fs-testing
https://github.com/ceph/ceph/pull/6179
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Yehuda Sadeh [Tue, 12 Jan 2016 18:51:20 +0000 (10:51 -0800)]
Merge pull request #6944 from linuxbox2/wip-civetwarn
rgw: warn on suspicious civetweb frontend parameters
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Ilya Dryomov [Tue, 12 Jan 2016 12:18:24 +0000 (13:18 +0100)]
Merge pull request #6332 from dx9/wip-12406-test_librdb_fsx
test/librbd/fsx: Use c++11 std::mt19937 generator instead of random_r()
Improve portability - random_r() is GNU-specific.
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Yehuda Sadeh [Mon, 11 Jan 2016 23:17:51 +0000 (15:17 -0800)]
Merge pull request #7029 from H3C/wip-yrf-rgw-fix1
rgw: let radosgw-admin bucket stats return a standard josn
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
John Spray [Mon, 11 Jan 2016 23:14:03 +0000 (23:14 +0000)]
Merge pull request #7068 from ukernel/wip-14146
mds: expose state of recovery to status ASOK command
Jason Dillaman [Mon, 11 Jan 2016 20:42:31 +0000 (15:42 -0500)]
Merge pull request #7155 from jdurgin/wip-rbd-defaults-test
pybind/test_rbd: fix test_create_defaults
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Casey Bodley [Mon, 11 Jan 2016 15:12:06 +0000 (10:12 -0500)]
Merge pull request #7171 from tchaikov/wip-enable-git-version
cmake: Add ENABLE_GIT_VERSION to avoid rebuilding
Sage Weil [Mon, 11 Jan 2016 14:04:29 +0000 (09:04 -0500)]
Merge pull request #5882 from aiicore/add_thread_names
common: add thread names
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 11 Jan 2016 14:04:06 +0000 (09:04 -0500)]
Merge pull request #7053 from xiaoxichen/fix_preboot
osd: check health state before pre_booting
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 11 Jan 2016 14:03:29 +0000 (09:03 -0500)]
Merge pull request #7059 from xiexingguo/xxg-wip-14187
osd: misc FileStore fixes
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 11 Jan 2016 14:01:46 +0000 (09:01 -0500)]
Merge pull request #7083 from cxwshawn/wip-pg_stat-fix
mon: PGMonitor: acting primary diff with cur_stat, should not set pg to stale
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 11 Jan 2016 14:01:07 +0000 (09:01 -0500)]
Merge pull request #7092 from kylinstorage/cleanup_PGLog
osd: PGLog: clean up read_log
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 11 Jan 2016 14:00:48 +0000 (09:00 -0500)]
Merge pull request #7096 from H3C/wip-yrf-message-leak
msg/simple: pipe: memory leak when signature check failed
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 11 Jan 2016 14:00:28 +0000 (09:00 -0500)]
Merge pull request #7107 from xiexingguo/xxg-wip-14227
osd: small fixes to memstore
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 11 Jan 2016 14:00:12 +0000 (09:00 -0500)]
Merge pull request #7125 from mslovy/wip-fix-bluestore-onode-attr-leak
osd: bluestore: fix bluestore onode_t attr leak
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 11 Jan 2016 13:59:54 +0000 (08:59 -0500)]
Merge pull request #7130 from liewegas/wip-bluestore
osd: bluestore: more fixes
Sage Weil [Mon, 11 Jan 2016 13:35:28 +0000 (08:35 -0500)]
Merge pull request #7168 from tchaikov/wip-fix-bluestore-test
osd: bluestore: fix bluestore_wal_transaction_t encoding test
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Mon, 11 Jan 2016 13:05:51 +0000 (14:05 +0100)]
Merge pull request #7189 from dachary/wip-mailmap
mailmap updates
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Loic Dachary [Mon, 11 Jan 2016 11:35:42 +0000 (12:35 +0100)]
Merge pull request #7021 from tchaikov/wip-rados-manpage
man: document listwatchers cmd in "rados" manpage
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Mon, 11 Jan 2016 11:32:40 +0000 (12:32 +0100)]
mailmap: Dongmao Zhang affiliation
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Mon, 11 Jan 2016 11:31:02 +0000 (12:31 +0100)]
mailmap: sort files
Signed-off-by: Loic Dachary <loic@dachary.org>
Loic Dachary [Mon, 11 Jan 2016 11:28:42 +0000 (12:28 +0100)]
Merge pull request #7173 from thesues/master
Change organization for Dongmao Zhang
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Yan, Zheng [Mon, 11 Jan 2016 11:21:03 +0000 (19:21 +0800)]
Merge pull request #7132 from jcsp/wip-14144-jcsp
mds: fix standby replay thread creation
Kefu Chai [Mon, 11 Jan 2016 08:54:07 +0000 (16:54 +0800)]
Merge pull request #7072 from dllgzcl/wip-zcl-ceph-s
mon/PGMap: show rd/wr iops separately in status reports
Reviewed-by: Kefu Chai <kchai@redhat.com>
Dongmao Zhang [Mon, 11 Jan 2016 07:40:48 +0000 (15:40 +0800)]
Change organization for Dongmao Zhang
Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
Kefu Chai [Mon, 11 Jan 2016 04:33:13 +0000 (12:33 +0800)]
cmake: Add ENABLE_GIT_VERSION to avoid rebuilding
it is a pain to see something like
"expected plugin ./ec_plugins/libec_jerasure.so version
v10.0.1-1239-g73c5763 but it claims to be
v10.0.1-1241-gdb83f12
instead" from time to time. so this is a cmake port of
b227426 .
the option ENABLE_GIT_VERSION is ON by default. if it is set OFF,
ceph_ver.h will not be recreated.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sun, 10 Jan 2016 10:34:57 +0000 (18:34 +0800)]
os/bluestore: fix bluestore_wal_transaction_t encoding test
bluestore_wal_transaction_t::seq is encoded/dumped but it is not
initialized in its ctor. so set it to 0 in its ctor.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Casey Bodley [Sat, 9 Jan 2016 18:09:44 +0000 (13:09 -0500)]
Merge pull request #7126 from tchaikov/wip-detect-bzip2-lz4
cmake: detect bzip2 and lz4
Li Wang [Sat, 9 Jan 2016 13:25:06 +0000 (21:25 +0800)]
Merge pull request #7166 from kylinstorage/wip-rbdnbd-misc
rbd-nbd: add copyright
Sage Weil [Fri, 8 Jan 2016 21:11:02 +0000 (16:11 -0500)]
os/bluestore: fix allocation vs reservation for bluefs extents
- drop the MIN cruft
- unreserve what we didn't get
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 20:22:25 +0000 (15:22 -0500)]
os/bluestore: bluestore_debug_prefill = <fill ratio>
Prefill the objectstore by fragmenting the freespace. Max free allocations
are bluestore_debug_prefragment_max bytes (default 1M). Prefill defaults
to 0, of course. One would normally just set this to .8 to get something
resembling an aged disk.
Signed-off-by: Sage Weil <sage@redhat.com>
Loic Dachary [Fri, 8 Jan 2016 18:12:06 +0000 (19:12 +0100)]
Merge pull request #7161 from liewegas/wip-port
test/mon/osd-erasure-code-profile: pick new mon port
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Fri, 8 Jan 2016 17:26:05 +0000 (12:26 -0500)]
os/bluestore: pad trailing zeros for WAL write past eof
If we're past EOF, we need to zero the rest of the block.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 16:17:02 +0000 (11:17 -0500)]
os/kstore: make fiemap behave past EOF
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 16:16:22 +0000 (11:16 -0500)]
os/bluestore: make fiemap return valid result beyond EOF
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 15:26:18 +0000 (10:26 -0500)]
vstart.sh: debug bluestore = 30
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 14:19:36 +0000 (09:19 -0500)]
test/osd/RadosModel: fix sparse read result check
The object may have trailing zeros.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 7 Jan 2016 14:14:57 +0000 (09:14 -0500)]
os/kstore: implement minimal fiemap
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 6 Jan 2016 22:59:58 +0000 (17:59 -0500)]
os/bluestore: remove #warning cruft
These are on my todo list elsewhere.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 6 Jan 2016 19:19:54 +0000 (14:19 -0500)]
os/fs: make aio EAGAIN backoff exponential
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 6 Jan 2016 19:19:43 +0000 (14:19 -0500)]
os/bluestore/BlockDevice: reduce aio queue size
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 6 Jan 2016 18:56:04 +0000 (13:56 -0500)]
os/bluestore: clean up _do_read debug output
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 6 Jan 2016 18:55:47 +0000 (13:55 -0500)]
os/bluestore/BlueFS: fix _compact_log seq jump
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 6 Jan 2016 17:57:12 +0000 (12:57 -0500)]
os/bluestore/BlockDevice: make pread() safe
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 6 Jan 2016 17:54:23 +0000 (12:54 -0500)]
os/bluestore: fix fiemap
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 5 Jan 2016 16:12:27 +0000 (11:12 -0500)]
os/bluestore: drop unused TransContext mutex and cond
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 5 Jan 2016 16:12:18 +0000 (11:12 -0500)]
os/bluestore/BlockDevice: quieter default log level
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 5 Jan 2016 03:04:28 +0000 (22:04 -0500)]
os/bluestore/BlockDevice: make flush a no-op if there was no IO
fdatasync(2) does a cache flush on the device, which we want to avoid if
we didn't actually write anything.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 5 Jan 2016 14:00:32 +0000 (09:00 -0500)]
os/bluestore: fix fiemap on object with no data
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 5 Jan 2016 03:13:07 +0000 (22:13 -0500)]
os/bluestore/BlockDevice: initiate bufferd writes at aio_write time
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Tue, 5 Jan 2016 03:08:31 +0000 (22:08 -0500)]
os/bluestore/BlueFS: buffered writes
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 18:49:23 +0000 (13:49 -0500)]
os/bluestore/BlueFS: no lock on read
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 18:44:32 +0000 (13:44 -0500)]
os/bluestore/BlueFS: do not wait for IO on flush
Wait on fsync and _flush_log only.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 18:42:51 +0000 (13:42 -0500)]
os/bluestore/BlueFS: read_random
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 18:42:06 +0000 (13:42 -0500)]
os/bluestore/BlockDevice: read_buffered
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 17:54:06 +0000 (12:54 -0500)]
os/bluestore/BlueFS: keep bool random in FileReader
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 16:29:47 +0000 (11:29 -0500)]
os/bluestore: reserve first block for label when bluefs = false
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 16:28:13 +0000 (11:28 -0500)]
os/bluestore: fix bdev label error message
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 16:11:53 +0000 (11:11 -0500)]
os/bluestore: send all old bluefs IOContexts for reap by bdev
Doing it in the aio thread ensures that there isn't a use-after-free.
Note that this is only bluefs written files.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 15:30:31 +0000 (10:30 -0500)]
os/bluestore: fix valgrind warning on fsid read
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 14:07:22 +0000 (09:07 -0500)]
os/keyvaluestore: fix valgrind warning on fsid read
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 4 Jan 2016 14:05:34 +0000 (09:05 -0500)]
os/filestore: fix valgrind warning on fsid read
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 18:04:57 +0000 (13:04 -0500)]
test/mon/osd-erasure-code-profile: pick new mon port
7108 is used by mark-down.sh
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 17:45:39 +0000 (12:45 -0500)]
Merge pull request #6911 from stiopaa1/const_variable_length
tests: add const for ec test
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 17:44:46 +0000 (12:44 -0500)]
Merge pull request #6989 from stiopaa1/message_inline
msg: remove unneeded inline
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 8 Jan 2016 16:50:36 +0000 (11:50 -0500)]
Merge pull request #7160 from yehudasa/wip-rgw-warn
rgw: fix compilation warning
Reviewed-by: Sage Weil <sage@redhat.com>
Yehuda Sadeh [Fri, 8 Jan 2016 16:44:10 +0000 (08:44 -0800)]
rgw: fix compilation warning
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Josh Durgin [Fri, 8 Jan 2016 03:50:23 +0000 (19:50 -0800)]
pybind/test_rbd: fix test_create_defaults
Adjust for default order only being applied via ceph conf since
16d50459c4996cd3b188bc5da100d1ce069f05cd
Fixes: #14279
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Fri, 8 Jan 2016 02:29:15 +0000 (18:29 -0800)]
Merge pull request #7149 from fullerdj/wip-14280
cls_rbd: enable object map checksums for object_map_save
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Josh Durgin [Fri, 8 Jan 2016 02:01:07 +0000 (18:01 -0800)]
Merge pull request #7154 from liewegas/wip-make-check
unittest_ipaddr: fix segv
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Sage Weil [Fri, 8 Jan 2016 01:53:19 +0000 (20:53 -0500)]
unittest_ipaddr: fix segv
Since
b6d0fc9e0e515e50894c08217d688a8c94db7570 we need ifa_name to
be defined.
Signed-off-by: Sage Weil <sage@redhat.com>
Li Wang [Fri, 8 Jan 2016 01:42:15 +0000 (09:42 +0800)]
Add copyright for rbd-nbd
Signed-off-by: Li Wang <li.wang@kylin-cloud.com>
Yehuda Sadeh [Fri, 8 Jan 2016 01:12:21 +0000 (17:12 -0800)]
Merge pull request #6002 from Sandy4999/wip-12890
rgw: add a method to purge all associate keys when removing a subuser
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 8 Jan 2016 01:10:43 +0000 (17:10 -0800)]
Merge pull request #6080 from clever215/wkm-master-139
rgw: modify documents and help infos' descriptions to the usage of option date when executing command "log show"
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 8 Jan 2016 01:01:15 +0000 (17:01 -0800)]
Merge pull request #4216 from rzarzynski/wip-10682
rgw: add support for "end_marker" parameter for GET on Swift account.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 8 Jan 2016 00:53:22 +0000 (16:53 -0800)]
Merge pull request #6652 from ifed01/wip-13824
rgw_admin: orphans finish segfaults
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 8 Jan 2016 00:48:19 +0000 (16:48 -0800)]
Merge pull request #7037 from mathslinux/rgw-add-missing-error-code
rgw: add missing error code for admin op API
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 8 Jan 2016 00:46:35 +0000 (16:46 -0800)]
Merge pull request #7093 from dwj192/dwj-bucket-index-fix
rgw: radosgw-admin bucket check --fix not work
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 8 Jan 2016 00:45:43 +0000 (16:45 -0800)]
Merge pull request #6817 from david-z/wip-fix-init-radosgw
rgw: fix a typo in init-radosgw
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
David Zafman [Thu, 7 Jan 2016 22:50:10 +0000 (14:50 -0800)]
Merge pull request #7102 from dzafman/wip-cot-fixes
Fix for make check.
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 7 Jan 2016 22:47:34 +0000 (17:47 -0500)]
Merge pull request #7153 from liewegas/wip-make-check
build: misc make check fixes
Sage Weil [Thu, 7 Jan 2016 22:36:18 +0000 (17:36 -0500)]
Merge pull request #7152 from liewegas/wip-hexdump
unittest_bufferlist: fix hexdump test
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Sage Weil [Thu, 7 Jan 2016 22:22:14 +0000 (17:22 -0500)]
unittest_bluefs: call close_for_write()
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 7 Jan 2016 22:19:05 +0000 (17:19 -0500)]
test/test_objectstore_memstore.sh: clear store_test_temp_dir
ceph_test_objectstore now expects this to not exist.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 7 Jan 2016 19:31:09 +0000 (14:31 -0500)]
unittest_bufferlist: fix hexdump test
Signed-off-by: Sage Weil <sage@redhat.com>
Douglas Fuller [Thu, 7 Jan 2016 19:01:19 +0000 (11:01 -0800)]
cls_rbd: enable object map checksums for object_map_save
object_map_save disables CRCs when an object map footer isn't provided.
Unconditionally re-enable object map CRCs before re-encoding the new object
map.
Fixes: #14280
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
Loic Dachary [Thu, 7 Jan 2016 13:22:30 +0000 (14:22 +0100)]
Merge pull request #6955 from dachary/wip-dev-guide-ceph-qa-suite
doc: dev: document ceph-qa-suite
Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Loic Dachary [Wed, 16 Dec 2015 18:50:55 +0000 (19:50 +0100)]
doc: dev: document ceph-qa-suite
Signed-off-by: Loic Dachary <loic@dachary.org>
Kefu Chai [Wed, 6 Jan 2016 11:37:49 +0000 (19:37 +0800)]
cmake: detect bzip2 and lz4 for rocksdb
* this change is the cmake port of
911e7a0 .
the rocksdb's Makefile will detect the installed libbz2 and libz4 by
its own. if the building env happens to have these libraries installed,
a link time dependency is introduced. so we are forced to link against
them.
* do not REQUIRE BZip2 in cmake anymore
* only link against bzip2 if it is detected
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Wed, 6 Jan 2016 11:35:30 +0000 (19:35 +0800)]
cmake: add check for liblz4
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 7 Jan 2016 11:59:33 +0000 (19:59 +0800)]
Merge pull request #7131 from ceph/wip-cmake
cmake: made rocksdb an imported library
Reviewed-by: Kefu Chai <kchai@redhat.com>
Joao Eduardo Luis [Thu, 7 Jan 2016 11:49:53 +0000 (11:49 +0000)]
Merge pull request #7073 from dllgzcl/wip-zcl-show-version
tools: monstore: add 'show-versions' command.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Ali Maredia [Wed, 6 Jan 2016 18:14:55 +0000 (13:14 -0500)]
cmake: made rocksdb an imported library
Systems with the minimum required version of CMake
such as Ubuntu Trusty Tahr don't support
INTERFACE_LINK_LIBRARIES, so rocksdb was made into
an IMPORTED library. Added ROCKSDB_INCLUDE_DIR to
simplify target_include_directories rocksdb.
Signed-off-by: Ali Maredia <amaredia@redhat.com>
Josh Durgin [Thu, 7 Jan 2016 00:18:56 +0000 (16:18 -0800)]
Merge remote-tracking branch 'origin/jewel'
Josh Durgin [Thu, 7 Jan 2016 00:18:33 +0000 (16:18 -0800)]
Merge pull request #7129 from dillaman/wip-14167-jewel
librbd: disable copy-on-read when not exclusive lock owner
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Wed, 6 Jan 2016 23:49:56 +0000 (15:49 -0800)]
Merge pull request #6886 from ssssztes/renhw-wip-14047
rbd: rbd order will be place in 22, when set to 0 in the config_opt
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Wed, 6 Jan 2016 23:43:18 +0000 (15:43 -0800)]
Merge remote-tracking branch 'origin/jewel'
Josh Durgin [Wed, 6 Jan 2016 23:34:50 +0000 (15:34 -0800)]
Merge branch 'wip-14241-jewel' of git://github.com/dillaman/ceph into jewel
librbd: don't use write_full optimization with clones
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Wed, 6 Jan 2016 23:26:28 +0000 (15:26 -0800)]
Merge pull request #7127 from trociny/wip-rbd-nbd-misc
rbd-nbd: small improvements in logging and forking
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Gregory Farnum [Wed, 6 Jan 2016 21:55:18 +0000 (13:55 -0800)]
Merge pull request #6388 from ukernel/wip-13583
ceph-fuse: fix fsync()
Reviewed-by: Greg Farnum <gfarnum@redhat.com>