Commit Graph

55737 Commits

Author SHA1 Message Date
Sage Weil
af6ececa04 Merge pull request #10195 from stiopaa1/msg_asyncmess_removeIncFile
msg/AsyncMessenger: remove unneeded include file
2016-07-11 12:29:46 -05:00
Sage Weil
c6dc92d3e5 Merge pull request #10224 from stiopaa1/msg_asyncmess_event_addConst
msg/async/Event.h: add const to member function

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-11 12:19:08 -05:00
Sage Weil
2b370e95ed Merge pull request #10230 from stiopaa1/msg_asyncmess_Processor_accept_changeToVoid
msg/AsyncMessenger: change return type to void

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-11 12:17:42 -05:00
Kefu Chai
be4ec38d75 Merge pull request #10152 from tchaikov/wip-16277
osd: increment stats on recovery pull also

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-12 00:17:03 +08:00
Matt Benjamin
42785a7927 Merge pull request #10222 from ceph/wip-cmake
cmake changes for pypi

verfied f23
2016-07-11 11:57:53 -04:00
Kefu Chai
5e58249362 cmake: fix the detection of curl_multi_wait()
it was broken by b5bb77d5

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-11 21:29:11 +08:00
Kefu Chai
0f55402401 pybind/rados: remove rados.c from MANIFEST.in
this fixes the warning of

```
running egg_info
creating
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info
writing
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/PKG-INFO
writing top-level names to
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/top_level.txt
writing dependency_links to
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/dependency_links.txt
writing manifest file
'/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/SOURCES.txt'
warning: no files found matching 'rados.c'
```

in the out-of-source tree build, rados.c is not located in the same
directory of setup.py, rados.pyx, and rados.pyd. it is in the build_dir,
for example, it could be:

  ceph/build/src/pybind/rados/pyrex/rados.c

where ceph/build is the build directory of cmake.
and sdist will include it when running egg_info, because cython's
build_ext module lists `rados.c` as one of the "source_files".

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-11 16:23:20 +08:00
Kefu Chai
c57dbd3451 cmake: pass necessary cflags to build_ext
this fixes:
```
creating
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados
creating
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados/pyrex
/usr/bin/gcc-6 -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes
-fno-strict-aliasing -iquote /var/ceph/ceph/src/include -fPIC
-I/usr/include/python2.7 -I/usr/include/x86_64-linux-
gnu/python2.7 -I/usr/include/python2.7 -c
/home/kefu/ceph/build/src/pybind/rados/pyrex/rados.c -o
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados/pyrex/ra
dos.o -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g
-fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -g
-fwrapv -O2 -Wall -Wstrict-prototypes -lpython2.
7 -lpthread -ldl -lutil -lm -Xlinker -export-dynamic -Wl,-O1
-Wl,-Bsymbolic-functions
/home/kefu/ceph/build/src/pybind/rados/pyrex/rados.c:239:28: fatal error:
rados/librados.h: No such file or directory
 #include "rados/librados.h"
                            ^
compilation terminated.
```

seems we can not pass the CFLAGS with space in it to setup.py using env variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-11 16:23:20 +08:00
Kefu Chai
6a99eec653 cmake: put cythonized .c files into ${CMAKE_CURRENT_BINARY_DIR}
it was put into the directory where .pyx is located. it's not expected
in an out-of-tree build.
* {rados,rbd,cephfs}/setup.py: use build_ext from cython if possible, fallback to
  the one from setuptools or distutils
