John Spray
531118fbe8
Merge pull request #14221 from jcsp/wip-19253-b
...
qa: whitelist another fullness log message
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-03 15:31:29 +01:00
Sage Weil
aec22a7d57
Merge pull request #14279 from jimmyway/wip-fix-pg-comment
...
osd: fix comments about pg refs and lock
Reviewed-by: Pan Liu <liupan1111@gmail.com>
2017-04-03 09:27:13 -05:00
Sage Weil
f5803eb7b3
Merge pull request #14277 from atheism/fix-test-objectstore-chain_xattr
...
test: objectstore: chain_xattr: fix wrong memset usage to fill buf
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-03 09:26:30 -05:00
Sage Weil
4d888d491e
Merge pull request #13800 from xiexingguo/wip-clean-pgcreate-throttle
...
common/config_opts.h: kill mon_pg_create_interval
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-03 08:38:07 -05:00
Radoslaw Zarzynski
51dd349d65
Merge pull request #13621 from Jing-Scott/add-remov-x-delete-feature
...
rgw: add the remove-x-delete feature to cancel swift object expiration
Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2017-04-03 15:19:12 +02:00
John Spray
13e8315d1a
Merge pull request #13862 from jcsp/wip-16523
...
qa, mds: add checks for fragmentation, and enable it by default
2017-04-03 11:56:37 +01:00
Nathan Cutler
c35a72173f
Merge pull request #14156 from smithfarm/release-notes-add-rbd-mirror
...
tools: ceph-release-notes: prefixes and pep8 compliance
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-04-03 12:16:17 +02:00
Orit Wasserman
0c4c0c892d
Merge pull request #12084 from hansbogert/patch-4
...
rgw: Add --zonegroup-new-name in usage
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-04-03 10:21:25 +03:00
Kefu Chai
65c85823a3
Merge pull request #14269 from liewegas/wip-no-spinlock
...
mon/OSDMonitor: spinlock -> std::mutex
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-03 15:16:58 +08:00
Kefu Chai
d79d85bca5
Merge pull request #14274 from liewegas/wip-osd-beacon-fix
...
osd: fix some osd beacon bugs
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-03 15:16:05 +08:00
Haomai Wang
2900ba5568
Merge pull request #14288 from Adirl/small_leaks
...
msg/async/rdma: Fix small memory leaks detected by valgrind
Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-04-03 04:28:56 +08:00
Amir Vadai
23fd3efaaf
msg/async/rdma: Fix small memory leaks detected by valgrind
...
Issue: 995322
Change-Id: Iccffbd0defd09aa51c4b51b78733921444ea1c5f
Signed-off-by: Amir Vadai <amir@vadai.me>
2017-04-02 16:47:46 +03:00
Kefu Chai
ef006681b7
Merge pull request #14170 from liewegas/wip-fewer-warnings
...
common/ceph_context: fewer warnings about experimental features
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-02 12:53:29 +08:00
Brad Hubbard
fa3ddead5e
Merge pull request #14271 from joscollin/wip-krbd-warning
...
rbd: warning, ‘devno’ may be used uninitialized in this function
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-02 08:59:38 +10:00
Kefu Chai
d65ee4ba52
Merge pull request #13909 from kestrels/wip-19217
...
crc32c: Add crc32c function optimized for ppc architecture
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-02 01:44:03 +08:00
Kefu Chai
09c977869d
Merge pull request #14124 from Fabian-Gruenbichler/ipv6_fix
...
common: fix segfault in public IPv6 addr picking
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-02 01:41:50 +08:00
Kefu Chai
c2432a5a6b
Merge pull request #14173 from badone/wip-do_request-abort
...
common: Fix heap buffer overflow in do_request
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-02 01:40:30 +08:00
Kefu Chai
e2b7cc00d9
Merge pull request #14193 from liupan1111/wip-fix-delete-full
...
librados: set the flag CEPH_OSD_FLAG_FULL_TRY of Op in the right place.
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-02 01:39:46 +08:00
Kefu Chai
3f92a8522f
Merge pull request #14248 from badone/wip-simple_spin_lock-delay
...
common: Make spinlock delay more conventional
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-02 01:38:13 +08:00
Kefu Chai
6ae3ce9148
Merge pull request #13690 from jcsp/wip-17503
...
mgr: pass through cluster log to plugins
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-02 01:37:31 +08:00
tang.jin
2f78a100fe
osd: fix comments about pg refs and lock
...
Signed-off-by: tang.jin <tang.jin@istuary.com>
2017-04-01 16:44:21 +08:00
Orit Wasserman
ea9331e484
Merge pull request #14276 from atheism/rgw-rgwop-remove-unused-iter
...
rgw: rgw_op: remove unused variable iter
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-04-01 09:48:46 +03:00
Weibing Zhang
fa1fe5fc1d
test: objectstore: chain_xattr: fix wrong memset usage to fill buf
...
Current usage:
memset(buf, sizeof(buf), 0x1F);
should be:
memset(buf, 0x1F, sizeof(buf));
to fill the buffer with '0x1F'.
Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
2017-04-01 13:24:42 +08:00
Weibing Zhang
d5a525c645
rgw: rgw_op: remove unused variable iter
...
The variable iter is not used in RGWInitMultipart::execute().
Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
2017-04-01 11:52:59 +08:00
Sage Weil
c4ba267245
Merge pull request #13811 from rzarzynski/wip-bs-bitmap-mem-cleanup
...
os/bluestore: memory and dereference clean-up in the BitAllocator
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-31 20:54:22 -05:00
Sage Weil
cc6a88ec2c
Merge pull request #14121 from majianpeng/bluefs-get-allocated
...
os/bluestore/BlueFS: optimize get_allocated
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-31 20:54:07 -05:00
Sage Weil
841de704cf
Merge pull request #14162 from majianpeng/optimize-bluestore-force-flush
...
os/bluestore: clean up flush logic
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-31 20:53:57 -05:00
Sage Weil
b19613f8ab
Merge pull request #14225 from ivancich/wip_fix_throttle_config_change
...
os/bluestore: make live changes for BlueStore throttle config work like initial config
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-31 20:52:59 -05:00
Sage Weil
b0d7e13435
osd: only send beacon on connect if active
...
Otherwise the mon will just ignore it and we'll wait another
cycle.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-31 15:23:27 -04:00
Sage Weil
4b07746381
osd: fix beacon condition
...
- && should have been ||
- change this to instead not send when monmap epoch==0,
and only set last_sent_beacon if we actually send. That
way we'll send on the next tick after we get a real monmap.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-31 15:22:00 -04:00
vasukulkarni
574049a90b
Merge pull request #14229 from ceph/wip-systemd
...
qa: Add reboot case for systemd test
2017-03-31 09:15:53 -07:00
John Spray
992b8499d0
Merge pull request #14254 from idryomov/wip-vstart-runner-ps
...
qa/vstart_runner: amend ps invocation
Reviewed-by: John Spray <john.spray@redhat.com>
2017-03-31 17:15:30 +01:00
vasukulkarni
b6895fbe0e
Merge pull request #14226 from ceph/preset-mon
...
systemd: remove ceph-create-keys from presets
2017-03-31 09:15:21 -07:00
Sage Weil
59548509ef
Merge pull request #14266 from tchaikov/wip-require-mgr-for-pg-dump
...
tests: add MGR=1 so 'pg dump' won't be blocked
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-03-31 10:58:56 -05:00
Sage Weil
e5b07011b2
Merge pull request #14259 from johnwilkins/wip-doc-multisite
...
doc: wip-doc-multisite ports downstream multisite document upstream.
2017-03-31 10:52:53 -05:00
Jos Collin
87c0fd2399
rbd: warning, ‘devno’ may be used uninitialized in this function
...
The following warning appears during make. Fixed in both unmap_image() functions in krbd.cc
--
krbd.cc: In function ‘int krbd_unmap_by_spec(krbd_ctx*, const char*, const char*, const char*, const char*)’:
krbd.cc:608:65: warning: ‘devno’ may be used uninitialized in this function [-Wmaybe-uninitialized]
return do_unmap(ctx->udev, devno, build_unmap_buf(id, options));
^
krbd.cc:591:9: note: ‘devno’ was declared here
dev_t devno;
--
Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-03-31 20:01:43 +05:30
Sage Weil
973829132b
mon/OSDMonitor: spinlock -> std::mutex
...
I think spinlock is dangerous here: we're doing semi-unbounded
work (decode). Also seemingly innocuous code like dout macros
take mutexes.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-31 09:33:19 -04:00
Kefu Chai
8a3b48551a
osd/OSDMap: use _pg_to_up_acting_osds() to get_pg_acting_primary()
...
avoid unnecessary swap() call of vector<int> which will be dropped on
the floor after getting its first element, which can be retrieved using
another parameter using _pg_to_up_acting_osds() directly.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-03-31 18:32:43 +08:00
Kefu Chai
73c75b97c5
mgr: use OSDMap::get_pg_acting_primary() to get the primary
...
OSDMap::pg_to_acting_osds() assumes that the "acting" parameter is not
null.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-03-31 18:31:05 +08:00
Kefu Chai
63f69e04df
tests: add MGR=1 so 'pg dump' won't be blocked
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-03-31 14:26:09 +08:00
xie xingguo
74fb4823ed
common/config_opts: kill mon_pg_create_interval
...
This is not needed anymore.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-03-31 13:56:21 +08:00
Kefu Chai
8f8575a4eb
Merge pull request #14260 from dmick/wip-workunit-clone-with-branch
...
workunit: request branch when cloning
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-31 13:17:46 +08:00
Brad Hubbard
34481768cb
common: Make spinlock delay more conventional
...
The accepted method of implementing a spinlock delay is the "pause"
instruction.
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-03-31 14:33:32 +10:00
Kefu Chai
9ca7ccf5f1
tasks/workunit.py: specify the branch name when cloning a branch
...
c1309fb
failed to specify a branch when cloning using --depth=1, which
by default clones the HEAD. and we can not "git checkout" a specific
sha1 if it is not HEAD, after cloning using '--depth=1', so in this
change, we dispatch "tag", "branch", "HEAD" using three Refspec classes.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-03-30 20:30:09 -07:00
Sage Weil
b782b3716e
Merge pull request #14219 from ShiqiCooperation/master
...
os/bluestore: clean up Invalid return value judgment
Reviewed-by: Sage Weil <sage@redhat.com>
2017-03-30 17:23:09 -05:00
Sage Weil
b0ed37a2dc
Merge pull request #14228 from ifed01/wip-bluestore-fix-store-test
...
test/store_test: fix bluestore test cases disablement
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
2017-03-30 17:21:55 -05:00
Sage Weil
578b0f7cfc
Merge pull request #13617 from liewegas/wip-mgr-commands
...
mon,mgr: tag some commands for ceph-mgr
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-30 17:12:00 -05:00
Sage Weil
d0a3f156b2
mon/ConfigKeyService: wait for quorum
...
Among other things, this prevents a mgr activation stall if it
happens to request config-keys from a mon that is out of
quorum.
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-30 17:57:35 -04:00
Sage Weil
319b72380e
mon/MgrMonitor: show delta
...
This is mostly because I couldn't debug a weird state where
it kept updating but it appeared the addr was not changing
(always '-').
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-30 17:57:35 -04:00
Sage Weil
dc49857a65
mon/MgrMap: implement dump, add to ceph-dencoder
...
Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-30 17:57:35 -04:00