Commit Graph

55825 Commits

Author SHA1 Message Date
Kefu Chai
d49ce27a74 Merge pull request #10279 from ceph/wip-cmake
cmake changes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-13 21:31:27 +08:00
Haomai Wang
3fd4397115 Merge pull request #9784 from ceph/wip-ms-async-fixes
msg/async: connect authorizer fix + recv_buf size

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-07-13 21:28:53 +08:00
Kefu Chai
37df276db2 Merge pull request #10276 from tchaikov/wip-doc-drop-i386
doc: remove i386 from minimal hardware recommendations

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Vikhyat Umrao <vumrao@redhat.com>
2016-07-13 20:15:16 +08:00
Mykola Golub
c0422fa9fb Merge pull request #10254 from dillaman/wip-16536
rbd-mirror: include local pool id in resync throttle unique key

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-07-13 15:10:37 +03:00
John Spray
56a9aa7013 Merge pull request #10245 from jcsp/wip-mds-cache-warn
mds: add health warning for oversized cache

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-07-13 13:09:51 +01:00
Kefu Chai
dc8b3bae5d cmake: use CMAKE_CXX_STANDARD for enabling C++11
hope we can drop the crufts when moving to cmake 3.1+

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 19:50:33 +08:00
John Spray
275b729336 Merge pull request #10191 from batrick/mds-minor
mds: use reference to avoid copy

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-13 12:41:01 +01:00
John Spray
44a4651bbd Merge pull request #10268 from batrick/i16664
doc: fix standby replay config

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-13 12:33:01 +01:00
Kefu Chai
2e7c72d8e8 cmake: do not check for availability of static_cast<> anymore
it's implied by C++11 compliance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 17:23:11 +08:00
Kefu Chai
1a86184260 cmake: use CHECK_STRUCT_HAS_MEMBER for checking member variables in struct
we were using CHECK_CXX_SOURCE_COMPILES() for this purpose, which was a
little bit clumsy.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 17:13:20 +08:00
Kefu Chai
2d5d479988 doc: remove i386 from minimal hardware recommendations
as we don't build or test on i386 machines now. also, we don't build
i386 releases anymore. and regular users are on amd64 or arm.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 14:41:06 +08:00
Kefu Chai
fb3a34ba93 Merge pull request #10102 from liewegas/wip-mon-nosnap
mon/MonitorDBStore: do not use snapshot iterator; close on close

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-13 14:27:40 +08:00
Kefu Chai
898d25f892 Merge pull request #10275 from ceph/wip-cmake
cmake: disable -fvar-tracking-assignments for ceph_dencoder.cc

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2016-07-13 14:13:26 +08:00
Kefu Chai
b6680516ea cmake: disable -fvar-tracking-assignments for ceph_dencoder.cc
there are too many variables involved in main() of ceph_dencoder.cc, but
-fvar-tracking-assignments is enabled by default, when the compiler
finds that the number of variables exceeds the limit
"max-vartrack-size", it gives up, and tries again disabling this option.

this change avoids the recompilation of ceph_dencoder.cc and also silences
the warning of
```
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/encoding/ceph_dencoder.cc:
In function ‘int main(int, const char**)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/test/encoding/ceph_dencoder.cc:289:5:
note: variable tracking size limit exceeded with
-fvar-tracking-assignments, retrying without
 int main(int argc, const char **argv)
     ^
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 12:58:33 +08:00
Haomai Wang
248637b184 Merge pull request #10113 from stiopaa1/msg_asyncmess_moveC_handle_reap
msg/AsyncMessenger: move C_handle_reap class to cc

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-07-13 11:14:22 +08:00
Haomai Wang
1143652f87 Merge pull request #10183 from stiopaa1/msg_asyncmess_addConstToSetAddrUnknowns
msg/Messenger: add const and override to function

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-07-13 11:13:22 +08:00
Haomai Wang
1c987f8cfd Merge pull request #10141 from stiopaa1/msg_asyncmess_removeUnneededCast
msg/AsyncMessenger.cc: remove unneeded cast

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
2016-07-13 11:12:28 +08:00
Kefu Chai
ec8d3bed93 Merge pull request #10266 from tchaikov/wip-ceph-detect-init-py3
ceph-detect-init: fix the py3 test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-07-13 10:22:48 +08:00
Patrick Donnelly
42e02369f0
doc: fix standby replay config
I tried using these settings in tests without success. The correct config names
are prefixed with "mds".

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

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2016-07-12 15:44:00 -04:00
Kefu Chai
6ed1c41fed ceph-detect-init: fix the py3 test
the mock_open() does not support "for i in open()", and readline() and
readlines() support was added in py3.3 and py3.4 so for better backwards
compatibility, we should change the code being tested to use the plain
read() call.
and also use open(path) instead of open(path, 'rb') for simplicity,
otherwise we need to use bytestring for comparison and pass the same
parameters to mock.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 02:25:07 +08:00
Kefu Chai
4366145a09 test: ceph-detect-init: fix the indent
this fixes the pep8 failure:
```
pep8 runtests: commands[0] | flake8 ceph_detect_init tests
tests/test_all.py:121:17: E128 continuation line under-indented for
visual indent
tests/test_all.py:125:17: E128 continuation line under-indented for
visual indent
tests/test_all.py:129:17: E128 continuation line under-indented for
visual indent
tests/test_all.py:133:17: E128 continuation line under-indented for
visual indent
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-13 02:22:15 +08:00
Haomai Wang
e489cd4f07 Merge pull request #10090 from yuyuyu101/wip-remove-async-lock
msg/async: remove file event lock

