RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-28 22:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,422 Commits 216 Branches 394 Tags 1.2 GiB
613d5eecbe
Commit Graph

52422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
613d5eecbe Merge pull request #8549 from tchaikov/wip-kill-filestore-warning 
pybind, FileStore: silence gcc warnings

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-04-22 12:32:55 -04:00
Sage Weil
553a2b91ae Merge pull request #8551 from scienceluo/patch-1 
doc: Fixes Different font of the title

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yatin Kumbhare <yatinkumbhare@gmail.com>
 2016-04-22 12:31:50 -04:00
Sage Weil
000d415663 bufferlist.cc fix typo in outputReviewed-by: Sage Weil <sage@redhat.com> 
bufferlist.cc fix typo in output

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 12:16:26 -04:00
Sage Weil
bbb6283efe Merge pull request #8581 from emenguy/pgnum_pools_documentation 
doc: adding pg_num to pools documentation

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2016-04-22 12:16:00 -04:00
Sage Weil
b608d246b0 Merge pull request #8595 from qhjindev/fix-LFNIndex 
os: fix typo in LFNIndex.h
 2016-04-22 12:15:13 -04:00
Sage Weil
d5de735ecb Merge pull request #8623 from rmechler/wip-15504 
pybind: removed unneccesary parentheses from if statements

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-04-22 12:05:36 -04:00
Sage Weil
b369c4acbf Merge pull request #8631 from stiopaa1/buffer_fwd 
image_watcher/Notifier: remove header file

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 12:04:16 -04:00
Sage Weil
697b0fa92b Merge pull request #8644 from tchaikov/wip-doc-os-recommendations 
doc/start/os-recommendations.rst: add Jewel requires

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 11:53:04 -04:00
Sage Weil
e66a94f2f6 Merge pull request #8650 from scienceluo/wip-lkx-fixesdoc 
doc: Fixes "branch -b" and "Qemu"

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2016-04-22 11:51:29 -04:00
Sage Weil
73130b6ca6 Merge pull request #8674 from yatinkumbhare/doc-fix2 
doc: fix broken link to monitor quorum

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2016-04-22 11:44:51 -04:00
Haomai Wang
d5835ab608 Merge pull request #8630 from roidayan/xio-log_prefix 
xio: add log prefix for log prints outside the XioMessenger class

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-04-22 23:31:25 +08:00
Sage Weil
56e2460244 Merge pull request #8701 from cernceph/wip-bsweight 
ceph-osd-prestart.sh: compute correct defaultweight for bluestore

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 10:43:36 -04:00
Sage Weil
bbdec192f8 Merge pull request #8691 from flyd1005/master 
cleanup: Fix typos, change prefered to preferred

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-04-22 10:37:48 -04:00
Dan van der Ster
6f36b5424f compute correct defaultweight for bluestore 
The default crush weight should be the size of the block device, not
the tiny 10M xfs partition.

Backport: jewel
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
 2016-04-22 16:37:34 +02:00
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
Li Peng
88ae8c38d0 Fix typos, change prefered to preferred 2016-04-22 15:18:44 +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
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
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
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
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
David Zafman
5e8e03b4d0 test: Fix ceph-objectstore-tool test to run manually from src non-cmake 
Fix init-ceph to handle it when CEPH_* values set

Signed-off-by: David Zafman <dzafman@redhat.com>
 2016-04-18 18:29:17 -07:00
Casey Bodley
c1520fd7ab Merge pull request #8564 from theanalyst/fix/15251 
rgw_admin: improve period update errors
 2016-04-18 18:20:52 -04:00
Abhishek Lekshmanan
7ca01d4ff7 rgw_admin: improve period update errors 
If we do a period update on a realm with multiple masters, we fail
stating invalid argument, improving this to suggest that we have
actually errored out because of multiple master zg in a realm, and
printing both of these zonegroups. RGWPeriodMap::update takes
CephContext as an argument, so that we can use ldout. Also dropping the
error messages reporting invalid arguments on period.update() as these
are handled within the function itself whenever it manifests itself.

Fixes: http://tracker.ceph.com/issues/15251
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
 2016-04-18 22:46:53 +02:00