Commit Graph

58507 Commits

Author SHA1 Message Date
Jason Dillaman
99cd30914f Merge pull request #11370 from ceph/wip-krbd-unmap-options
rbd: expose rbd unmap options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-10-10 10:17:09 -04:00
Sage Weil
3cc40d769b Merge pull request #11255 from dzafman/wip-scrub-boundary
osd: fix scrub boundary to not include a SnapSet

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-10 09:12:16 -05:00
Sage Weil
e416ccafc1 Merge pull request #11377 from xiexingguo/xxg-wip-bluestore-1008
os/bluestore: drop inline_dirty from struct ExtentMap

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-10 08:48:43 -05:00
xie xingguo
096811cf06 os/bluestore: narrow scope of 'pos'
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-10 19:39:18 +08:00
John Spray
150d383272 Merge pull request #11281 from jcsp/wip-17466
mds: handle bad standby_for_fscids in fsmap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-10-10 13:21:07 +02:00
xie xingguo
262f2c429e os/bluestore: get rid of multiple call to dirty_blob()
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-10 18:52:23 +08:00
Kefu Chai
7f21c6f7fc Merge pull request #10722 from stiopaa1/mon_moncap_addMoveToStrings
mon/MonCap.h: add std::move for std::string

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-10 14:47:21 +08:00
Kefu Chai
d2b6b34215 Merge pull request #10916 from jordan41177/fix-17169
mon: OSDMonitor: fix the check error of pg creating

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-10 14:39:56 +08:00
Kefu Chai
838de494fb Merge pull request #10720 from wjwithagen/wip-wjw-freebsd-socket-shutdown
msg/simple/Accepter.cc: replace shutdown() with selfpipe event in poll() (FreeBSD)

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-10 14:38:56 +08:00
Kefu Chai
d06c13c58d Merge pull request #10601 from stiopaa1/mon_monclient_subwantRemoveCount
mon/MonClient.h: remove repeated searching of map

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-10 14:33:54 +08:00
Kefu Chai
0566f7b635 Merge pull request #11145 from atheism/msg-async-fix-specifier
msg: fix format specifier for unsigned value id

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-10 14:32:31 +08:00
xie xingguo
9ebdab9983 os/bluestore: fix raw blob encoded size
The maximum length of fixed fields of bluestore_blob_t shall be:

uint64_t sbid                       ///< 8 bytes
uint32_t compressed_length_orig     ///< 4 bytes
uint32_t compressed_length          ///< 4 bytes
uint32_t flags                      ///< 4 bytes
uint8_t csum_type                   ///< 1 byte
uint8_t csum_chunk_order            ///< 1 byte
unused_t unused;                    ///< 2 bytes