Reviewed-by: Kefu Chai <kefu@redhat.com>
2016-07-13 00:26:16 +08:00
Haomai Wang
96943eeaad ceph_test_msgr: clean previous sent queue infos
1. A -> B
2. goto standby
3. B mark down
4. A reconnect to B
5. got reset session and dispatch remote reset
6. because remote reset is executed in DispatchQueue, it will be delayed
7. A -> B successfully and begin to send message
8. assert because we found the first message is missing but it's reasonble

if policy.resetcheck is true

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:59:43 +08:00
Haomai Wang
d1268a6aa8 ceph_test_msgr: use ceph log infrastructure to output
because we want to get the right log sequence which mixes ceph logginer and
cerr. Otherwise, cerr output make the logs a little disordered.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:51:27 +08:00
Haomai Wang
f04f21892c msg/async/AsyncConnection: make sure no STATE_WAIT -> STATE_STANDBY
Otherwise if message in queue, we will continue to reconnect right now,
it won't meet our expectation that we want our connect request delay

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:51:27 +08:00
Haomai Wang
63d5c252ae test_msgr: add server_msgr cleanup
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:51:27 +08:00
Haomai Wang
64405c956d msg/async/AsyncConnection: add REPLACING write status to indicate replacing
When replacing, we don't expect any AsyncConnection dispatch new event which
will cause thing chaos

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:51:27 +08:00
Haomai Wang
97e6850855 msg/async: hold lock avoid state changing
Fixes: http://tracker.ceph.com/issues/16554
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:51:27 +08:00
Haomai Wang
9a47ea4fe7 test_async_driver: accept new api changes
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:51:27 +08:00
Haomai Wang
8143fffb30 msg/async: dont delete time event when exchange eventcenter
When replacing and someone called mark_down, it will delete_time_event which
isn't allowed. Because we're exchaning EventCenter now!

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:51:27 +08:00
Haomai Wang
fe5770f500 msg/async/AsyncConnection: simplify shutdown socket flow
Let cleanup resources things all in shutdown_socket

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:50:47 +08:00
Haomai Wang
37629d587d msg/async: add assert to ensure create/delete file event within thread
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:49:13 +08:00
Haomai Wang
24b3c27db1 Event: remove file_lock
Now all EventCenter will exists within one thread, it will let all file events
api changes without locks.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:48:33 +08:00
Haomai Wang
af1d3ed36f msg/async/AsyncMessenger: make sure all connection cleanup handler finished
Fixes: http://tracker.ceph.com/issues/16552
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:48:33 +08:00
Haomai Wang
fdb9c7dba3 msg/async: remove close socket line
because if we are in STATE_CLOSED, fd must be -1

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:48:33 +08:00
Haomai Wang
cbe5ef6385 msg/async: make sure worker started before let msgr ready
When we create event thread, it need a little time to enter event loop(like
calling set_owner), if caller is going to call create_file_event before event
thread enter event loop, it will trigger assert.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:48:33 +08:00
Haomai Wang
f5d1c05b8f msg/async: make EventCenter notify file event creating when set_owner
EventCenter::init is called by other thread instead of event thread, so we
need to move create_file_event to set_owner which is called by event thread.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:48:32 +08:00
Haomai Wang
e66a48f854 msg/async/AsyncConnection: swap eventcenter when replacing
Previously we only exchange fd when replacing, now we will introduce dpdk
plugin in the near future. It needs all fd used locally which not like
kernel socket shared by all cores.

So we need to add EventCenter swapping to let each socket is associated to
EventCenter.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:47:53 +08:00
Kefu Chai
fe98b0b33b Merge pull request #10153 from tchaikov/wip-no-copy-plugins
test: test_{compression_plugin,async_compressor}: do not copy plugins

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:43:24 +08:00
Haomai Wang
96aa327e84 msg/async/Event: fix delete_time_event leak
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:37:43 +08:00
Haomai Wang
478dd90027 AsyncMessenger: make create/delete_file_event within event thread
We are make each AsyncConnection/AsyncMessenger only modify its file event
in event thread. So make sure create/delete_file_event aren't directly called.

Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-07-12 23:37:22 +08:00
Casey Bodley
9b6759286c Merge pull request #10174 from theanalyst/test/rgw/multisite-cleanup
rgw: test_multi.py avoid creating mds

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-12 10:12:16 -04:00
Casey Bodley
55f1a34b5b Merge pull request #10211 from oritwas/wip-rgw-fix-zone-modify
rgw: remove unused realm from radosgw-admin zone modify

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-12 10:10:56 -04:00
John Spray
e1f96e2d08 Merge pull request #10256 from ceph/wip-kill-ceph_test_rados_api_tmap_migrate
test: remove ceph_test_rados_api_tmap_migrate

Reviewed-by: John Spray <john.spray@redhat.com>
2016-07-12 11:10:59 +01:00
Kefu Chai
05120d17db Merge pull request #10229 from badone/wip-libgmock_main.la-build-failures
makefile: change librgw_file_* as check_PROGRAMS

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-12 16:25:37 +08:00
Kefu Chai
53af28db6e test: remove ceph_test_rados_api_tmap_migrate
see also: http://tracker.ceph.com/issues/16144

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-12 16:08:09 +08:00
Jason Dillaman
8ad36cab7c rbd-mirror: include local pool id in resync throttle unique key
Fixes: http://tracker.ceph.com/issues/16536
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-07-12 00:11:22 -04:00
Casey Bodley
77143c6511 Merge pull request #10252 from jdurgin/wip-rgw-build
rgw: fix compilation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-11 23:27:48 -04:00
Josh Durgin
874de58024 rgw: fix compilation
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-07-11 17:38:43 -07:00
Casey Bodley
aa28d8175d Merge pull request #10205 from oritwas/wip-rgw-fix-upgrade
rgw: add missing master_zone when running with old default region config

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-07-11 16:44:32 -04:00