Commit Graph

56394 Commits

Author SHA1 Message Date
Loic Dachary
74eafb4a8c Merge pull request #10430 from tchaikov/wip-cephtool-test.sh
qa/workunits/cephtool/test.sh: use absolute path for TEMP_DIR

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-07-26 08:51:25 +02:00
Dongsheng Yang
ebc5b9e0f7 pybind: add remove_snap2 api in python binding
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
0575a9e872 tools/rbd: introduce an option of --force for snap remove
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
9cf4878c34 librbd: fix a incorrect input for cpp_strerror()
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
bb55b3b584 librbd: coding style: fix the indent problem
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
95502ecefe librbd: coding style: add space after comma
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
fe1d4c44a3 librbd: introduce a new flag of RBD_SNAP_REMOVE_FLATTEN
introduce RBD_SNAP_REMOVE_FLATTEN for flags of Image::snap_remove2()
to auto flatten the children of snapshot which we want to remove.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Dongsheng Yang
a3a547fc03 librbd: introduce a new api of snap_remove2
currently, we only have one api for snap_remove, but if we want to
pass more options about snapshot removal, that's impossible.

This patch introduce a new api of snap_remove2 here to solve
this problem.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-26 02:23:30 -04:00
Kefu Chai
a36cbee2c5 Merge pull request #10423 from ceph/wip-16801
osd: fix the mem leak of RepGather

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-26 14:18:46 +08:00
Kefu Chai
e92c9cc1f0 cmake: move flock.cc from libmds into libcommon
as we don't need to compile the whole mds just for building the
libcephfs

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-26 13:51:08 +08:00
Kefu Chai
76e7b693d7 msg/async: remove static member variable
msgr is part of libcommon. and the later is linked into both libcephfs
and librados. and hence into cephfs.so and rados.so. that's why we have
double free.

Fixes: http://tracker.ceph.com/issues/16686
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-26 13:27:03 +08:00
Gregory Farnum
40b7016ebc Merge pull request #10304 from ukernel/wip-16610
ObjectCacher: fix last_write check in bh_write_adjacencies()
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-07-25 21:58:19 -07:00
weiqiaomiao
e14f21ff28 rgw: add lc_pool when decode or encode struct RGWZoneParams
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
2016-07-26 11:12:35 +08:00
Dan Mick
7818d91faf Update to upstream rocksdb
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-07-25 20:08:16 -07:00
Dan Mick
7595b0b66f src/test/CMakeLists.txt: don't assume Intel (sse/sse2)
Fixes ARM64 build of ceph_perf_local test

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-07-25 20:05:26 -07:00
Dan Mick
dbdd1a8526 erasure-code/jerasure/CMakeLists.txt: set NEON flags for neon objs
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2016-07-25 20:05:26 -07:00
Jason Dillaman
6064f2346d librbd: ensure that AIO ops are started prior to request
Fixes: http://tracker.ceph.com/issues/16708
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-07-25 12:44:50 -04:00
Jason Dillaman
3df7213c0a librbd: helper method for creating and starting AioCompletions
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-07-25 12:42:26 -04:00
John Spray
2dbff88acc Merge pull request #10243 from jcsp/wip-cephfs-cleanup
CephFS: misc. cleanups and remove legacy cephfs tool

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-07-25 15:20:42 +01:00
John Spray
7fe9c15f0b mds: add assertion in handle_slave_rename_prep
This function assumes that the source path
does not point to a null dentry, and that
path_traverse is therefore setting the
passed inode.

Candidate code path for crash
in http://tracker.ceph.com/issues/16807

Signed-off-by: John Spray <john.spray@redhat.com>
2016-07-25 15:12:55 +01:00
John Spray
55691af628 Merge pull request #9716 from xiexingguo/xxg-wip-server_droppinlock2
Server: drop locks and auth pins if wait for pending truncate

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-07-25 14:29:10 +01:00
Igor Fedotov
9deee08920 os/bluestore: fix unittest_bluestore_types to properly handle different ref_map locations
Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
2016-07-25 15:11:20 +03:00
Kefu Chai
de68fe38e1 qa/workunits/cephtool/test.sh: use absolute path for TEMP_DIR
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:58:28 +08:00
Kefu Chai
1194331665 Merge pull request #10261 from songbaisen/b1
mon: remove the redundant cancel_probe_timeout function

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:44:08 +08:00
Kefu Chai
d3a28465fc osd: fix the mem leak of RepGather
ReplicatedPG::new_repop() returns a pointer to RepGather with two refcounts,
one is held by ReplicatedPG::repop_queue, the other is supposed to be
held by the caller of this function. but it's caller
ReplicatedPG::submit_log_entries() assigns it to a
boost::intrusive_ptr<RepGather>() directly, why by default add_ref() in
its constructor. this makes the refcount 3. that's why we have a leak of
RepGather in `ReplicatedPG::new_repop(ObcLockManager&&,
boost::optional<std::function<void ()>>&&)`.

Fixes: http://tracker.ceph.com/issues/16801
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:29:41 +08:00
Kefu Chai
8268d1ba6a cmake: do not link against profiler if gperftools is found
this behaviour matches the autotools. and we should not enable profiling
unless asked to do so.

