Sage Weil
2f2cb9eb42
Merge pull request #8678 from jack-changtao/pgbackend
...
osd/PGBackend: if min > max, PGBackend::objects_list_partial will list all objects of that pg
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 15:48:25 -04:00
Sage Weil
c2defeb2c0
Merge pull request #8680 from ceph/rm-distribute
...
tools: remove installation for distribute. It is no longer maintained
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 15:48:09 -04:00
Sage Weil
2c3ef6d7ed
Merge pull request #8681 from xiexingguo/xxg-wip-crushfix
...
crush: fix mishandled result of get_bucket() method
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 15:47:57 -04:00
Sage Weil
93d7deff53
Merge pull request #8707 from liewegas/wip-kv-merge
...
kv: add merge operator support, fix test
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 15:47:22 -04:00
Sage Weil
1e1d898d1f
Merge pull request #8688 from xiexingguo/xxg-wip-crushtooltip
...
tools/crushtool: add straw2 support for help message
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 15:47:08 -04:00
Sage Weil
e4409981b8
Merge pull request #8671 from majianpeng/rados-objectsize-smaller-blocksize
...
tools/rados: fix "Floating point exception" if objectsize smaller than blocksize when do write-bench.
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 15:46:57 -04:00
Sage Weil
8c3ddbea8b
Merge pull request #8502 from songbaisen/song20
...
crushtool: do not allow to compile crushmap with repeat ruleset.
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 15:46:40 -04:00
Sage Weil
bf93c05e41
Merge pull request #8724 from aderumier/master
...
sysvinit: fix ceph init script
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-24 10:31:09 -04:00
Alexandre Derumier
b581dd56be
fix ceph init script
...
commit 65963739cd
have introduce a bug
test variables need to be quoted, or -n always return true, even if variables don't exist
2016-04-24 09:55:35 +02:00
Sage Weil
c3b595f284
Merge pull request #7942 from xiexingguo/xxg-wip-fixdirtyinc
...
mon: OSDMonitor: improve pool creation logic
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Xiaoxi Chen <xiaoxchen@ebay.com>
2016-04-22 20:21:57 -04:00
Sage Weil
7893e9fd26
Merge pull request #7997 from songbaisen/song11
...
osdc: Reverse the probing vector in better way.
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-22 20:20:57 -04:00
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
Allen Samuels
4d2ad1046b
kv/RocksDBStore: implement merge operator
...
Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
2016-04-22 16:44:09 -04:00
Allen Samuels
abbececc78
kv/KeyValueDB: add merge operator interface and test
...
Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-22 16:41:46 -04:00
Sage Weil
2b075aa52d
ceph_test_keyvaluedb: clean up test dir
...
Just like ceph_test_objectstore
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-22 16:38:14 -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
Allen Samuels
85c14de209
ceph_test_keyvaluedb: fixup unit test for keyvaluedb
...
Fixes: http://tracker.ceph.com/issues/15435
Signed-off-by: Allen Samuels <allen.samuels@sandisk.com>
2016-04-22 14:09:47 -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