Commit Graph

52439 Commits

Author SHA1 Message Date
Sage Weil
a7a4d3619c Merge pull request #7984 from rldleblanc/wpq-starvation
common: WeightedPriorityQueue Re-Add Round Robin for Classes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Karol Mroz <kmroz@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-15 17:16:21 -04:00
Sage Weil
af45e77606 Merge pull request #8505 from liewegas/wip-15391
osd/ReplicatedPG: make handle_watch_timeout no-op if !active

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-15 17:14:57 -04:00
Sage Weil
4848559819 Merge pull request #8545 from xiexingguo/xxg-wip-lfn
os/filestore: fix return type mismatch for lfn parse

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-04-15 17:14:39 -04:00
Sage Weil
38a1bd3a06 Merge pull request #8555 from avnerbh/fixes_no_3
msg/xio: simple fixes

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2016-04-15 17:14:22 -04:00
Sage Weil
1f75dee1b3 Merge pull request #8570 from xiexingguo/xxg-wip-scrub
osd: clear requeue_scrub_on_unblock flag after requeue scrub

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-15 17:11:51 -04:00
Sage Weil
0eab58014b Merge pull request #8586 from liewegas/wip-15441
osd: fix watch reconnect race

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
2016-04-15 17:08:49 -04:00
Casey Bodley
92b41fe9ed Merge pull request #8619 from yehudasa/wip-rgw-jewel-fixes
rgw: fix binfo_cache, RGWShardCollectCR
2016-04-15 16:56:48 -04:00
Yehuda Sadeh
17c4bcf5fd rgw: cross rgw request need to send 'zonegroup' http header
instead of 'region'.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-04-15 13:45:29 -07:00
Yehuda Sadeh
24b1968411 rgw: fix get_zonegroup()
was passing in the wrong param

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-04-15 13:45:29 -07:00
Casey Bodley
f10f52a466 Merge pull request #8281 from theanalyst/doc/multisite-rgw
doc: rgw adding a very basic multisite doc
2016-04-15 16:41:51 -04:00
Abhishek Lekshmanan
f78af6f38c doc: add multisite to index
Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>
2016-04-15 22:27:10 +02:00
Abhishek Lekshmanan
c2e4106bbf doc: rgw multisite documentation
Adding basic documentation for new multisite features, with an example
showing 3 zones in a zonegroup.

Fixes: http://tracker.ceph.com/issues/15247
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-04-15 22:25:55 +02:00
Yehuda Sadeh
eefcc67272 rgw: binfo_cache is now a RGWRados member
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-04-15 10:44:50 -07:00
Yehuda Sadeh
6f638a58d2 rgw: RGWShardCollectCR does not need a cct member
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-04-15 10:44:50 -07:00
Casey Bodley
69f8174e9c Merge pull request #7912 from ceph/wip-cmake-make-check
Wip cmake make check
2016-04-15 12:21:29 -04:00
Gregory Farnum
54ab1c5a23 Merge pull request #8614 from liewegas/wip-fsmap-underscore
mds/FSMap: use _ in key name

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-04-15 08:47:15 -07:00
Sage Weil
0cdf3bc875 debian: start ceph-mon-all and ceph-osd-all on package install
This matches ceph-mds-all and ceph-all behavior.

