Commit Graph

51390 Commits

Author SHA1 Message Date
Abhishek Lekshmanan
acea6efb5e rgw: fix zone delete message
Though this error message is hard to reach, it is still wrongly printed
as failed to create instead of failed to delete.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-03-21 17:04:55 +01:00
Sage Weil
19aabf4a30 Merge pull request #8016 from ErwanAliasr1/evelu-15042
rpm,deb: remove conditional BuildRequires for btrfs-progs

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-03-21 07:41:55 -04:00
Sage Weil
81f53dfb67 Merge pull request #8214 from athanatos/wip-feature-bits
Deprecate or free up a bunch of feature bits

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-21 07:35:27 -04:00
Jason Dillaman
22cac93ec7 Merge pull request #8162 from rjfd/wip-15142
rbd-mirror: use the mirroring directory to detect candidate images

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 18:12:28 -04:00
Jason Dillaman
bdab6d0293 Merge pull request #8204 from rjfd/wip-15143
librbd: enable/disable image mirroring automatically for pool mode

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 18:00:03 -04:00
Jason Dillaman
f65cc6fc31 Merge pull request #8172 from trociny/fix-test-rbd-mirror-position
test: rbd-mirror: compare positions using all fields

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 16:33:36 -04:00
Jason Dillaman
4a83b208d1 Merge pull request #8185 from trociny/wip-rbd-mirror-faster-exit
rbd-mirror: fix long termination due to 30sec wait in main loop

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 16:25:08 -04:00
Jason Dillaman
f938586451 Merge pull request #8221 from jdurgin/wip-test-rbd-mirror
qa: add workunit to run ceph_test_rbd_mirror

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-19 16:18:19 -04:00
Mykola Golub
bbac7669ba rbd-mirror: fix long termination due to 30sec wait in Mirror::run loop
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-03-19 15:43:58 +02:00
Sage Weil
5c5a50745f Merge pull request #8191 from liewegas/wip-15180
qa/workunits/rest/test.py: don't use newfs

Reviewed-by: John Spray <john.spray@redhat.com>
2016-03-19 09:13:23 -04:00
Sage Weil
a10b059537 Merge pull request #8101 from jjhuo/bluestore
os/bluestore: small fixes in bluestore StupidAllocator

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-19 09:13:02 -04:00
Sage Weil
57cd121e9e Merge pull request #8178 from majianpeng/bluefs-closewriter
os/bluestore/BlueFS: Before reap ioct, it should wait io complete

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-19 09:11:56 -04:00
Josh Durgin
802e6bb490 Merge pull request #8220 from dillaman/wip-15202
journal: prevent race injecting new records into overflowed object

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 17:46:42 -07:00
Josh Durgin
9f6ec704db qa: add workunit to run ceph_test_rbd_mirror
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 17:23:52 -07:00
Josh Durgin
a27f9bffb3 Merge pull request #8219 from jdurgin/wip-test-pool-create-cleanup
test_pool_create.sh: put test files in the test dir so they are cleaned up

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-18 16:32:17 -07:00
Jason Dillaman
9722dee145 journal: prevent race injecting new records into overflowed object
The recorded added after the overflow will not have been detached
from the object recorder.

Fixes: #15202

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 19:18:30 -04:00
Josh Durgin
1bb70b643d Merge pull request #8149 from trociny/test-rbd-mirror
test: rbd-mirror: add "switch to the next tag" test

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 16:14:36 -07:00
Josh Durgin
62771e4a92 Merge pull request #8182 from trociny/wip-rbd-mirror-args
rbd-mirror: make remote context respect env and argv config params

Conflicts:
	qa/workunits/rbd/rbd_mirror.sh (asok command format changed)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 15:03:33 -07:00
Josh Durgin
c6c4f6095a Merge pull request #8159 from trociny/wip-rbd-mirror-asok
rbd-mirror: use pool/image names in asok commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 14:58:58 -07:00
Josh Durgin
ebbfdc7a03 test_pool_create.sh: put test files in the test dir so they are cleaned up
If they aren't cleaned up, tarball gitbuilders are unhappy.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 14:29:38 -07:00
Josh Durgin
ae13d6ff55 Merge pull request #8216 from ceph/wip-rbd-maint-ops
qa/workunits/rbd: new online maintenance op tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-18 14:21:01 -07:00
Yehuda Sadeh
b4860ae892 Merge pull request #8183 from ceph/wip-rgw-fix-mdlog
Wip rgw fix mdlog

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-18 13:08:46 -07:00
Jason Dillaman
d9017fb95c qa/workunits/rbd: new online maintenance op tests
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 14:33:20 -04:00
Sage Weil
f0c19a2691 Merge pull request #8212 from yehudasa/wip-15181
cls/rgw: fix use of timespan

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-18 13:41:28 -04:00
Yehuda Sadeh
fab2144c95 cls/rgw: fix use of timespan
Need to use make_timespan() when referring to seconds.

