]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agodoc: peering.rst, fix typo 10131/head
Brad Hubbard [Tue, 5 Jul 2016 04:51:33 +0000 (14:51 +1000)]
doc: peering.rst, fix typo

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
9 years agoMerge pull request #9933 from chhabaramesh/master
Kefu Chai [Thu, 14 Jul 2016 06:13:08 +0000 (14:13 +0800)]
Merge pull request #9933 from chhabaramesh/master

kv: In memory keyvalue db implementation

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #10286 from ceph/wip_leftover_with_mds
Ali Maredia [Wed, 13 Jul 2016 18:44:28 +0000 (14:44 -0400)]
Merge pull request #10286 from ceph/wip_leftover_with_mds

Removes remaining reference to WITH_MDS

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoNot all references to WITH_MDS were removed (see PR #10186). This 10286/head
J. Eric Ivancich [Wed, 13 Jul 2016 18:36:37 +0000 (14:36 -0400)]
Not all references to WITH_MDS were removed (see PR #10186). This
removes the final one (dependency of vstart on ceph-mds).

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
9 years agoMerge pull request #10120 from oritwas/bz16412
Yehuda Sadeh [Wed, 13 Jul 2016 17:56:13 +0000 (10:56 -0700)]
Merge pull request #10120 from oritwas/bz16412

rgw: remove bucket index objects when deleting the bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10161 from ceph/wip-dang-cmake
Kefu Chai [Wed, 13 Jul 2016 16:52:17 +0000 (00:52 +0800)]
Merge pull request #10161 from ceph/wip-dang-cmake

CMake - stop pip checking for updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10170 from ceph/wip-pg-log-errors-11
Samuel Just [Wed, 13 Jul 2016 16:46:16 +0000 (09:46 -0700)]
Merge pull request #10170 from ceph/wip-pg-log-errors-11

include write error codes in the pg log

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge branch 'googletest'
Josh Durgin [Wed, 13 Jul 2016 15:06:29 +0000 (08:06 -0700)]
Merge branch 'googletest'

Update Ceph to use Google Test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #10282 from ceph/wip-cmake-cxx-flags
Casey Bodley [Wed, 13 Jul 2016 13:56:05 +0000 (09:56 -0400)]
Merge pull request #10282 from ceph/wip-cmake-cxx-flags

cmake: fix the FTBFS introduced by dc8b3ba

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocmake: fix the FTBFS introduced by dc8b3ba 10282/head
Kefu Chai [Wed, 13 Jul 2016 13:44:50 +0000 (21:44 +0800)]
cmake: fix the FTBFS introduced by dc8b3ba

the flags are not list

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10279 from ceph/wip-cmake
Kefu Chai [Wed, 13 Jul 2016 13:31:27 +0000 (21:31 +0800)]
Merge pull request #10279 from ceph/wip-cmake

cmake changes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9784 from ceph/wip-ms-async-fixes
Haomai Wang [Wed, 13 Jul 2016 13:28:53 +0000 (21:28 +0800)]
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>
9 years agoMerge pull request #10276 from tchaikov/wip-doc-drop-i386
Kefu Chai [Wed, 13 Jul 2016 12:15:16 +0000 (20:15 +0800)]
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>
9 years agoMerge pull request #10254 from dillaman/wip-16536
Mykola Golub [Wed, 13 Jul 2016 12:10:37 +0000 (15:10 +0300)]
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>
9 years agoMerge pull request #10245 from jcsp/wip-mds-cache-warn
John Spray [Wed, 13 Jul 2016 12:09:51 +0000 (13:09 +0100)]
Merge pull request #10245 from jcsp/wip-mds-cache-warn

mds: add health warning for oversized cache

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agocmake: use CMAKE_CXX_STANDARD for enabling C++11 10279/head
Kefu Chai [Wed, 13 Jul 2016 09:43:12 +0000 (17:43 +0800)]
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>
9 years agoMerge pull request #10191 from batrick/mds-minor
John Spray [Wed, 13 Jul 2016 11:41:01 +0000 (12:41 +0100)]
Merge pull request #10191 from batrick/mds-minor

mds: use reference to avoid copy

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10268 from batrick/i16664
John Spray [Wed, 13 Jul 2016 11:33:01 +0000 (12:33 +0100)]
Merge pull request #10268 from batrick/i16664

doc: fix standby replay config

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agocmake: do not check for availability of static_cast<> anymore
Kefu Chai [Wed, 13 Jul 2016 09:23:07 +0000 (17:23 +0800)]
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>
9 years agocmake: use CHECK_STRUCT_HAS_MEMBER for checking member variables in struct
Kefu Chai [Wed, 13 Jul 2016 09:13:12 +0000 (17:13 +0800)]
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>
9 years agokv: In memory keyvalue db implementation 9933/head
Ramesh Chander [Mon, 13 Jun 2016 08:22:14 +0000 (01:22 -0700)]
kv: In memory keyvalue db implementation

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agodoc: remove i386 from minimal hardware recommendations 10276/head
Kefu Chai [Wed, 13 Jul 2016 06:37:58 +0000 (14:37 +0800)]
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>
9 years agoMerge pull request #10102 from liewegas/wip-mon-nosnap
Kefu Chai [Wed, 13 Jul 2016 06:27:40 +0000 (14:27 +0800)]
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>
9 years agoMerge pull request #10275 from ceph/wip-cmake
Kefu Chai [Wed, 13 Jul 2016 06:13:26 +0000 (14:13 +0800)]
Merge pull request #10275 from ceph/wip-cmake

cmake: disable -fvar-tracking-assignments for ceph_dencoder.cc

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
9 years agocmake: disable -fvar-tracking-assignments for ceph_dencoder.cc 10275/head
Kefu Chai [Wed, 13 Jul 2016 04:58:31 +0000 (12:58 +0800)]
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>
9 years agoMerge pull request #10113 from stiopaa1/msg_asyncmess_moveC_handle_reap
Haomai Wang [Wed, 13 Jul 2016 03:14:22 +0000 (11:14 +0800)]
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>
9 years agoMerge pull request #10183 from stiopaa1/msg_asyncmess_addConstToSetAddrUnknowns
Haomai Wang [Wed, 13 Jul 2016 03:13:22 +0000 (11:13 +0800)]
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>
9 years agoMerge pull request #10141 from stiopaa1/msg_asyncmess_removeUnneededCast
Haomai Wang [Wed, 13 Jul 2016 03:12:28 +0000 (11:12 +0800)]
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>
9 years agoMerge pull request #10266 from tchaikov/wip-ceph-detect-init-py3
Kefu Chai [Wed, 13 Jul 2016 02:22:48 +0000 (10:22 +0800)]
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>
9 years agogoogletest: use ceph branch
Josh Durgin [Thu, 23 Jun 2016 00:54:33 +0000 (17:54 -0700)]
googletest: use ceph branch

Added the same functionality as the previous gtest/gmock branches -
.gitignore and not installing shared libs that we only want to
statically link to test programs.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoReplace gmock/gtest with googletest
Anirudha Bose [Sun, 15 May 2016 12:41:19 +0000 (18:11 +0530)]
Replace gmock/gtest with googletest

Google Mock has been absorbed into the Google Test project, and
is now available under the googletest repository.

Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
9 years agodoc: fix standby replay config 10268/head
Patrick Donnelly [Tue, 12 Jul 2016 19:43:23 +0000 (15:43 -0400)]
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>
9 years agoceph-detect-init: fix the py3 test 10266/head
Kefu Chai [Tue, 12 Jul 2016 16:47:49 +0000 (00:47 +0800)]
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>
9 years agotest: ceph-detect-init: fix the indent
Kefu Chai [Tue, 12 Jul 2016 17:02:14 +0000 (01:02 +0800)]
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>
9 years agoMerge pull request #10090 from yuyuyu101/wip-remove-async-lock
Haomai Wang [Tue, 12 Jul 2016 16:26:16 +0000 (00:26 +0800)]
Merge pull request #10090 from yuyuyu101/wip-remove-async-lock

msg/async: remove file event lock

Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agoceph_test_msgr: clean previous sent queue infos 10090/head
Haomai Wang [Thu, 7 Jul 2016 11:12:46 +0000 (19:12 +0800)]
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>
9 years agoceph_test_msgr: use ceph log infrastructure to output
Haomai Wang [Thu, 7 Jul 2016 06:59:51 +0000 (14:59 +0800)]
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>
9 years agomsg/async/AsyncConnection: make sure no STATE_WAIT -> STATE_STANDBY
Haomai Wang [Thu, 7 Jul 2016 06:51:03 +0000 (14:51 +0800)]
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>
9 years agotest_msgr: add server_msgr cleanup
Haomai Wang [Tue, 5 Jul 2016 02:52:27 +0000 (10:52 +0800)]
test_msgr: add server_msgr cleanup

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async/AsyncConnection: add REPLACING write status to indicate replacing
Haomai Wang [Mon, 4 Jul 2016 04:06:34 +0000 (12:06 +0800)]
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>
9 years agomsg/async: hold lock avoid state changing
Haomai Wang [Sun, 3 Jul 2016 15:11:35 +0000 (23:11 +0800)]
msg/async: hold lock avoid state changing

Fixes: http://tracker.ceph.com/issues/16554
Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agotest_async_driver: accept new api changes
Haomai Wang [Sun, 3 Jul 2016 14:02:25 +0000 (22:02 +0800)]
test_async_driver: accept new api changes

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: dont delete time event when exchange eventcenter
Haomai Wang [Sat, 2 Jul 2016 06:04:23 +0000 (14:04 +0800)]
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>
9 years agomsg/async/AsyncConnection: simplify shutdown socket flow
Haomai Wang [Fri, 1 Jul 2016 15:44:46 +0000 (23:44 +0800)]
msg/async/AsyncConnection: simplify shutdown socket flow

Let cleanup resources things all in shutdown_socket

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomsg/async: add assert to ensure create/delete file event within thread
Haomai Wang [Wed, 29 Jun 2016 06:09:00 +0000 (14:09 +0800)]
msg/async: add assert to ensure create/delete file event within thread

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoEvent: remove file_lock
Haomai Wang [Tue, 8 Mar 2016 03:29:51 +0000 (11:29 +0800)]
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>
9 years agomsg/async/AsyncMessenger: make sure all connection cleanup handler finished
Haomai Wang [Thu, 30 Jun 2016 08:43:51 +0000 (16:43 +0800)]
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>
9 years agomsg/async: remove close socket line
Haomai Wang [Wed, 29 Jun 2016 09:22:20 +0000 (17:22 +0800)]
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>
9 years agomsg/async: make sure worker started before let msgr ready
Haomai Wang [Wed, 29 Jun 2016 09:14:16 +0000 (17:14 +0800)]
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>
9 years agomsg/async: make EventCenter notify file event creating when set_owner
Haomai Wang [Wed, 29 Jun 2016 08:54:16 +0000 (16:54 +0800)]
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>
9 years agomsg/async/AsyncConnection: swap eventcenter when replacing
Haomai Wang [Wed, 29 Jun 2016 08:26:29 +0000 (16:26 +0800)]
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>
9 years agoMerge pull request #10153 from tchaikov/wip-no-copy-plugins
Kefu Chai [Tue, 12 Jul 2016 15:43:24 +0000 (23:43 +0800)]
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>
9 years agomsg/async/Event: fix delete_time_event leak
Haomai Wang [Tue, 12 Jul 2016 15:37:43 +0000 (23:37 +0800)]
msg/async/Event: fix delete_time_event leak

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoAsyncMessenger: make create/delete_file_event within event thread
Haomai Wang [Tue, 8 Mar 2016 05:59:50 +0000 (13:59 +0800)]
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>
9 years agoMerge pull request #10174 from theanalyst/test/rgw/multisite-cleanup
Casey Bodley [Tue, 12 Jul 2016 14:12:16 +0000 (10:12 -0400)]
Merge pull request #10174 from theanalyst/test/rgw/multisite-cleanup

rgw: test_multi.py avoid creating mds

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10211 from oritwas/wip-rgw-fix-zone-modify
Casey Bodley [Tue, 12 Jul 2016 14:10:56 +0000 (10:10 -0400)]
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>
9 years agoMerge pull request #10256 from ceph/wip-kill-ceph_test_rados_api_tmap_migrate
John Spray [Tue, 12 Jul 2016 10:10:59 +0000 (11:10 +0100)]
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>
9 years agoMerge pull request #10229 from badone/wip-libgmock_main.la-build-failures
Kefu Chai [Tue, 12 Jul 2016 08:25:37 +0000 (16:25 +0800)]
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>
9 years agotest: remove ceph_test_rados_api_tmap_migrate 10256/head
Kefu Chai [Tue, 12 Jul 2016 07:07:48 +0000 (15:07 +0800)]
test: remove ceph_test_rados_api_tmap_migrate

see also: http://tracker.ceph.com/issues/16144

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorbd-mirror: include local pool id in resync throttle unique key 10254/head
Jason Dillaman [Tue, 12 Jul 2016 01:58:45 +0000 (21:58 -0400)]
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>
9 years agoMerge pull request #10252 from jdurgin/wip-rgw-build
Casey Bodley [Tue, 12 Jul 2016 03:27:48 +0000 (23:27 -0400)]
Merge pull request #10252 from jdurgin/wip-rgw-build

rgw: fix compilation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: fix compilation 10252/head
Josh Durgin [Tue, 12 Jul 2016 00:38:43 +0000 (17:38 -0700)]
rgw: fix compilation

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #10205 from oritwas/wip-rgw-fix-upgrade
Casey Bodley [Mon, 11 Jul 2016 20:44:32 +0000 (16:44 -0400)]
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>
9 years agoMerge pull request #10040 from xiexingguo/xxg-wip-bit-alloc-tree-configurable
Sage Weil [Mon, 11 Jul 2016 20:18:45 +0000 (15:18 -0500)]
Merge pull request #10040 from xiexingguo/xxg-wip-bit-alloc-tree-configurable

os/bluestore: make zone/span size of bitmap-allocator configurable

Reviewed-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #10075 from cbodley/wip-rgw-tenant-sync
Matt Benjamin [Mon, 11 Jul 2016 19:24:22 +0000 (15:24 -0400)]
Merge pull request #10075 from cbodley/wip-rgw-tenant-sync

rgw: add tenant support to multisite sync

9 years agoMerge pull request #8964 from songbaisen/song24
Sage Weil [Mon, 11 Jul 2016 19:07:14 +0000 (14:07 -0500)]
Merge pull request #8964 from songbaisen/song24

global: log which process/command sent a signal

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10195 from stiopaa1/msg_asyncmess_removeIncFile
Sage Weil [Mon, 11 Jul 2016 17:29:46 +0000 (12:29 -0500)]
Merge pull request #10195 from stiopaa1/msg_asyncmess_removeIncFile

msg/AsyncMessenger: remove unneeded include file

9 years agoMerge pull request #10224 from stiopaa1/msg_asyncmess_event_addConst
Sage Weil [Mon, 11 Jul 2016 17:19:08 +0000 (12:19 -0500)]
Merge pull request #10224 from stiopaa1/msg_asyncmess_event_addConst

msg/async/Event.h: add const to member function

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10230 from stiopaa1/msg_asyncmess_Processor_accept_changeToVoid
Sage Weil [Mon, 11 Jul 2016 17:17:42 +0000 (12:17 -0500)]
Merge pull request #10230 from stiopaa1/msg_asyncmess_Processor_accept_changeToVoid

msg/AsyncMessenger: change return type to void

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #10152 from tchaikov/wip-16277
Kefu Chai [Mon, 11 Jul 2016 16:17:03 +0000 (00:17 +0800)]
Merge pull request #10152 from tchaikov/wip-16277

osd: increment stats on recovery pull also

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10222 from ceph/wip-cmake
Matt Benjamin [Mon, 11 Jul 2016 15:57:53 +0000 (11:57 -0400)]
Merge pull request #10222 from ceph/wip-cmake

cmake changes for pypi

verfied f23

9 years agoEvent: no need to delete_file_Event when deconstruct
Haomai Wang [Tue, 8 Mar 2016 07:51:02 +0000 (15:51 +0800)]
Event: no need to delete_file_Event when deconstruct

Since we are going to close all epoll and cleanup resources, no need to delete
notify fd resource. And another reason is "delete_file_event" doesn't expect
other threads to call

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoasync: change set_socket_option caller
Haomai Wang [Sun, 3 Jan 2016 09:54:36 +0000 (17:54 +0800)]
async: change set_socket_option caller

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agonet_handler: adjust set_socket_options to avoid read from conf
Haomai Wang [Thu, 31 Dec 2015 15:46:17 +0000 (23:46 +0800)]
net_handler: adjust set_socket_options to avoid read from conf

We don't want net_handler rely on config value, caller may expect to pass
different value to set_socket_options according to different socket type
like heartbeat, client socket or server socket.

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agocmake: fix the detection of curl_multi_wait() 10222/head
Kefu Chai [Mon, 11 Jul 2016 13:29:09 +0000 (21:29 +0800)]
cmake: fix the detection of curl_multi_wait()

it was broken by b5bb77d5

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomds: add health warning for oversized cache 10245/head
John Spray [Thu, 7 Jul 2016 13:00:58 +0000 (14:00 +0100)]
mds: add health warning for oversized cache

Various issues can lead to an oversized cache, which
is a precursor to an OOM condition: let's give users
a clearer message with some useful counts that might
hint at what is wrong.

Fixes: http://tracker.ceph.com/issues/16570
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agopybind/rados: remove rados.c from MANIFEST.in
Kefu Chai [Sat, 9 Jul 2016 05:40:19 +0000 (13:40 +0800)]
pybind/rados: remove rados.c from MANIFEST.in

this fixes the warning of

```
running egg_info
creating
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info
writing
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/PKG-INFO
writing top-level names to
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/top_level.txt
writing dependency_links to
/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/dependency_links.txt
writing manifest file
'/srv/autobuild-ceph/gitbuilder.git/build/build/src/pybind/rados/rados.egg-info/SOURCES.txt'
warning: no files found matching 'rados.c'
```

in the out-of-source tree build, rados.c is not located in the same
directory of setup.py, rados.pyx, and rados.pyd. it is in the build_dir,
for example, it could be:

  ceph/build/src/pybind/rados/pyrex/rados.c

where ceph/build is the build directory of cmake.
and sdist will include it when running egg_info, because cython's
build_ext module lists `rados.c` as one of the "source_files".

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: pass necessary cflags to build_ext
Kefu Chai [Sat, 9 Jul 2016 15:36:14 +0000 (23:36 +0800)]
cmake: pass necessary cflags to build_ext

this fixes:
```
creating
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados
creating
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados/pyrex
/usr/bin/gcc-6 -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes
-fno-strict-aliasing -iquote /var/ceph/ceph/src/include -fPIC
-I/usr/include/python2.7 -I/usr/include/x86_64-linux-
gnu/python2.7 -I/usr/include/python2.7 -c
/home/kefu/ceph/build/src/pybind/rados/pyrex/rados.c -o
/home/kefu/ceph/build/src/pybind/rados/var/ceph/ceph/build/src/pybind/rados/pyrex/ra
dos.o -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g
-fstack-protector-strong -Wformat -Werror=format-security -DNDEBUG -g
-fwrapv -O2 -Wall -Wstrict-prototypes -lpython2.
7 -lpthread -ldl -lutil -lm -Xlinker -export-dynamic -Wl,-O1
-Wl,-Bsymbolic-functions
/home/kefu/ceph/build/src/pybind/rados/pyrex/rados.c:239:28: fatal error:
rados/librados.h: No such file or directory
 #include "rados/librados.h"
                            ^
compilation terminated.
```

seems we can not pass the CFLAGS with space in it to setup.py using env variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: put cythonized .c files into ${CMAKE_CURRENT_BINARY_DIR}
Kefu Chai [Sat, 9 Jul 2016 04:58:33 +0000 (12:58 +0800)]
cmake: put cythonized .c files into ${CMAKE_CURRENT_BINARY_DIR}

it was put into the directory where .pyx is located. it's not expected
in an out-of-tree build.
* {rados,rbd,cephfs}/setup.py: use build_ext from cython if possible, fallback to
  the one from setuptools or distutils
* Distutils.cmake: pass --cython-c-in-temp --build-temp and
  --cython-include-dirs to "build_ext" command

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9138 from cxwshawn/wip-cl-fix
Kefu Chai [Mon, 11 Jul 2016 05:36:42 +0000 (13:36 +0800)]
Merge pull request #9138 from cxwshawn/wip-cl-fix

osd: replace ceph:atomic_t with std::atomic in osd module.

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9871 from odivlad/fix-init-el7-master
Kefu Chai [Mon, 11 Jul 2016 05:22:05 +0000 (13:22 +0800)]
Merge pull request #9871 from odivlad/fix-init-el7-master

master: remove SYSTEMD_RUN from initscript

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8317 from dreamhost/gentoo-python
Kefu Chai [Mon, 11 Jul 2016 03:56:42 +0000 (11:56 +0800)]
Merge pull request #8317 from dreamhost/gentoo-python

Gentoo support for ceph-disk / ceph-detect-init; pip speedup

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9085 from renhwsky/renhw-wip-osdmonitor-updatepool
Kefu Chai [Mon, 11 Jul 2016 03:55:58 +0000 (11:55 +0800)]
Merge pull request #9085 from renhwsky/renhw-wip-osdmonitor-updatepool

osd/osdmonitor: pool of objects and bytes beyond quota should all be warn

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10234 from tchaikov/wip-drop-tmap_upgrade
Kefu Chai [Mon, 11 Jul 2016 03:55:01 +0000 (11:55 +0800)]
Merge pull request #10234 from tchaikov/wip-drop-tmap_upgrade

ceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #9117 from wjin/clean
Kefu Chai [Mon, 11 Jul 2016 03:54:15 +0000 (11:54 +0800)]
Merge pull request #9117 from wjin/clean

osd: remove duplicated function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9252 from vumrao/wip-vumrao-15983
Kefu Chai [Mon, 11 Jul 2016 03:51:36 +0000 (11:51 +0800)]
Merge pull request #9252 from vumrao/wip-vumrao-15983

mon: change osdmap flags set and unset messages

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9452 from mslovy/wip-preserve-alloc-hint
Kefu Chai [Mon, 11 Jul 2016 03:50:48 +0000 (11:50 +0800)]
Merge pull request #9452 from mslovy/wip-preserve-alloc-hint

osd:preserve allocation hint attribute during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #9698 from LiumxNL/fix-clones-flush-evict
Kefu Chai [Mon, 11 Jul 2016 03:49:27 +0000 (11:49 +0800)]
Merge pull request #9698 from LiumxNL/fix-clones-flush-evict

rados: add option to include clones when doing flush or evict

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #9703 from badone/wip-cryptoKey-encrypt-segfault
Kefu Chai [Mon, 11 Jul 2016 03:48:26 +0000 (11:48 +0800)]
Merge pull request #9703 from badone/wip-cryptoKey-encrypt-segfault

cephx: Fix multiple segfaults due to attempts to encrypt or decrypt

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9717 from songbaisen/a7
Kefu Chai [Mon, 11 Jul 2016 03:47:43 +0000 (11:47 +0800)]
Merge pull request #9717 from songbaisen/a7

mon: do not recalculate 'to_remove' when it's known

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9763 from dx9/wip-pthread-np
Kefu Chai [Mon, 11 Jul 2016 03:46:47 +0000 (11:46 +0800)]
Merge pull request #9763 from dx9/wip-pthread-np

compat: add abstractions for non portable pthread name funcs

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade 10234/head
Kefu Chai [Mon, 11 Jul 2016 03:29:05 +0000 (11:29 +0800)]
ceph_test_rados_api_tmap_migrate: remove test for tmap_upgrade

the tested feature was removed in ad6cc41

> tmap_upgrade was only for Jewel, so remove it for Kraken.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomsg/AsyncMessenger: change return type to void 10230/head
Michal Jarzabek [Sun, 10 Jul 2016 18:26:00 +0000 (19:26 +0100)]
msg/AsyncMessenger: change return type to void

Change the return type of function Processor::start to void. It
doesn't make sense to return constant value(zero).

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
9 years agoos/bluestore: add support for allocating 0-sized extent 10040/head
xie xingguo [Wed, 6 Jul 2016 07:13:38 +0000 (15:13 +0800)]
os/bluestore: add support for allocating 0-sized extent

For testing, we may choose randomized length of extent to allocate,
which means we could trim down the length to 0.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: fix allocation of discontiguous blocks
xie xingguo [Wed, 6 Jul 2016 06:30:21 +0000 (14:30 +0800)]
os/bluestore: fix allocation of discontiguous blocks

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: add sanity check for get_free() method
xie xingguo [Wed, 6 Jul 2016 03:43:35 +0000 (11:43 +0800)]
os/bluestore: add sanity check for get_free() method

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: simplify is_exhausted() method
xie xingguo [Wed, 6 Jul 2016 03:40:10 +0000 (11:40 +0800)]
os/bluestore: simplify is_exhausted() method

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/bluestore: make zone/span size of bitmap-allocator configurable
xie xingguo [Sun, 26 Jun 2016 04:07:53 +0000 (12:07 +0800)]
os/bluestore: make zone/span size of bitmap-allocator configurable

Perviously as zone_size_block and span_size are identical, so we could use
span_size only to simplify the calcuation.

Now that the zone_size_block and span_size are both configurable, so
it is necessary to treat them respectively.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10190 from ktdreyer/doc-delete-pool
Kefu Chai [Sun, 10 Jul 2016 11:57:07 +0000 (19:57 +0800)]
Merge pull request #10190 from ktdreyer/doc-delete-pool

doc: more details for pool deletion

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomakefile: change librgw_file_* as check_PROGRAMS 10229/head
Brad Hubbard [Sun, 10 Jul 2016 06:42:19 +0000 (16:42 +1000)]
makefile: change librgw_file_* as check_PROGRAMS

These targets depend on libgmock_main.la which is not built during
a default build.

Fixes: http://tracker.ceph.com/issues/16646
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>