RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-31 23:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,344 Commits 215 Branches 394 Tags 1.4 GiB
a27f9bffb3
Commit Graph

51344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Sage Weil
5b18de23b5 Merge remote-tracking branch 'gh/wip-strict-debian-deps' 2016-03-17 17:53:23 -04:00
Sage Weil
6741606ebb Merge pull request #7957 from majianpeng/bluestore-read 
os/filestore: require offset == length == 0 for full object read; add test

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
 2016-03-17 17:57:01 -04:00
Sage Weil
c021e1b142 Merge pull request #8039 from gregsfortytwo/wip-14962-greg 
osd/ReplicatedPG: be more careful about calling publish_stats_to_osd()

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-17 17:56:06 -04:00
Sage Weil
1302ad1af3 Merge pull request #8096 from liewegas/wip-15073 
osd: ensure new osdmaps commit before publishing them to pgs

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-17 17:55:31 -04:00
Orit Wasserman
425546a032 rgw: use current period id when it is empty for mdlog list and shard lock/unlock 
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2016-03-17 20:27:10 +01:00
Yehuda Sadeh
2c05ca35f2 Merge pull request #8167 from theanalyst/mstart/rgw_ports 
mstart: start rgw on different ports as well

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-17 11:06:37 -07:00
Sage Weil
4e3cf59eac osd: assert that we don't try to use an OSDMap > superblock.newest_map 
handle_osd_map now adds OSDMaps to the cache as it receives them
but before they are stable.  Ensure that we don't try to use them.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-17 12:58:54 -04:00
Sage Weil
b839a06c1a osd: commit osdmaps before exposing them to PGs 
handle_osd_map and the PGs use different sequencers when writing
their updates.  We therefore need to make sure new osdmaps are
committed to disk before we expose them to PGs, lest they update
their info to reference a new osdmap that hasn't actually
committed yet.

This doesn't happen with FileStore because transactions are
ordered when they are queued, but it does affect BlueStore.

Fix by splitting handle_osd_map into two phases, one that just
persists stuff, and the second half that publishes the new maps to
the rest of the OSD.

Fixes: #15073
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-17 12:58:54 -04:00
Yehuda Sadeh
fe515bf913 Merge pull request #8170 from yehudasa/wip-rgw-sync-fixes-3 
Wip rgw sync fixes 3

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2016-03-17 09:21:15 -07:00
Sage Weil
b0d9b0de15 mon: remove 'mds setmap' command 
This command has no discernable purpose, and is difficult and
dangerous to support anyway.

Fixes: #15136
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-17 10:40:24 -04:00
Mykola Golub
13c7ba4c67 test: rbd-mirror: different log and asok location for local/remote contexts 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-17 14:46:21 +02:00
Mykola Golub
21e127bc4c rbd-mirror: make remote context respect env and argv config params 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-17 13:24:53 +02:00
Kefu Chai
809df6e112 Merge pull request #8179 from zhjwpku/zhjwpku 
doc/architecture.rst: remove redundant word "across"

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-17 18:14:41 +08:00
Zhao Junwang
c399d3187e doc/architecture.rst: remove redundant word "across" 
Signed-off-by: Zhao Junwang <zhjwpku@gmail.com>
 2016-03-17 17:34:51 +08:00
Mykola Golub
3800e2ba63 rbd-mirror: command line options should override environment 
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-17 11:14:13 +02:00
Yehuda Sadeh
60429c38b9 rgw: take a reference to the cr in async cr workers 
and drop the cr when worker is done. The cr can be cleaned before
worker is done, so we should have it stick around as long as the
worker is alive.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-16 15:36:53 -07:00
Yehuda Sadeh
1f741716cc rgw: finalize reqs through a temporary set 
can't call _finish_request() on iter->second when iterating, it clobbers the
map.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-16 15:36:53 -07:00
Yehuda Sadeh
40832718fa rgw: update data_log only when completing the op 
It doesn't make sense to update it earlier, the zone that follows will not sync before
it sees the completion.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-16 15:36:53 -07:00
Josh Durgin
599d4eaaaf Merge pull request #8169 from ceph/wip-15041 
doc: initial draft of RBD mirroring admin documentation

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-16 15:04:56 -07:00
Jason Dillaman
9d2d090e5c doc: initial draft of RBD mirroring admin documentation 
Fixes: #15041

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-16 17:51:43 -04:00
Mykola Golub
e348a7e4e8 rbd-mirror: use pool/image names in asok commands 
Now the commands look similar to rbd cache asok commands.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-03-16 22:55:00 +02:00