1
0
mirror of https://github.com/ceph/ceph synced 2025-03-31 16:25:56 +00:00
Commit Graph

56590 Commits

Author SHA1 Message Date
Kefu Chai
ce1d2e47ed cmake: remove uuid
as it is replaced by the boost implementation, and not detected in
cmake anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
Kefu Chai
998a50627f cmake: do not link ec_jerasure_generic against crush
crush is not used in erasure plugins at this moment.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
Kefu Chai
417c54f1ef cmake: exclude private symbols in librbd
missed it in 0edfad0.
* librbd: pass '--exclude-libs,ALL' to linker
* rbd: link against used libraries explicitly, rbd is accessing some
  internal symbols not exposed by librbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
Jason Dillaman
20dd3adeac Merge pull request from trociny/fixup-test-rbd-mirror
qa/workunits/rbd: small fixup and improvements for rbd-mirror tests

Reviewed-by: Jason Dillaman <dillaman@hotmail.com>
2016-07-29 10:17:06 -04:00
John Spray
8999ae1419 Merge pull request from ktdreyer/wip-doc-debug-ceph-fuse
doc: add troubleshooting steps for ceph-fuse

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-29 14:41:52 +01:00
Mykola Golub
1d4384c54e Merge pull request from dillaman/wip-16689
librbd: optimize away unnecessary object map updates

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-07-29 16:31:04 +03:00
Ken Dreyer
ae4b1744df doc: add troubleshooting steps for ceph-fuse
Thanks to John Spray <jspray@redhat.com> on ceph-devel for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-07-29 07:08:34 -06:00
John Spray
80c0dfcbda Merge pull request from batrick/standby-notes
doc: small standby doc edits

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-29 13:49:03 +01:00
John Spray
df0720c98b Merge pull request from batrick/i16743
doc: add client config ref

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-29 13:48:00 +01:00
Daniel Gryniewicz
bacc5b089c Merge pull request from weiqiaomiao/wqm-wip-rgw-reboot
rgw:fix rgw boot failed after upgrade to master latest version
2016-07-29 08:29:51 -04:00
lande1234
aba7d3b874 Test scenario
Signed-off-by: lande1234 <lan.de3@zte.com.cn>
2016-07-29 04:58:26 +00:00
zhang.zezhu
edb17c32a3 rgw/rgw_main: fix unnecessary variables defined
Signed-off-by: zhang.zezhu <zhang.zezhu@zte.com.cn>
2016-07-29 01:20:05 +00:00
Mark Nelson
e7cfdc842e Merge pull request from xiexingguo/xxg-wip-bluestore-2016-07-21
os/bluestore: fix bitmap allocating failure if max_alloc_size is 0

Mark's Comments:

This passed Jenkins checks.
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2016-07-28 19:49:09 -05:00
Mark Nelson
efc68bc0a5 Merge pull request from ifed01/wip-bluestore-fsck-update
os/bluestore: replace interval_set with a bitset for used_block conta…

Mark's Comments:

This passed Jenkins checks.
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR did not appear to have a significant impact on performance tests, however no fsck specific performance or memory tests were performed.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2016-07-28 19:32:15 -05:00
Greg Farnum
a06bb0dffc client: include COMPLETE and ORDERED states in cache dump
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-07-28 16:19:26 -07:00
xie xingguo
b425c3b843 osd: move updating of had_map_since out of loop
The had_map_since always sticks to the timestamp
of the last map we ever updated. So this shall ease
CPU a liitle when the set of maps gets huge.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-29 06:22:46 +08:00
xie xingguo
9504157f08 osd: move heartbeat_check() from tick() to tick_without_osd_lock()
The heartbeat_check() logic requires heartbeat_lock only, so it shall
work without osd_lock in hand. By doing this, we avoid the latency to
acquire the big osd_lock and does heartbeat_check() much accurately.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-29 06:22:46 +08:00
Jason Dillaman
87b32d1591 librbd: support deleting image by id instead of name
The rbd-mirror daemon will use this API to delete images instead
of attempting to use the local image name.