8 + 4 + 4 + 4 + 1 + 1 + 2 = 24

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-09 20:04:33 +08:00
xie xingguo
70de0985eb os/bluestore: add counter to trace number of garbage collection reads
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-09 17:33:27 +08:00
xie xingguo
9d8f444cd2 os/bluestore: kill dead lines to keep code clean
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-09 15:40:50 +08:00
Kefu Chai
cece97d993 Merge pull request #11379 from zealoussnow/fix-dead-link
doc: fix dead link "Hardware Recommendations"

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-09 13:53:28 +08:00
Leo Zhang
c387c87434 doc: fix dead link "Hardware Recommendations"
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
2016-10-08 22:41:59 +08:00
xie xingguo
14158a9028 os/bluestore: drop inline_dirty from struct ExtentMap
We don't need this member as we can simply clear inline_bl
to mark it as dirty.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-08 16:24:22 +08:00
Yehuda Sadeh
a4ce1f56c1 Merge pull request #10057 from Yan-waller/yj-wip-rgwradosccremover-0701
rgw: minor cleanup

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-10-07 14:04:45 -07:00
Yehuda Sadeh
799ee64702 Merge pull request #10674 from ceph/wip-rgw-no-empty-amzrqid
rgw/rest: don't print empty x-amz-request-id

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-10-07 14:02:27 -07:00
Yehuda Sadeh
4e62c99bb3 Merge pull request #10849 from zhangsw/master
rgw: remove a redundant judgement when listng objects.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-10-07 13:57:18 -07:00
Mykola Golub
b170f9ddc0 Merge pull request #11353 from dillaman/wip-17423
librbd: API changes to support separate data pool

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-10-07 22:04:15 +03:00
Ilya Dryomov
620f5e1455 rbd: expose rbd unmap options
Reuse rbd map -o infrastructure to expose rbd unmap options in
a similar fashion.  Currently it's just one bool option, but we may
need more in the future.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2016-10-07 17:21:15 +02:00
Ilya Dryomov
ba8f9ee791 rbd: fix up terminology in help texts
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2016-10-07 16:22:26 +02:00
Sage Weil
c3c5c14e74 Merge pull request #11361 from batrick/fs-rm-formatting
mon: add missing space in warning message

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-07 08:49:46 -05:00
Sage Weil
275ebcfd6c Merge pull request #11364 from badone/wip-_lsb_release_-dead-declarations
osd: Remove unused '_lsb_release_' declarations

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-07 08:47:45 -05:00
Sage Weil
df4973c14c Merge pull request #11349 from liewegas/wip-compressor
compressor: fixes and tests; disable zlib isal (it's broken)

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-10-07 08:42:23 -05:00
Sage Weil
d834a6d318 Merge pull request #11366 from xiexingguo/xxg-wip-bluestore-1007
os/bluestore: simplify blob status checking for small writes

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-07 08:41:35 -05:00
Sage Weil
90de6e0dc1 unittest_compression: naming nit
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-07 09:33:33 -04:00
Sage Weil
46b67f3d17 unittest_compression: restore zlib_isal setting
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-07 09:33:08 -04:00
John Spray
020e0f8523 Merge pull request #11236 from renhwztetecs/renhw-wip-cephfs-journal-tool
tool/cephfs: displaying "list" in journal event mode

Reviewed-by: John Spray <john.spray@redhat.com>
2016-10-07 15:16:06 +02:00
Orit Wasserman
a32ead391f Merge pull request #10021 from rzarzynski/wip-rgw-swift-auth-errors
rgw: handle Swift auth errors in a way compatible with new Tempests.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-10-07 11:52:43 +02:00
xie xingguo
e9596f14af os/bluestore: make randomizing value process of kvpair faster
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-07 16:29:17 +08:00
xie xingguo
ff5aa939f6 os/bluestore: fsck() on idempotent mkfs() request
E.g., if the fsck() found something during the first mkfs() try,
it can still be caught by the following retry.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-07 15:37:58 +08:00
xie xingguo
7fb237c16d os/bluestore: fix comment
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-07 14:44:39 +08:00
Brad Hubbard
f17c0ba9a9 osd: Remove unused '_lsb_release_' declarations
_lsb_release_set and _lsb_release_parse declarations still exist despite their
definitions being removed some time ago.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-10-07 13:38:40 +10:00
xie xingguo
9fafd7d425 os/bluestore: sanity check iterator of BufferSpace::_rm_buffer()
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-07 11:20:49 +08:00
xie xingguo
50884818e1 os/bluestore: simplify blob status checking for small writes
If a blob is marked as compressed and still mutable, something
is wrong.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-10-07 09:49:28 +08:00
Josh Durgin
61ffc1c553 Merge pull request #11302 from asheplyakov/rados-doc-fixup
doc: fix librados example programs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-10-06 16:24:52 -07:00
Patrick Donnelly
a95f6fe688
mon: add missing space in warning message
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-10-06 18:08:54 -04:00
Sage Weil
f8a0e053fe unittest_compression: subsume plugin test
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-06 15:36:08 -04:00
Sage Weil
b49eda7046 unittest_compression: subsume _zlib and _snappy test cases
This includes zlib and isal interop.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-06 15:36:08 -04:00
Sage Weil
67d27740a3 unittest_compressor: smaller big test
Just so it runs a bit faster!

Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-06 15:36:08 -04:00
Sage Weil
79e2b59e8a compressor/zlib: disable ISA-L
This fails the unit tests.  Do not reenable until it is fixed!

Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-06 15:36:08 -04:00
Sage Weil
c3d78f03ee compressor/zlib: add compressor_zlib_isal config option to disable ISA-L
We dynamically enable this if the necessary processor features are present.
Allow this probing to be disabled explicitly.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-06 15:36:08 -04:00
Sage Weil
06ae3da85f compressor/snappy: fix decompress buffer sizing for large buffers
4 bytes is enough for small buffers, but fails for larger buffers because
snappy encodes the length as a varint.  8 is enough.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-06 15:36:07 -04:00
Sage Weil
e57196bd03 unittest_compressor: unified compression tests, parameterized by plugin
This obsoletes the per-plugin plugin tests, which are tedious anyway.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-06 15:36:07 -04:00
Jason Dillaman
0a0a88c715 rbd: utilize new API methods for image id and block name prefix
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-06 14:50:21 -04:00
Jason Dillaman
366e6075ca librbd: new API methods to retrieve image id and block name prefix
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-06 14:50:21 -04:00
Jason Dillaman
b083fa0c93 librbd: relocate image option processing to create state machine
Replace the individual image option parameters with the ImageOptions
wrapper and extract the options within the state machine itself.
This will simplify adding support for the data pool and other options
in the future.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-06 14:50:21 -04:00
Jason Dillaman
8b72efd181 librbd: add data pool option to API and config
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-06 14:50:21 -04:00