Fixes: #15181

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-18 09:53:21 -07:00
Sage Weil
88f61daa93 Merge pull request #8209 from liewegas/wip-13992
ceph_test_rados_misc: shorten mount timeout

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-03-18 11:52:27 -04:00
Sage Weil
959ae39ebb ceph_test_rados_misc: shorten mount timeout
This might fix #13992.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 10:34:53 -04:00
Sage Weil
8b9ed00812 os/filestore: fix warning
os/filestore/FileStore.cc: In member function ‘int FileStore::_zero(const coll_t&, const ghobject_t&, uint64_t, size_t)’:
os/filestore/FileStore.cc:3294:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
       if (offset + len > st.st_size) {
                        ^

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 10:16:49 -04:00
Loic Dachary
cae8d3c89c Merge pull request #7932 from theanalyst/mailmap/10.0.4
mailmap for 10.0.4

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-18 15:14:02 +01:00
Sage Weil
811b8f5e3c qa/workunits/rest/test.py: don't use newfs
It doesn't work anymore.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-03-18 09:51:31 -04:00
Sage Weil
f6f9c00b33 Merge pull request #8121 from liewegas/wip-15136
mon: remove 'mds setmap'

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-03-18 09:44:05 -04:00
Ricardo Dias
a619468bdc rbd: rbd-mirroring: Added unit tests to test image mirroring behaviour
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
Ricardo Dias
6ebb4f36b2 rbd: rbd-mirroring: Fixed if clause in mirror_image_get_info
This fix targets the case when journaling is not enabled but
someone calls mirror_image_get_info.

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
Ricardo Dias
c472493659 rbd: rbd-mirroring: Disable image mirroring when journaling feature is disabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
Fixes: #15143
2016-03-18 10:45:13 +00:00
Ricardo Dias
ba6c0c9d4c rbd: rbd-mirroring: Enable image mirroring when journaling feature is enabled
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
Ricardo Dias
7385d4acde rbd: rbd-mirroring: Enable image mirroring upon create with journaling feature
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-03-18 10:45:13 +00:00
branto1
97b709c1b4 Merge pull request #8137 from ceph/wip-15146-ceph-dep
rpm: remove sub-package dependencies on "ceph"

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-03-18 10:10:35 +01:00
Sage Weil
2cf3f964a6 Merge pull request #7838 from rldleblanc/pg_prime-enable
mon: enable 'mon osd prime pg temp' by default

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:59:33 -04:00
Sage Weil
08cc711403 Merge pull request #7939 from yangdongsheng/remove_v1
mon: standardize Ceph removal commands

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:56:48 -04:00
Sage Weil
3ea63bbecf Merge pull request #7721 from xiexingguo/xxg-wip-fixdc
os/filestore: fix result handling logic of destroy_collection

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:55:11 -04:00
Sage Weil
ebf41cbafb Merge pull request #7754 from xiexingguo/xxg-wip-14845
osd: fix inaccurate counter and skip over queueing an empty transaction

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:54:32 -04:00
Sage Weil
be94eca1fb Merge pull request #7970 from Yan-waller/yj-wip-async
msg/async: _try_send trim already sent for outcoming_bl more efficient

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-03-17 21:53:38 -04:00
Sage Weil
053b15c256 Merge pull request #8127 from ceph/wip-15122
ceph_test_msgr: reduce test size to fix memory size

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:52:18 -04:00
Sage Weil
e50ba1140d Merge branch 'wip-13990' of git://github.com/tchaikov/ceph
Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 21:46:45 -04:00
Sage Weil
122e6d6be9 Merge pull request #8160 from yuyuyu101/jewel-spdk
os/bluestore/NVMEDevice: make IO thread using dpdk launch
2016-03-17 21:47:57 -04:00
Sage Weil
3c938d9577 Merge pull request #8163 from liewegas/wip-15151
osd/ReplicatedPG: clear watches on change after applying repops

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-03-17 21:47:28 -04:00
Sage Weil
df1e7f852e Merge pull request #7359 from songbaisen/song9
mon: consider pool size when creating pool

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 18:00:10 -04:00
Sage Weil
b0a90a82c5 Merge pull request #7674 from majianpeng/bluestore-sync-transaction
os/bluestore: make bluestore_sync_transaction = true can work.

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 17:59:47 -04:00
Sage Weil
fd61b503e9 Merge pull request #7860 from majianpeng/bluestores-clone-overlay
os/bluestore: clone overlay data

Reviewed-by: Sage Weil <sage@redhat.com>
2016-03-17 17:59:26 -04:00
Sage Weil
7504dc266a Merge pull request #7930 from ceph/wip-debian-librgw-tests
debian: package librgw_file* tests
2016-03-17 17:58:58 -04:00