Commit Graph

66927 Commits

Author SHA1 Message Date
Igor Fedotov
7d1f46b2b7 os/bluestore: remove duplicate sbid member for Blob, use one from shared_blob member
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-12-19 15:06:47 +00:00
Igor Fedotov
a6158d5cce os/bluestore: declare a member for Blob's cached bufferlist if explicitly enabled by CACHE_BLOG_BL macro only
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-12-19 15:06:39 +00:00
Igor Fedotov
b07f3ffebb os/bluestore: recalculate shared blob key instead of keeping it in memory
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-12-19 15:06:24 +00:00
Sage Weil
071cdbe35f Merge pull request #12561 from kylinstorage/wip-fix-osdmaptool-zero
osdmaptool: fix divide by zero error

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-19 08:38:43 -06:00
Mykola Golub
8da0f348d3 Merge pull request #12497 from dillaman/wip-18243
journal: prevent repetitive error messages after being blacklisted

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-12-19 15:58:59 +02:00
Yunchuan Wen
45a0286e86 osdmaptool: fix divide by zero error
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
2016-12-19 12:56:37 +08:00
Haomai Wang
e293d40e6a Merge pull request #12558 from Adirl/fix_bad_len_msg
msg/async/rdma: fix bad message that went to the user

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-12-19 09:59:51 +08:00
Avner BenHanoch
daca8f6873 msg/async/rdma: fix bad message that went to the user
1. the printed value of "bad length" was incorrect, because 'r' was changed before the log line.
2. log appeared to user as error even though everything was calm; hence, reducing its severity

issue: 914840

Change-Id: I41520d27fc53fbbe07b61dd915e16448b87769d5
Signed-off-by: Avner BenHanoch <avnerb@mellanox.com>
2016-12-18 16:52:12 +00:00
Loic Dachary
049641df2e Merge pull request #12531 from dachary/wip-18291-bluestore
ceph-disk: do not create bluestore wal/db partitions by default

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-18 09:59:23 +01:00
Loic Dachary
c83d030d30 ceph-disk: do not create bluestore wal/db partitions by default
Fixes: http://tracker.ceph.com/issues/18291

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-12-17 20:55:36 +01:00
Xie Xingguo
a30d90cdc6 Merge pull request #12458 from Liuchang0812/add-more-log-for-network-error
osd: enhance logging for osd network error

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-12-17 12:54:32 +08:00
liuchang0812
7ceadba31d ods: enhance logging for osd network error
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
2016-12-17 12:07:36 +08:00
Sage Weil
3cf1ca5d41 Merge pull request #12343 from liewegas/wip-bluestore-release
os/bluestore: simplify allocator release flow

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 17:40:47 -06:00
Sage Weil
45d698ebdc Merge pull request #12351 from xiexingguo/xxg-wip-bluestore-1207
os/bluestore: clear omap flag if parent has none

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 17:40:30 -06:00
Sage Weil
4444540d78 Merge pull request #12353 from xiexingguo/xxg-wip-bluestore-1207-01
os/bluestore: don't implicitly create the source object for clone

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 17:40:06 -06:00
Sage Weil
be4c0c7261 Merge pull request #12466 from kylinstorage/wip-remove-unused-class-declaration
remove unused declaration

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 17:39:44 -06:00
Sage Weil
2c7c27ab6c Merge branch 'master' into wip-remove-unused-class-declaration 2016-12-16 17:38:32 -06:00
Sage Weil
26ab33ae79 Merge pull request #12538 from liewegas/wip-workunits
qa/tasks/workunit: retry on ceph.git if checkout fails

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-12-16 15:38:24 -06:00
Sage Weil
02d301bff0 Merge pull request #12534 from liewegas/wip-truncate-fix
osd/PrimaryLogPG: don't truncate if we don't have to for WRITEFULL

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 14:08:59 -06:00
Sage Weil
72d73b8c88 qa/tasks/workunit: retry on ceph.git if checkout fails
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-16 15:06:16 -05:00
Mykola Golub
4fe7e2a458 Merge pull request #12486 from dillaman/wip-18247
librbd: keep rbd_default_features setting as bitmask

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-12-16 21:15:02 +02:00
Sage Weil
de3186203f Merge pull request #12514 from vasukulkarni/wip-cd-shaman
qa/tasks/ceph_deploy: use dev option instead of dev-commit

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 11:46:38 -06:00
Samuel Just
2323aa17d4 ReplicatedPG: don't truncate if we don't have to for WRITEFULL
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-12-16 12:40:34 -05:00
Yehuda Sadeh
ed3e9c1d4d Merge pull request #10160 from jmunhoz/bugfix-16463-presigned-url
rgw: aws4: add presigned url bugfix in runtime

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-12-16 08:42:10 -08:00
Sage Weil
3d1ec3c9e4 Merge pull request #12530 from liewegas/wip-bluestore-ceph-disk
ceph-disk: adjust bluestore default device sizes

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-12-16 10:24:42 -06:00
Sage Weil
38a501a28e Merge pull request #12516 from hjwsm1989/fix-rpg
osd/PG: fix the unreadable log in choose_acting

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 09:27:09 -06:00
Sage Weil
15fdc67c10 Merge pull request #12521 from kylinstorage/wip-for-coverity
osd/osdmap: fix divide by zero error

Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-16 09:24:24 -06:00
Sage Weil
478551e988 Merge pull request #12507 from ifed01/wip-bluestore-fix-cache
os/bluestore: fix target_buffer value overflow in Cache::trim()

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-12-16 09:02:12 -06:00
Jason Dillaman
1b0a9d8c8e Merge pull request #12525 from trociny/wip-18261
rbd: fix json formatting for image and journal status output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-12-16 09:47:40 -05:00
Sage Weil
19346c7e67 ceph-disk: default DB size of 20GB
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-16 09:45:16 -05:00
Sage Weil
7a5051af2f ceph-disk: default WAL size of 576 MB
Enough for 2 256MB write buffers, and then some.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-16 09:45:06 -05:00
Jason Dillaman
8ddfb45326 librbd: keep rbd_default_features setting as bitmask
Support both human readable, comma delimited list of feature
names and also integer bitmask value. Attempting to read the
setting will always result in the feature bitmask integer
value.