* Distutils.cmake: pass --cython-c-in-temp --build-temp and
  --cython-include-dirs to "build_ext" command

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-11 16:23:20 +08:00
Kefu Chai
b3bea59b7e Merge pull request #9138 from cxwshawn/wip-cl-fix
osd: replace ceph:atomic_t with std::atomic in osd module.

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-11 13:36:42 +08:00
Kefu Chai
1d7aed6911 Merge pull request #9871 from odivlad/fix-init-el7-master
master: remove SYSTEMD_RUN from initscript

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-11 13:22:05 +08:00
Kefu Chai
fc30482270 Merge pull request #8317 from dreamhost/gentoo-python
Gentoo support for ceph-disk / ceph-detect-init; pip speedup

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-11 11:56:42 +08:00
Kefu Chai
72c42b4a02 Merge pull request #9085 from renhwsky/renhw-wip-osdmonitor-updatepool
osd/osdmonitor: pool of objects and bytes beyond quota should all be warn

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-11 11:55:58 +08:00
Kefu Chai
7229644cb5 Merge pull request #10234 from tchaikov/wip-drop-tmap_upgrade
ceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-07-11 11:55:01 +08:00
Kefu Chai
58cec42f50 Merge pull request #9117 from wjin/clean
osd: remove duplicated function

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-11 11:54:15 +08:00
Kefu Chai
35ce55d204 Merge pull request #9252 from vumrao/wip-vumrao-15983
mon: change osdmap flags set and unset messages

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-11 11:51:36 +08:00
Kefu Chai
e15c8efa8e Merge pull request #9452 from mslovy/wip-preserve-alloc-hint
osd:preserve allocation hint attribute during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-11 11:50:48 +08:00
Kefu Chai
90a18d822e Merge pull request #9698 from LiumxNL/fix-clones-flush-evict
rados: add option to include clones when doing flush or evict

Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-11 11:49:27 +08:00
Kefu Chai
e9e3a2398c Merge pull request #9703 from badone/wip-cryptoKey-encrypt-segfault
cephx: Fix multiple segfaults due to attempts to encrypt or decrypt

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-11 11:48:26 +08:00
Kefu Chai
b2decbfc78 Merge pull request #9717 from songbaisen/a7
mon: do not recalculate 'to_remove' when it's known

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-11 11:47:43 +08:00
Kefu Chai
654d86fe2b Merge pull request #9763 from dx9/wip-pthread-np
compat: add abstractions for non portable pthread name funcs

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-11 11:46:47 +08:00
Kefu Chai
afb1935374 ceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade
the tested feature was removed in ad6cc41

> tmap_upgrade was only for Jewel, so remove it for Kraken.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-11 11:30:38 +08:00
Michal Jarzabek
22bf7e98f9 msg/AsyncMessenger: change return type to void
Change the return type of function Processor::start to void. It
doesn't make sense to return constant value(zero).

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-07-10 19:26:00 +01:00
Kefu Chai
89ba840a6c Merge pull request #10190 from ktdreyer/doc-delete-pool
doc: more details for pool deletion

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-10 19:57:07 +08:00
Michal Jarzabek
72f75d9f63 msg/Event.h: add const to member function
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-07-09 08:38:20 +01:00
Sage Weil
181f6c67da Merge pull request #10201 from xiexingguo/xxg-wip-bluestore-2016-07-08
os/bluestore: misc cleanups

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-07-08 18:29:50 -04:00
Casey Bodley
0273d5595c Merge pull request #10157 from cbodley/wip-rgw-sync-error-repo
rgw: fix error_repo segfault in data sync
2016-07-08 16:12:26 -04:00
Casey Bodley
28609029cf rgw: fix error_repo segfault in data sync
RGWDataSyncShardCR will only allocate an error_repo if it's doing
incremental sync, so RGWDataSyncSingleEntryCR needs to guard against a
null error_repo

also, RGWDataSyncShardCR::stop_spawned_services() was dropping the last
reference to the error_repo before calling drain_all(), which meant that
RGWDataSyncSingleEntryCR could still be holding a pointer. now uses a
boost::intrusive_ptr in RGWDataSyncSingleEntryCR to account for its
reference

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-07-08 15:53:57 -04:00
vasukulkarni
299a5210e3 Merge pull request #10184 from ktdreyer/doc-rados-operations-systemd
doc: rm SysV instructions, add systemd
2016-07-08 11:56:50 -07:00
Yehuda Sadeh
ed1be58a86 Merge pull request #9570 from zaitcev/wip-5073-multen-doc
rgw: Add documentation for the Multi-tenancy feature

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-07-08 11:46:48 -07:00
Yehuda Sadeh
6489be299c Merge pull request #10151 from oritwas/wip-rgw-fix-cls-sync-stats
rgw: register the correct handler for cls_user_complete_stats

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-07-08 11:40:01 -07:00
Kefu Chai
21402181f5 Merge pull request #9934 from tchaikov/wip-build-on-armf
common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-07-08 22:58:28 +08:00
Kefu Chai
5ba22025a8 Merge pull request #10204 from ceph/wip-cmake
cmake: fixes for pypi changes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-08 22:51:48 +08:00
Ken Dreyer
3c43185002 doc: more details for pool deletion
Prior to this change, the documention instructed administrators to
delete rulesets and users, but did not go into details regarding how to
do that.