Fixes: http://tracker.ceph.com/issues/15098
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-15 11:46:56 -04:00
Loic Dachary
07c945b8cc Merge pull request #8615 from theanalyst/fix-mailmap-self
mailmap: Abhishek Lekshmanan affiliation

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-04-15 17:11:14 +02:00
Abhishek Lekshmanan
c4b7a25470 mailmap: Abhishek Lekshmanan affiliation
Adding an entry to normalize the personal email id and work email id
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-04-15 17:09:55 +02:00
Sage Weil
a8efd40349 mds/FSMap: use _ in key name
No space or else it isn't valid XML.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-15 09:37:48 -04:00
Loic Dachary
bba08546cd Merge pull request #8608 from swamireddy/contrib_list_10.1.2
mailmap update

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-04-15 15:36:23 +02:00
Sage Weil
8642b34904 osd: some debug output for old osdmap trimming
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-15 09:14:34 -04:00
Sage Weil
02f5885114 osd: add option to disable startup check
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-15 09:05:49 -04:00
Sage Weil
8c1a8a6376 osd: refuse to start if configure object limits don't work
Fail early if the configured max object name cannot be stored on
the (FileStore) backend.  This avoids rude surprises down the
line when some random rados op get ENAMETOOLONG.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-15 09:05:49 -04:00
Sage Weil
a13ae6f984 vstart.sh: --short to set ext4-friendly object name and namespace limits
So devs can work on ext4.  Note that this will also mean s3-tests
will fail under vstart.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-15 09:05:48 -04:00
xie xingguo
413b3e7e54 osd/ReplicatedPG: fix implementation of register_on_success()
We shall push the callbacks into on_success instead, I think.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-04-15 20:47:41 +08:00
Swami Reddy
f1cfcff713 mailmap: Jenkins name normalization
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2016-04-15 17:45:30 +05:30
Swami Reddy
b3991d0f28 mailmap: Abhishek Lekshmanan name normalization
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2016-04-15 17:45:30 +05:30
Swami Reddy
9cdba6c744 mailmap: Wei Qiaomiao affiliation
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2016-04-15 17:45:22 +05:30
Swami Reddy
a79a9dc9c8 mailmap: Luo Runbing affiliation
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2016-04-15 17:43:48 +05:30
Kefu Chai
28b91f25af cmake: link ceph_test_rados_api_list against libglobal
see 769c0aff

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-15 11:47:11 +08:00
Ali Maredia
8ddfcb1275 cmake: Add cython_modules to make check
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:22 -04:00
Ali Maredia
e0bda0b442 cmake: remove repeat OSD.cc
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:22 -04:00
Ali Maredia
56c37eae04 cmake: CMake environment variables added to automake
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
b4de745091 cmake: Building ceph-detect-init from source code
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
4fc06be28b cmake: Building ceph-disk from source code
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
a7b6c01e8c cmake: Add librgw_file tests
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
60e5fa973a cmake: Added rbd_mirror targets
Added rbd_mirror libraries, unit tests, executables

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
21ec89fa04 cmake: Added an absolute path for libs
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
9288e98092 cmake: test_pidfile.sh test passing
Replaced relative paths in test_pidfile.sh
with CEPH_VAR environment variables set in cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
de97f67a65 cmake: Protect againist getenv returning nullptr
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
cfcbe21b86 cmake: erasure-decode-non-regression.sh passing
Added missing dependencies and link libraries for
erasure-decode-non-regression.sh and added absolute
paths to ceph_erasure_code_non_regression.cc.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
fd978ce82b unittest_journal: got rid of relative paths
Replaced .libs in TestClassHandler.cc with CEPH_LIB

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
dd0ac999df unittest_blkdev: absolute path for cmake make check
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
49da534d23 cmake: test_objectstore_memstore.sh test passing
Replaced relative paths in test_objectstore_memstore.sh
with CEPH_VAR environment variables set in cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
1c8cd00360 cmake: erasure-code tests passing
Replaced relative paths in test-erausure-eio.sh
test-erasure-code.sh, and replaced .libs in
erasure_code unittests with CEPH_VAR environment
variables set in cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
65963739cd cmake: ceph_objectstore_tool.py test passing
Replaced relative paths in shell scripts in
test/ceph_objectstore_tool.py and init-ceph.in to
work with CEPH_FOO environment variables set in cmake.
Also added CEPH_BUILD_DIR environment variable set
to CMAKE_BINARY_DIR. It is used in init-ceph and
ceph_objectstore_tool.py.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
f43dd0f3f5 cmake: unittest_bufferlist passing in cmake
Replaced relative paths in unittest_bufferlist.sh
to work with CEPH_FOO environment variables set in
cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
cf24535ed7 cmake: cephtool-test-rados/mds/osd passing in cmake
Replaced relative paths in test/cephtool-test-mon.sh,
qa/workunits/cephtool/test.sh, and test/cephtool-test-mon.sh
to work with CEPH_FOO environment variables set in cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00
Ali Maredia
005e4b4314 cmake: working on cephtool-test-rados.sh test
Replaced relative paths in test/cephtool-test-rados.sh,
qa/workunits/rados/test_rados_tool.sh,
src/test/vstart_wrapper.sh, with CEPH_FOO environment
variables set in cmake. Also edited the CMake path
finding logic in vstart.sh with the CEPH_FOO variables.

NOTE: test is not passing yet, possibly due to the
filesystem. this commit is a work in progress

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-04-14 20:48:21 -04:00