This is required to avoid breaking backwards compatibility with
librbd clients that are dependent on the older behavior (e.g.
OpenStack).

Fixes: http://tracker.ceph.com/issues/18247
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-12-16 09:26:28 -05:00
Jason Dillaman
9a79286d4c Merge pull request #12407 from majianpeng/rbd-stripe-unit
rbd : make option --stripe-unit w/ B/K/M work

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-12-16 09:21:26 -05:00
Jason Dillaman
d5f3410863 Merge pull request #12484 from runsisi/wip-fix-rollback-warn
librbd: ignore error when object map is already locked by current client

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-12-16 08:45:48 -05:00
Mykola Golub
4c2659a0f4 rbd: fix json formatting for image and journal status output
Fixes: http://tracker.ceph.com/issues/18261
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-12-16 12:50:50 +02:00
Jianpeng Ma
c5ce82e62d rbd: make option --stripe-unit w/ B/K/M work.
As 'man rbd' said:  --stripe-unit size-in-B/K/M. But w/ B/K/M, the
command failed and said invalid options. So fix it.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-12-16 17:56:04 +08:00
Yunchuan Wen
61d3e4f38c osdmap: fix divide by zero error
*** CID 1397255:  Incorrect expression  (DIVIDE_BY_ZERO)
/home/brad/working/src/ceph/src/osd/OSDMap.cc: 2995 in
OSDMap::summarize_mapping_stats(OSDMap*, const std::set<long,
std::less<long>, std::allocator<long>> *,
std::__cxx11::basic_string<char, std::char_traits<char>,
std::allocator<char>> *, ceph::Formatter *) const()
2989         f->open_object_section("utilization");
2990       if (newmap) {
2991         if (f) {
2992           f->dump_unsigned("moved_pgs", moved_pg);
2993           f->dump_unsigned("total_pgs", total_pg);
2994         } else {
>>>     CID 1397255:  Incorrect expression  (DIVIDE_BY_ZERO)
>>>     In expression "(float)moved_pg * 100. / (float)total_pg",
division by expression "total_pg" which may be zero has undefined
behavior.
2995           ss << "moved " << moved_pg << " / " << total_pg
2996       << " (" << ((float)moved_pg * 100.0 / (float)total_pg) <<
"%)\n";
2997         }
2998       }
2999       if (f) {
3000         f->dump_float("avg_pgs", avg_pg);

Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
2016-12-16 17:28:35 +08:00
huangjun
9897f0c6fc osd/PG: fix the unreadable log in choose_acting
To avoid the log like: failed to fill position ^B
  Signed-off-by: huangjun <hjwsm1989@gmail.com>
2016-12-16 15:35:02 +08:00
runsisi
711da4e239 librbd: ignore error when object map is already locked by current client
otherwise when using rbd cli to rollback image with object-map feature
enabled, the following error message will be printed out on the screen,
which is confusing to users:
  librbd::object_map::LockRequest: failed to lock object map: (17) File exists

Fixes: http://tracker.ceph.com/issues/16179

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-12-16 08:33:19 +08:00
Javier M. Mellid
078c513b6b rgw: aws4: add rgw_s3_auth_aws4_force_boto2_compat conf option
Runtime bugfix to handle presigned urls computed with canonical requests using
the port number once.

Boto2 computes canonical requests using the port number twice although it
should be used once only. This behaviour is a bug supported by AWS S3. Boto2 is
used in RGW S3 as reference implementation.

The client-side tools not supporting this boto2 bug will fail although they
should work too.

In order to support both presigned url implementations this patch adds a config
option to compute a second signature. With this option disabled, the code will
compute two signatures when the first signature is not valid. The aws4 auth
succeed if some of the two signatures is valid.

The config option rgw_s3_auth_aws4_force_boto2_compat, is enabled by default so
one signature, working with boto2, is computed only.

Fixes: http://tracker.ceph.com/issues/16463

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
2016-12-16 00:59:49 +01:00
Yuri Weinstein
8d7d5ae3ff Merge pull request #12463 from wjwithagen/wip-wjw-freebsd-osd-avoidports
FreeBSD/OSD.cc: add client_messenger to the avoid_ports set.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-12-15 14:41:34 -08:00
Vasu Kulkarni
9f04a7b32e use dev option instead of dev-commit
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2016-12-15 14:11:00 -08:00
Samuel Just
e2b3095554 Merge pull request #12500 from badone/wip-doc-PGPool
doc/dev/osd_internals: add pgpool.rst

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-12-15 14:00:22 -08:00
Sage Weil
6bb3a037e5 Merge pull request #12511 from liewegas/wip-workunits
qa/workunits/rbd: fix

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-12-15 14:15:31 -06:00
Sage Weil
cf294777ea qa/workunits: use relative path instead of wget from git
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-15 15:10:28 -05:00
Sage Weil
c6698c95b8 Merge pull request #12508 from liewegas/wip-qa-admin-socket
qa/tasks/admin_socket: subst in repo name
2016-12-15 13:53:10 -06:00
Brad Hubbard
0f6be4c98c doc/dev/osd_internals: add pgpool.rst
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-12-16 05:35:09 +10:00
Sage Weil
a411f58713 os/bluestore: clone_range of len 0 creates but does not size object
This mimics, roughly,

 open(..., O_WRONLY|O_CREAT, ...)
 seek(...)
 if (len > 0)
   write(...)

Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-15 14:20:28 -05:00
Sage Weil
5522dee834 os/bluestore: remove commit_{start,finish} from Allocator
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-15 14:20:28 -05:00
Sage Weil
9fad893f04 os/bluestore/BlueFS: do not call commit_{start,finish}
Signed-off-by: Sage Weil <sage@redhat.com>
2016-12-15 14:20:28 -05:00