Fixes: http://tracker.ceph.com/issues/16227
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-07-28 16:36:59 -04:00
Jason Dillaman
25203a8a9d rbd-mirror: use pool id + global image id as deletion primary key
Fixes: http://tracker.ceph.com/issues/16538
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-07-28 16:36:53 -04:00
Patrick Donnelly
00ca666a28
doc: add historical warning for mds_standby_replay
When testing < v10.2.1 with standby replay, I was often confused why the
MDS daemons would go into replay even when this was false.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-28 14:17:44 -04:00
Patrick Donnelly
080028b67f
doc: fix config separator/title size.
This makes the setting consistent with the others.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-28 14:17:30 -04:00
Jason Dillaman
1fe05668f5 Merge pull request from trociny/wip-16386
librbd: discard hangs when 'rbd_skip_partial_discard' is enabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-07-28 14:03:50 -04:00
Ali Maredia
2850b6f393 Merge pull request from tchaikov/wip-cmake
cmake: exclude non-public symbols in shared libraries

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-28 13:44:49 -04:00
Gregory Farnum
e58b5c5342 Merge pull request from yonghengdexin735/wip-zzz-pip-delete-no_casting_required
msg/simple/Pipe: eliminating casts for the comparing of len and recv_max_prefetch

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-07-28 09:17:38 -07:00
Orit Wasserman
c056a8b318 Merge pull request from cbodley/wip-16839
radosgw-admin: zone[group] modify can change realm id
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-07-28 16:55:53 +02:00
Mark Nelson
f8c0e344ab Merge pull request from ifed01/wip-bluestore-reduce-blob4
os/bluestore: get rid off blob's ref_map for non-shared objects

Mark's Comments:

This passed Jenkins checks.
This PR did not appear to have a significant impact on performance tests.
This initially failed "ceph_test_objectstore --gtest_filter=*/2" segfaulting in one of the tests.  See the attached log in the comments for the PR for details.  Subsequent reruns passed, and a run through valgrind's memcheck also passed.  Igor indicated that he has seen this particular segfault previously and believes it is related to running out of memory.  Given that the PR has passed the object store tests multiple times and the segfault has been observed in the past, I believe this PR is unrelated.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
2016-07-28 09:53:01 -05:00
Casey Bodley
ef39416173 Merge pull request from weiqiaomiao/wqm-wip-rgw-zonedump
rgw: add lc_pool when decode or encode struct RGWZoneParams

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-28 10:50:21 -04:00
Casey Bodley
064b7e953d radosgw-admin: zone[group] modify can change realm id
allows the default zone and zonegroup (created with empty realm_id) to
be later added to a realm. the 'modify' command now accepts either
--realm_id=id or --rgw-realm=name

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-28 10:17:05 -04:00
John Spray
a98849782e Merge pull request from yonghengdexin735/wip-zzz-CDir
mds/CDir: remove the part of judgment for _next_dentry_on_set

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-28 14:53:53 +01:00
zhang.zezhu
b5dc3af3af mds/CDir: remove the part of judgment for _next_dentry_on_set
Signed-off-by: zhang.zezhu <zhang.zezhu@zte.com.cn>
2016-07-28 12:31:39 +00:00
John Spray
d8d1483160 Merge pull request from jcsp/wip-16592
mon: validate states transmitted in beacons

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-07-28 13:27:35 +01:00
John Spray
8a8c26b7b5 mon: validate states transmitted in beacons
Since FSMap was added, the state of a daemon can lead
to an entirely invalid map, but we were letting daemons
send any state they wanted.

Especially, we must not allow standby daemons to set
any state other than STANDBY.

Fixes: http://tracker.ceph.com/issues/16592
Signed-off-by: John Spray <john.spray@redhat.com>
2016-07-28 12:59:26 +01:00
Mykola Golub
8dbe42d345 qa/workunits/rbd: wait for image deleted before checking health
When a primiry image is being deleted, the mirrored image might
temporary be reported in error state, before deletion is propagated.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-07-28 14:55:42 +03:00
Mykola Golub
fdb971a266 qa/workunits/rbd: small fixup and improvements for rbd-mirror tests
- log to stderr;
- log status if a `wait_for` function failed;
- don't needlessly sleep in `wait_for` functions after the last
  unsuccessful iteration;
