Sage Weil
c0cf1744bf
Merge pull request #8384 from songbaisen/song18
...
crush: when take place the crush map should consider the rule is in …
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 20:20:29 -04:00
Sage Weil
72d2ae02a4
Merge pull request #8591 from xiexingguo/xxg-wip-15492
...
test: generate temp pool name in a safer way
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 20:19:47 -04:00
Sage Weil
c26ebd9a64
Merge pull request #8577 from runsisi/wip-fix-op-lock
...
osdc/Objecter: small cleanup for osd op completion lock
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 20:19:32 -04:00
Sage Weil
89ef459415
Merge pull request #8596 from xiexingguo/xxg-wip-blue
...
os/filestore: add sanity check for stat() syscall
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 20:18:51 -04:00
Yuri Weinstein
ef76c5c3ac
Merge pull request #8710 from ceph/wip-rename-tests
...
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
2016-04-22 16:06:59 -07:00
Tamil Muthamizhan
0fd358b877
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
...
renamed the workunit and test to reflect reality and for better clarity
2016-04-22 18:25:46 -04:00
Sage Weil
a887db7611
Merge pull request #8395 from renhwsky/renhw-wip-monmap
...
mon/monmap: conditional optimization in build_from_host_list
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-22 17:18:56 -04:00
Sage Weil
dcd211cdd1
Merge pull request #8449 from javacruft/ceph-osd-prestart
...
ceph-osd-prestart.sh: drop --setuser/--setgroup
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 17:06:44 -04:00
Sage Weil
bf6892bf9f
Merge pull request #8458 from jjhuo/clean_blue_configs
...
common/config_opts: remove invalid config options of bluestore
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-22 17:04:02 -04:00
Sage Weil
26d7528b36
Merge pull request #8463 from majianpeng/bluestore-zero-truncate
...
os/bluestore/BlueStore: Don't forget assign nid when offset > size in _do_zero
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 17:03:20 -04:00
Sage Weil
b06966c761
Merge pull request #8706 from liewegas/wip-jewel
...
doc/release-notes: is, not will be, basis for LTS
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-04-22 16:47:31 -04:00
Sage Weil
d73d621296
doc/release-notes: is, not will be, basis for LTS
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-22 16:13:13 -04:00
Gregory Farnum
3e82707470
Merge pull request #8705 from liewegas/wip-jewel
...
doc/release-notes: revise terminology
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-04-22 15:44:18 -04:00
Sage Weil
95176baded
doc/release-notes: revise terminology
...
Avoid loaded 'production ready' term in favor of just 'stable'.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-22 15:30:49 -04:00
weiqiaomiao
161854bfe6
rgw: fix memory leak in func 'RGWCreateBucket_ObjStore_S3::get_params' ( #8670 )
...
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-04-22 14:19:59 -04:00
Sage Weil
4c5370401c
Merge pull request #8527 from roidayan/wip-vstart_clean_prints
...
vstart: clean prints
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-22 13:58:41 -04:00
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
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
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