Commit Graph

56407 Commits

Author SHA1 Message Date
Kefu Chai
6c04c94d03 Merge pull request #10098 from dzafman/wip-16568
tools: New "removeall" used to remove head with snapshots

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-02 00:26:54 +08:00
Kefu Chai
43de9824db Merge pull request #10085 from chengweiv5/fix-doc
doc: ceph-deploy mon add doesn't take multiple nodes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-08-02 00:17:29 +08:00
Casey Bodley
e3ba5e8543 Merge pull request #10480 from ceph/lifecycle-cleanup
Clean up lifecycle thread

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-08-01 10:59:31 -04:00
Patrick Donnelly
9bef6cf85a
Merge remote-tracking branch 'upstream/pull/10514/head'
* upstream/pull/10514/head:
  src/vstart.sh: stop script aborting when ceph.cfg is not there

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-30 16:33:29 -04:00
Willem Jan Withagen
df49518642 src/vstart.sh: stop script aborting when ceph.cfg is not there
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2016-07-30 22:05:06 +02:00
Mykola Golub
77ec14a95b Merge pull request #10432 from dillaman/wip-16708
rbd-mirror: potential IO stall when using asok flush request

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-07-30 19:59:49 +03:00
Mykola Golub
df2aa585c4 Merge pull request #10341 from dillaman/wip-16223
rbd-mirror: reduce memory footprint during journal replay

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-07-30 19:28:02 +03:00
Kefu Chai
00b6fe11d2 Merge pull request #10489 from ceph/wip-cmake
cmake changes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-30 13:24:32 +08:00
Kefu Chai
a27bbaaebf cmake: link libcommon against pthread
as Thread.cc lives in libcommon, and global is not using libpthread
directly. so moving libpthread linkage from libglobal to libcommon.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-30 00:26:44 +08:00
Josh Durgin
e5b3ee0b79 Merge pull request #10177 from BlaXpirit/ceph-tests-py3
pybind: Port Python-based tests and remaining Python bindings to Python 3

Reviewed-by: Case Bodley <cbodley@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-29 09:04:27 -07:00
Daniel Gryniewicz
bc299e56e4 Clean up lifecycle thread
Make sure that the lifecycle thread is terminated and all memory is
cleaned up on shutdown.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2016-07-29 11:34:21 -04:00
Patrick Donnelly
a955647a2d
Merge remote-tracking branch 'upstream/pull/10312/head'
* upstream/pull/10312/head:
  vstart: refactor and fix forced config changes
  vstart: cleanup echoed commands and sh issues
2016-07-29 11:13:48 -04:00
Kefu Chai
8bf5cd1606 cmake: cleanup Findfuse.cmake
* remove unused stuff, we do not pass/use FUSE_VERSION in cmake.
  the FUSE_VERSION we are using is defined by "fuse_common.h".
* use FindPackageHandleStandardArgs for handling find_package()
  arguments.
* also detect osxfuse on MacOS.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
Kefu Chai
8bac1c1eeb cmake: do not reference undefined variables
* AIO_LIBS is now named AIO_LIBARIES, and there is not point to print
  out its path
* USE_NSS is not defined if NSS is not checked, so if(USE_NSS) is better
  here.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
Kefu Chai
aa524e689d cmake: remove duplicated linked lib for libcommon
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
Kefu Chai
7296be4e84 cmake: use fullpaths of libraries
better off using the detected path, instead of using the default path
for finding the linked libaries.

see "cmake  --help-policy CMP0065" for more details.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
Kefu Chai
221c47d349 cmake: set policies
this makes sure we are compatible with latest and future cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-29 23:12:33 +08:00
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 #10483 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 #10374 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 #10332 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 #10479 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 #10434 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 #10409 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
Mark Nelson
e7cfdc842e Merge pull request #10379 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 #10140 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
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 #10060 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 #10472 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 #10273 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 #10477 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 #9988 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 #10439 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 #10476 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 #10428 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 #10429 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 #9925 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 #10281 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