- make `wait_for_pool_images` work for image removal case;
- fix `wait_for_pool_images` reset timeout (last_count set).

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-07-28 14:55:42 +03:00
Kefu Chai
b41905bdb8 cmake: link rgw_a against cls_lock_client
rgw_lc.cc is using it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-28 19:16:35 +08:00
John Spray
2b119e8188 Merge pull request from jcsp/wip-16807-assertion
mds: add assertion in handle_slave_rename_prep

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-07-28 12:15:27 +01:00
Kefu Chai
0edfad088a cmake: exclude private symbols in public libs
we should avoid exposing non-public symbols from user facing dynamic
libraries. so pass '--exclude-libs' with appropriate argument to linker.
as libcephfs does not add the ((visibility ("default"))) specifier to
the exported symbols, we can not set the default visiblity to hidden for
libcephfs, and "-export-symbols-regex" is a libtool option, we need to
develop a way for cmake to fix the visibility of libcephfs. it's still a
TODO.

* librados
  - pass '--exclude-libs=ALL' to linker
  - add buffer.cc to librados, so we can use '--exclude-libs=ALL'.
* libcephfs: pass '--exclude-libs=libcommon.a,libclient.a,libosdc.a' to
  linker
* libcommon
  - extract common_buffer_obj from libcommon, to avoid compilation
    this source file repeatly.
* tests:
  - link against common_internal_objs explicitly if the test in
    question is using the internal symbols.
* ceph-client-debug:
  - link against client explicitly, and do not link against librados
    anymore, as it is not used in this tool.

Fixes: http://tracker.ceph.com/issues/16556
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-28 19:15:04 +08:00
Kefu Chai
8382dda5f9 cmake: move common_utf8 closer to where it is used
for example, json_spirit uses common_utf8, so link json_spirit against common_utf8.
because libcommon includes json_spirit, this change does not impact the
consumers of libcommon.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-28 19:15:03 +08:00
John Spray
ec6dab79a3 Merge pull request from fullerdj/wip-djf-11171
mds: Add path filtering for dump cache

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-28 11:35:20 +01:00
John Spray
f742113e6c Merge pull request from vishalkanaujia/wip_inotable_repair
cephfs: Inotable repair during forward scrub

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-28 11:25:18 +01:00
xie xingguo
3839f730a6 kv/MemDB: allow _load() to passed out result to caller
The _load() process can fail. By detecting there error
cases earlier, we can avoid other weird failure cases
later.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-28 16:30:03 +08:00
xie xingguo
3f36408010 mon/OSDMonitor: make error handling for "osd lost" command more fine-grained
If the specified osd is not down or doesn't exist, we shall
return error instead of success. So caller can abort(if does not exist)
or mark osd as down and retry(if not down).

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-28 16:02:07 +08:00
Mykola Golub
9717417b7b test: fix librbd tests for rbd_skip_partial_discard
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-07-28 10:00:31 +03:00
xie xingguo
b3a0d6dd28 kv/MemDB: fix load/save process of kv pairs
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-28 14:29:56 +08:00
Mykola Golub
dc41731fbf librbd: discard hangs when 'rbd_skip_partial_discard' is enabled
Fixes: http://tracker.ceph.com/issues/16386
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-07-28 09:28:33 +03:00
weiqiaomiao
d8ad08559c rgw:fix rgw boot failed after upgrade to master latest version
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-07-28 10:29:25 +08:00
zhang.zezhu
1d01c68769 msg/simple/Pipe: eliminating casts for the comparing of len and recv_max_prefetch
Signed-off-by: zhang.zezhu <zhang.zezhu@zte.com.cn>
2016-07-28 01:47:37 +00:00
xie xingguo
b2112576a7 osd: drop redundant existence check of osd
The is_up() check implicitly coveres the exist() check,
so below here the exist() check is not necessary.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-28 06:30:02 +08:00
xie xingguo
9fb31318a9 osd: fix wrong tip if no-recover flag is unset
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-28 06:30:01 +08:00
xie xingguo
ac311c545d osd: drop redundant ping of tp thread
Because the lock_suspend_timeout() process of PG does the same thing
for each loop.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-28 06:30:01 +08:00