Commit Graph

52562 Commits

Author SHA1 Message Date
Sage Weil
4b9165f0e9 os/bluestore/BlueFS: Record the correctly perfcouter
os/bluestore/BlueFS: record the correctly perfcounter

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 10:37:18 -04:00
Jianpeng Ma
d51528191d os/bluestore/BlueFS: Record the correctly perfcouter.
After "log_writer->append(bl)", the length of bl become zero.
So tune the order.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-04-23 00:28:07 +08:00
Sage Weil
85abc36f2b Merge pull request #8696 from cernceph/wip-util
osd: fix backwards min/max osd utilization

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 10:31:07 -04:00
Jason Dillaman
b029c493fd Merge pull request #8676 from runsisi/wip-fix-init-exlock
librbd: fix potential double free of SetSnapRequest instance

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-22 10:21:52 -04:00
runsisi
0a6eaac12f librbd: fix potential double free of SetSnapRequest instance
if image feature EXCLUSIVE_LOCK is not enabled we should not try to
initialize the exclusive lock, or we may end with two async Contexts
to finish the same SetSnapRequest instance

Fixes: http://tracker.ceph.com/issues/15571
Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-04-22 22:02:55 +08:00
Kefu Chai
656774bd97 pybind/rados: silence "-Wstrict-prototypes" warnings
it silences warnings like:
```
warning:
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.cpp:11361:35:
comparison between signed and unsigned integer expressions
[-Wsign-compare]
__pyx_t_5 = ((__pyx_v_ret > __pyx_v_size) != 0);
^
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-22 21:36:11 +08:00
Kefu Chai
48be254260 pybind: silence gcc warnings about '-Wstrict-prototypes'
this silences following warning

```
warning: cc1plus: command line option ‘-Wstrict-prototypes’ is valid for
C/ObjC but not for C++ [enabled by default]
```

* distutils pass "-DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes" to
  compiler by default if OPT environment variable is not set. so we opt to
  remove '-Wstrict-prototypes' as we are using c++ as the language of the
  generated bindinging.
* also use "env" to pass the environment variables to avoid unnecessary
  quote added by distutils, which just breaks the generated CLI command
  line.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-22 21:36:11 +08:00
Sage Weil
5698cd4889 Merge pull request #8530 from wjwithagen/patch-6
ceph-helpers.sh: only use mon*pid files when killing MONs

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-22 09:35:41 -04:00
Kefu Chai
515cd487de cmake: config-h.in.cmake: avoid redefinition warnings
when compiling python bindings, the included "pyconfig.h" also defines
some of the macros which are duplicated with our versions in acconfig.h.
so do not define them if they are already defined.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-22 21:33:55 +08:00
Kefu Chai
323a3f8022 os/FileStore::OpSequencer: operator<<: silence gcc warning
it kills following warning:
```
/home/kefu/dev/ceph/src/os/filestore/FileStore.cc: In function
‘std::ostream& operator<<(std::ostream&, const
FileStore::OpSequencer&)’:
/home/kefu/dev/ceph/src/os/filestore/FileStore.cc:155:132: warning: the
compiler can assume that the address of ‘out’ will always evaluate to
‘true’ [-Waddress]
   assert(&out);
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-22 21:33:55 +08:00
Haomai Wang
4527a33b4b Merge pull request #8662 from majianpeng/nvmedevice-cleanup
os/bluestore/NVMEDevice: Remove the duplicated code.

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
2016-04-22 20:49:21 +08:00
Alfredo Deza
f4857225ab Merge pull request #8697 from vumrao/wip-vumrao-15568
man : ceph-deploy add config keyword in ceph-deploy

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2016-04-22 07:11:24 -04:00
Vikhyat Umrao
ddbe763027 man : ceph-deploy add config keyword in ceph-deploy
config push and pull command

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

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
2016-04-22 15:35:47 +05:30
Dan van der Ster
7529851f2a osd: fix backwards min/max osd utilization
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
2016-04-22 11:20:30 +02:00
Tao Chang
e1a81c567a pgbackend: if min > max ,PGBackend::objects_list_partial will list all objects of that pg
Signed-off-by: Tao Chang <changtao@hihuron.com>
2016-04-22 05:17:32 -04:00
wuxingyi
009bd49cc2 PG: PG is only likely to go active when min_size turns smaller.
Signed-off-by: wuxingyi <wuxingyi@letv.com>
2016-04-22 16:50:11 +08:00
Li Peng
88ae8c38d0 Fix typos, change prefered to preferred 2016-04-22 15:18:44 +08:00
xie xingguo
6448ea283b tools/crushtool: add straw2 support for help message
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-22 09:45:30 +08:00
Casey Bodley
8e58fe6a55 Merge pull request #8539 from vuhuong/wip-xio-heavy-msgrs
Wip Xio heavy messengers and resources
2016-04-21 14:57:59 -04:00
Ali Maredia
2df1a66979 Merge pull request #8649 from dzafman/wip-test-cot-fix
test: Fix ceph-objectstore-tool test to run manually from src non-cmake
2016-04-21 13:24:04 -04:00
Jianjian Huo
142e0b0f5f common/config_opts: remove obsolete config options of bluestore
Those obsolete options are leftovers from newstore, and are not
used anymore.

Signed-off-by: Jianjian Huo <jianjian.huo@ssi.samsung.com>
2016-04-21 10:16:59 -07:00
Xiaoxi Chen
73368069dd python_cephfs: rule out empty/None volume_id
Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
2016-04-21 09:10:18 -07:00
Sage Weil
b7afa78e22 Merge remote-tracking branch 'gh/jewel' 2016-04-21 07:39:36 -04:00
Sage Weil
692f2c8910 doc/release-notes: v10.2.0 jewel
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-21 07:39:25 -04:00
Jianpeng Ma
d81c762041 tools/rados: fix "Floating point exception" if objectsize smaller than blocksize when do write-bench.
When do write-bench, if objectsize is smaller than blocksize. It will
casue "Floating point exception".
This because in bjBencher::write_bench:
>>if (data.op_size)
>>    writes_per_object = data.object_size / data.op_size;
  It make writes_per_object = 0;