Add example commands that admins may use to search for rulesets and
users that might reference the to-be-deleted pool.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-07-08 07:42:29 -06:00
Kefu Chai
31db4c5f9f common: instantiate strict_si_cast<long> not strict_si_cast<int64_t>
this fixes the build on armf.

on 32bit platforms, cstdint is very likely to

 typedef long long int int64_t;

this results in compilation error like

 `common/strtol.cc:190:75: error: duplicate explicit instantiation of 'T
 strict_si_cast(const char, std::string) [with T = long long int;
 std::string = std::basic_string]'

 [-fpermissive]
 template int64_t strict_si_cast(const char *str, std::string *err);
 ^`

we can address this by instantiate the primitive type of `long long`
instead of `in64_t`.

Fixes: http://tracker.ceph.com/issues/16398
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-08 21:20:53 +08:00
Kefu Chai
37dbe98a31 Merge pull request #8189 from chardan/wip-chardan-15100
librados examples: link and include from current source tree by default.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-08 21:10:35 +08:00
xie xingguo
ff0329634a os/bluestore: release compressor if comp_mode turned out to be none
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
ed5f7c4df7 os/bluestore: drop unnecessary increase of iterator
We are going to break anyway.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
359c3863a5 os/bluestore: assert to confirm that we don't access violation
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
a7228eb8b9 os/bluestore: drop unused member _bytes
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
xie xingguo
72fe4df3f8 os/bluestore: check against that we don't access violation
Some day we might want make this interface more applicable by handling
the abnormal cases more gracefully...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 20:44:42 +08:00
Igor Fedotov
5c2a1bbb1f Merge pull request #10137 from xiexingguo/xxg-wip-bluestore-2016-07-05-02
os/bluestore: change algorithm of compression header from string to int

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
2016-07-08 13:43:33 +02:00
xie xingguo
1209cb3d12 os/bluestore: change algorithm of compression header from string to int
The literal description of compression algorithm can vary from
various compression types and thus increases the complexity of
en/decoding, which as a result can cause chaos. Also it can be
more efficient by translating it into a fixed-length type.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-08 19:39:17 +08:00
Orit Wasserman
1a8e72cb2d rgw: register the correct handler for cls_user_complete_stats
Fixes: http://tracker.ceph.com/issues/16624
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-07-08 10:54:00 +02:00
Kefu Chai
ce1f9c6e6e pybind: put temp .o files in $TMPDIR
otherwise they will go to $PWD/$TMPDIR instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-08 15:03:45 +08:00
Kefu Chai
edd7c9d709 cmake: creage egg_info files into build directory
otherwise they will go to the source tree, and "git ls-files" will list
them as untracked files, which annoy gitbuilder-ceph-tarball*-cmake
gitbuilders. like

+ echo 'error: Added files:'
error: Added files:
+ cat .git/added-files
src/pybind/rados/rados.egg-info/PKG-INFO
...

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-08 15:02:59 +08:00
Kefu Chai
07387eb9af Merge pull request #10186 from ceph/wip-cmake-no-with-mds
cmake: remove WITH_MDS option

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-08 11:37:04 +08:00
Michal Jarzabek
bf638dfe2a msg/AsyncMessenger: remove unneeded include file
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-07-07 23:35:54 +01:00
Sage Weil
33fb3bc63f Merge pull request #10163 from stiopaa1/msg_asyncmess_removeUnusedFunction_create_anon_connection
msg/AsyncMessenger: remove unused function
2016-07-07 16:33:21 -04:00
Ali Maredia
235a72a8f4 Merge pull request #10178 from ceph/wip-cmake
cmake: use stock Find* modules.

Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-07-07 15:24:45 -04:00