Sage Weil
61e592ad0b
Merge pull request #12286 from dillaman/wip-18123
...
rados: optionally support reading omap key from file
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-12-15 10:00:47 -06:00
Sage Weil
1c8903f5e2
Merge pull request #12462 from XinzeChi/wip-blk-link
...
common/blkdev: use realpath instead of readlink to resolve the recurs…
Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-15 10:00:26 -06:00
Sage Weil
dd0a1b85f5
Merge pull request #12488 from liewegas/wip-bluestore-enc
...
os/bluestore: fix ondisk encoding for blobs
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
2016-12-15 09:40:23 -06:00
Varada Kari
acd44737a8
os/bluestore/bluestore_types: bluestore_onode_t: varint encoding
...
Changing the uint32_t encoding to varint encoding saves around 120 bytes
per onode.
Signed-off-by: Varada Kari <varada.kari@sandisk.com>
2016-12-15 09:26:36 -05:00
Xie Xingguo
be1a4a2aee
Merge pull request #12502 from kylinstorage/wip-ctypos2
...
fix typos
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-12-15 18:22:50 +08:00
xianxiaxiao
c1dedf780b
rc/rgw/rgw_rados.cc : fix typos
...
Signed-off-by: xianxiaxiao <xianxia.xiao@kylin-cloud.com>
2016-12-15 09:24:56 +00:00
xianxiaxiao
c6206776b1
rc/rgw/rgw_coroutine.cc : fix typos
...
Signed-off-by: xianxiaxiao <xianxia.xiao@kylin-cloud.com>
2016-12-15 09:24:24 +00:00
xianxiaxiao
962587165c
rc/os/memstore/MemStore.h : fix typos
...
Signed-off-by: xianxiaxiao <xianxia.xiao@kylin-cloud.com>
2016-12-15 09:23:46 +00:00
xianxiaxiao
9b317f7322
rc/os/filestore/FileStore.cc : fix typos
...
Signed-off-by: xianxiaxiao <xianxia.xiao@kylin-cloud.com>
2016-12-15 09:23:05 +00:00
xianxiaxiao
8094bcaf7a
rc/os/bluestore/NVMEDevice.cc :fix typos
...
Signed-off-by: xianxiaxiao <xianxia.xiao@kylin-cloud.com>
2016-12-15 09:22:29 +00:00
xianxiaxiao
625ab0101f
rc/mon/DumplingMonCommands.h :fix typos
...
Signed-off-by: xianxiaxiao <xianxia.xiao@kylin-cloud.com>
2016-12-15 09:21:40 +00:00
Xie Xingguo
298d6190dc
Merge pull request #12495 from kylinstorage/wip-ctypos
...
Wip ctypos
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-12-15 10:42:26 +08:00
Brad Hubbard
1fdbabad7e
Merge pull request #12479 from badone/wip-ceph_test_rados_api_list-leak
...
test/rados/list.cc: Memory leak in ceph_test_rados_api_list
Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-15 11:58:44 +10:00
Jason Dillaman
60f1b1a2f2
journal: prevent repetitive error messages after being blacklisted
...
Fixes: http://tracker.ceph.com/issues/18243
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-12-14 20:49:46 -05:00
xianxiaxiao
c70e4c3659
src/os/bluestore/BlueStore.cc:fix typos
...
Signed-off-by: xianxiaxiao <xianxia.xiao@kylin-cloud.com>
2016-12-15 00:54:59 +00:00
Samuel Just
96d30395f7
Merge pull request #12493 from athanatos/wip-18113-qa
...
Wip 18113 qa
2016-12-14 16:07:27 -08:00
Samuel Just
ae40602c14
Merge remote-tracking branch 'ceph-qa-suite/master' into wip-18113-qa
2016-12-14 16:05:35 -08:00
Samuel Just
36481ff23f
Merge pull request #1310 from ceph/wip-18113
...
test: Update for new error message when doing scrub with deep-scrub e…
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-12-14 15:57:24 -08:00
Brad Hubbard
1bfabc3d63
test/rados/list.cc: Memory leak in ceph_test_rados_api_list
...
Valgrind flags a memory leak when we create a temporary from
rados_object_list_end()
Fixes: http://tracker.ceph.com/issues/18250
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-12-15 08:20:27 +10:00
Yuri Weinstein
940b96a75b
Merge pull request #12438 from songbaisen/s6
...
mon: make it more clearly to debug for paxos state
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-12-14 13:49:24 -08:00
Yuri Weinstein
167b3e1dc5
Merge pull request #12461 from liupan1111/wip-replace-atomic
...
osd: remove the lock heartbeat_update_lock, and change heatbeat_need_…
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-12-14 13:48:28 -08:00
Yehuda Sadeh
a5bc1f4888
Merge pull request #12452 from ceph/wip-rgw-fix-cr-deadlock
...
rgw: use explicit flag to cancel RGWCoroutinesManager::run()
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-12-14 13:42:51 -08:00
Samuel Just
dff7077c67
Merge pull request #12487 from athanatos/wip-rpg-rename
...
src: rename ReplicatedPG to PrimaryLogPG
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-12-14 13:27:54 -08:00
Sage Weil
d4e4e8b26d
os/bluestore/bluestore_types: bluestore_blob_t: varint encode csum_data length
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-14 15:13:26 -05:00
Sage Weil
90ba4ee6b4
os/bluestore: version shard and spanning blob buffers, not each blob
...
Instead of versioning every blob encoding, and adding a full byte
per blob, instead version the entire shard or spanning blob
chunk, since they are always encoded together.
We overload the 'features' argument here to pass through a
struct_v. This is slightly abusing an argument that is normally
used for feature bits, but only slightly.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-14 15:09:36 -05:00
Sage Weil
2af1b029ca
include/denc: pass features through to decode() on featured objects
...
This allows featured objects the *option* to do something
meaningful with the features. Generally the decoding is feature
independent, but in some cases decoding might be dependent on the
struct_v or features from a containing context and we need to
pass it through.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-14 15:06:38 -05:00
Sage Weil
9be7c540ff
os/bluestore/bluestore_types: single byte for blob struct_v
...
We forego decoding compatibility by older code by dropping
compat_v and len. We have to keep struct_v per blob here because
decode doesn't have a feature bit argument (yet?).
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-14 14:39:30 -05:00
Yehuda Sadeh
9b331f948d
Merge pull request #7639 from linuxbox2/wip-rgw-header
...
rgw: add option to log custom HTTP headers (rgw_log_http_headers)
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-12-14 11:35:24 -08:00
Samuel Just
c2c5dace33
Merge pull request #12268 from dzafman/wip-18113
...
osd: When deep-scrub errors present upgrade regular scrubs
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-12-14 11:34:24 -08:00
Varada Kari
ab9b8e734f
os/bluestore/bluestore_types: fix bluestore_pextent_t encoding
...
Signed-off-by: Varada Kari <varada.kari@sandisk.com>
2016-12-14 14:34:16 -05:00
Samuel Just
6f8e4b3810
src: rename ReplicatedPG to PrimaryLogPG
...
It's been confusing for a long time that EC pools are implemented by
ReplicatedPG. What PG/ReplicatedPG really implement is the concept
of a PG where consistency is managed by the primary via a log.
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-12-14 10:18:27 -08:00
Sage Weil
025f777dbb
Merge pull request #12453 from liewegas/qa-suite-master
...
master: merge ceph-qa-suite
2016-12-14 11:39:42 -06:00
Sage Weil
a1eaa3f00f
merge ceph-qa-suite
2016-12-14 11:29:58 -06:00
Sage Weil
c01f2ee0e2
move ceph-qa-suite dirs into qa/
2016-12-14 11:29:55 -06:00
Sage Weil
0c061c14a6
Revert "tasks/workunit.py: depth 1 clone"
...
This reverts commit 4faf77a649
.
2016-12-14 12:28:23 -05:00
Mykola Golub
4828ab63fa
Merge pull request #12420 from dillaman/wip-16176
...
librbd: properly order concurrent updates to the object map
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
2016-12-14 19:23:12 +02:00
Zack Cerza
124712a4d5
Merge pull request #1307 from ceph/wip-workunit-repo
...
tasks/workunit: use correct git mirror url
2016-12-14 10:21:05 -07:00
Sage Weil
4faf77a649
tasks/workunit.py: depth 1 clone
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-14 12:19:44 -05:00
Sage Weil
159c455a03
tasks/workunit: remove kludge to use git.ceph.com
...
This was hard-coded to ceph.git (almost) and breaks when
you specify --ceph-repo. Remove it entirely. We'll see if
github.com is better at handling our load than it used to
be!
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-14 12:18:29 -05:00
Jason Dillaman
52e46fdf21
Merge pull request #12483 from trociny/wip-18242
...
rbd-nbd: invalid error code for "failed to read nbd request" messages
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-12-14 11:40:09 -05:00
Igor Fedotov
c66977b098
os/bluestore: remove redundant onode parameter in ExtentMap methods
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-12-14 16:21:42 +00:00
Igor Fedotov
693ee50c56
os/bluestore: refactor ExtentMap::update to avoid preceeding db update if reshard takes place
...
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-12-14 16:21:30 +00:00
Sage Weil
bd83719e6e
Merge pull request #1309 from ceph/wip-16800-kefu
...
tasks/ceph: restore context of osd mount path before mkfs
2016-12-14 09:56:25 -06:00
Sage Weil
49698d6e2b
Merge pull request #12476 from liewegas/wip-vstart-rados
...
CMakeLists: add vstart-base target
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-12-14 09:23:52 -06:00
Matt Benjamin
04bf0f8ca1
rgw: add 'rgw log http headers' gloss to config-ref.rst
...
Explain the option for upstream doc.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-12-14 09:59:20 -05:00
Sage Weil
2b94702139
Merge pull request #12393 from dachary/wip-18036-throttle
...
tests: unittest_throttle avoid ASSERT_DEATH
Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-14 08:54:34 -06:00
Mykola Golub
a1a2f3a0ce
Merge pull request #12473 from dillaman/wip-18243
...
journal: avoid logging an error when a watch is blacklisted
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-12-14 16:51:04 +02:00
John Spray
2871374c38
Merge pull request #1156 from ceph/wip-kclient-python
...
Enable cephfs python tests on kclient
2016-12-14 14:09:13 +00:00
John Spray
63ae8579bf
Merge pull request #11542 from batrick/systemd-ceph-fuse
...
systemd: add ceph-fuse service file
Reviewed-by: John Spray <john.spray@redhat.com>
2016-12-14 13:55:33 +00:00
John Spray
3c7c65c669
Merge pull request #12337 from vishalkanaujia/wip_12132
...
tools: cleanup phase of cephfs-data-scan
Reviewed-by: John Spray <john.spray@redhat.com>
2016-12-14 13:52:35 +00:00