......
>> name[i] = generate_object_name(i / writes_per_object);
  i/0 cause Floating point exception.

If objectsize is smaller than blocksize, make blocksize is eqaul
objectsize.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-04-21 18:22:46 +08:00
xie xingguo
0a1fa15ab5 crush: remove unnecessary sanity check
We have done sanity check with bucket_exists() above, so these
checks are redundant and less effcient.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-21 15:54:51 +08:00
xie xingguo
dffc46c668 crush: kill code we never used
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-21 15:49:07 +08:00
xie xingguo
3299b018af crush: use bucket_exists() for item sanity checks
This is because get_bucket() never returns 0 on error,
it always returns a non-zero value. So if you
assert(get_bucket(item)), you always get a postive answer.

Replace existence check for a specific item

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-21 15:49:07 +08:00
xie xingguo
ec43eb209f crush: fix get_rule_step() can't catch all errors
Because get_rule() may return -ENOENT on error, we shall
use the IS_ERR macro to catch that, as all the other callers does.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-21 15:49:07 +08:00
xie xingguo
b0b5392d1a crush: fix mishandle result of get_bucket() method
Get_bucket() is supposed to return a pointer to a specific bucket on success.
However, it never returns a null pointer if error occurs. It returns
-ENOENT instead. That's why most caller is misjudge the result code of get_bucket()
method.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-21 15:49:07 +08:00
Roi Dayan
ac50842d81 xio: add MNop.h to dist tarball
This file is needed when we want to build a package with xio messenger
but was not added to dist tarball.

Signed-off-by: Roi Dayan <roid@mellanox.com>
2016-04-21 09:52:58 +03:00
Boris Ranto
0c56bcaef6 Merge pull request #8667 from SUSE/wip-15549
rpm: refrain from installing systemd unit files twice

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-04-21 08:17:55 +02:00
Yatin Kumbhare
c244eb2d61 doc: fix broken link to monitor quorum
Link pointing in Monitor Quorum section to
ceph configuration file was broken.
Fixing it to point to configuration section.

Signed-off-by: Yatin Kumbhare yatinkumbhare@gmail.com
2016-04-21 11:42:39 +05:30
Alfredo Deza
64f14d43a8 install-deps: remove distribute requirement
Because it was meant for Ubuntu 12.04 and it is installing directly
from PyPI on newer releases that aren't being built for 12.04

Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-04-20 16:23:55 -04:00
Alfredo Deza
d02bd9cb70 tools: remove installation for distribute. It is no longer maintained and breaks builds
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2016-04-20 15:48:19 -04:00
Sage Weil
eff74daf9c Merge pull request #8643 from ceph/wip-udev
udev: remove 60-ceph-partuuid-workaround-rules

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-04-20 15:09:30 -04:00
Nathan Cutler
6d3cbaa509 rpm: refrain from installing systemd unit files twice
These files are already installed by systemd/Makefile.am

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-04-20 19:04:33 +02:00
Jianpeng Ma
d3e87670fe os/bluestore/NVMEDevice: Remove the duplicated code.
In spdk/pci.h spdk/nvme.h, it alread contain those code:
extern "C" {
 So remove the duplicated code.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2016-04-21 01:00:33 +08:00
Casey Bodley
2dd8942c71 Merge pull request #8664 from theanalyst/doc/rgw/fix-multisite-zone
doc: multisite: fix json output for zone create
2016-04-20 10:33:05 -04:00
Jenkins Build Slave User
3a9fba20ec 10.2.0 2016-04-20 11:29:48 +00:00
Abhishek Lekshmanan
ec6ff4d5e8 doc: mutlisite: fix json output for zone create
creation of ``us-west`` was wrongly showing ``us-east-2`` output

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-04-20 12:53:55 +02:00
xie xingguo
a30cbe9ade osd: kill PG_STATE_SCRUBQ state, which is never used
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-20 14:59:44 +08:00
xie xingguo
cf1b67e2a3 osd: kill get_any_up_osd(), which is never used
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-20 14:28:21 +08:00
Casey Bodley
da8e779e1c Merge pull request #8658 from ceph/wip-cmake
cmake: Added CMAKE_CEPH_*_VIRTUALENV var to fix build
2016-04-19 16:39:26 -04:00
Ali Maredia
30e9609cc7 cmake: Added CMAKE_CEPH_*_VIRTUALENV var to fix build
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-19 16:37:45 -04:00
Yehuda Sadeh
4df5a57078 Merge pull request #8636 from ceph/wip-rgw-leak
rgw leaks fixes
2016-04-19 12:03:43 -07:00
Casey Bodley
cb9c1faae0 Merge pull request #8653 from theanalyst/doc/fix-multisite-pools
doc: rgw multisite, add pools section & minor cosmetic improvements
2016-04-19 09:35:31 -04:00
Yehuda Sadeh
f86f73f3f7 rgw: drop rest op reference in error path
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-04-19 06:11:09 -07:00
Abhishek Lekshmanan
88369e298b doc: rgw multisite, add pools section & minor cosmetic improvements
`Pool Configuration` was mentioned previously but didn't contain any
info, adding this section and minor cosmetic changes to a few headings
after looking at the html view.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-04-19 11:02:22 +02:00
xie xingguo
7ad9245be1 osd/ReplicatedPG: kill members we never used
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-19 15:11:32 +08:00