Fixes: http://tracker.ceph.com/issues/16804
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:22:20 +08:00
Kefu Chai
07206f3173 cmake: cleanup Findgperftools.cmake
remove unused bits

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 16:17:42 +08:00
Kefu Chai
98c3df5a0d cmake: cleanup Findudev.cmake
remove the crufts for handling the REQUIRED argument.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
342d8279d4 cmake: cleanup Findblkid.cmake
* remove unused bits
* fix the wrong mark_as_advanced() call.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
94db627c31 cmake: fix libaio detection
* we used to check the header file of "aio.h" which is part of glibc,
  the glibc async i/o, and the corresponding library is librt. but what
  we are using is libaio.
* reference libaio using AIO_LIBRARIES for consistency.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
f8553f3ab9 cmake: do not include undefind paths
for example
```
include_directories(${LEVELDB_PREFIX}/include)
```
does not make sense if `LEVELDB_PREFIX` is not defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:40:30 +08:00
Kefu Chai
bfc25cbc93 cmake: cleanup Findbabeltrace.cmake
* we don't need the BABELTRACE_PATH_HINT setting, as packaging script
  requires the the babeltrace pacakges explicitly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:02 +08:00
Kefu Chai
03a860ed11 cmake: add missing FindBacktrace.cmake
FindBacktrace.cmake is missing in older versions of cmake. so put a copy
in our tree.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:02 +08:00
Kefu Chai
89521942c9 cmake: add "make uninstall" support
following https://cmake.org/Wiki/RecipeAddUninstallTarget

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:02 +08:00
Kefu Chai
d4104b747f cmake: add "WITH_SUBMAN" option
it is used by ceph.spec.in for installing subscription manager cron job
on rhel.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:01 +08:00
Kefu Chai
e21d98aed4 cmake: cleanup FindOpenLdap.cmake
* use find_package_handle_standard_args() and remove unused bits.
* rename OPENLDAP_LIBS to OPENLDAP_LIBRARIES, to be consistent with
  find_package() modules.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:01 +08:00
Kefu Chai
3f6fd585f8 cmake: cleanup Findtcmalloc.cmake
use find_package_handle_standard_args() and remove unused bits.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:01 +08:00
Kefu Chai
3170f16e86 cmake: do not check libuuid anymore
libuuid dependency is not found in ceph.spec.in or debian/control.
and we are not using libuuid since 62bfc7a.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-25 15:39:01 +08:00
Kefu Chai
b44ed47c71 Merge pull request #10319 from wjwithagen/wip-wjw-fix-posix-tests
src/test/cli/* tests: POSIX Convert grep -P to grep -E

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-25 14:35:33 +08:00
Kefu Chai
88c604dfc4 Merge pull request #10308 from xiexingguo/xxg-wip-fix-osd-df
mon/osdmonitor: fix incorrect output of "osd df" due to osd out

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-25 13:23:07 +08:00
Kefu Chai
03a3f71a32 Merge pull request #10091 from rubenk/add-osd-id-to-service-description
systemd: add osd id to service description

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-25 12:58:16 +08:00
Kefu Chai
b96cfc34f4 Merge pull request #10089 from gaowanlong/omapbench_usage
test: fix usage info of omapbench

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-25 12:54:52 +08:00
Kefu Chai
a048e19589 Merge pull request #10251 from stiopaa1/osd_watch_addConsts
osd/Watch: add consts to member functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-25 12:43:14 +08:00
Yan, Zheng
16ce830ce7 Merge pull request #10419 from jcsp/wip-16764
client: fix shutdown with open inodes
2016-07-24 21:42:06 -05:00
Patrick Donnelly
9f2c7418f5
vstart: refactor and fix forced config changes
Despite using the -k option, vstart would sometimes (e.g. --smallmds) append
changes to the config file.  This commit runs all config changes through a
function which checks if the config file should be overwritten.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-24 12:46:09 -04:00
Patrick Donnelly
a586ce2eec
vstart: cleanup echoed commands and sh issues
o Add prun/prunb for echoing out a command and running it.
o Add quotes around some variables to prevent word splitting.
o Use "$@" instead of $* or (it is incorrect but often works anyway).
o Sprinkle in some extra command prints.
o Use function for ceph_adm rather than command prefixing.

I also corrected some whitespace where tab/spaces were mixed in the diff.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-24 12:46:09 -04:00
John Spray
d642b4faec client: fix shutdown with open inodes
This piece of code was dereferencing an invalid
iterator (invalidated by call to erase())

Fixes:  http://tracker.ceph.com/issues/16764
Signed-off-by: John Spray <john.spray@redhat.com>
2016-07-24 17:21:24 +01:00
Jason Dillaman
b0029b3d3d Merge pull request #9724 from vumrao/wip-vumrao-16130
rbd: cleanup - Proxied operations shouldn't result in error messages if replayed

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-07-24 11:13:44 -04:00
Jason Dillaman
ab5ebdef32 Merge pull request #10123 from trociny/wip-16449
librbd: prevent creation of clone from non-primary mirrored image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-07-24 11:12:57 -04:00
Jason Dillaman
d808091402 Merge pull request #10348 from trociny/wip-16717
test: use wrapper that respects RBD_FEATURES when creating rbd image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-07-24 11:07:28 -04:00