RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-21 10:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,546 Commits 211 Branches 394 Tags 1.2 GiB
01b5085235
Commit Graph

40546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Durgin
01b5085235 Merge pull request #4235 from ceph/wip-rbd-unit-tests 
tests: exercise all RBD features during unit testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-03-31 12:36:18 -07:00
Josh Durgin
41b9cee96f Merge pull request #4232 from ceph/fix-make-conf 
Fix make conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-03-31 12:34:00 -07:00
Gregory Farnum
75c19140c9 Merge pull request #4236 from ceph/wip-verify-mds-journal-makefile 
mds: update Makefile for removed script

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-31 12:27:34 -07:00
John Spray
81df12990a mds: update Makefile for removed script 
Oversight in "mds: remove verify-mds-journal.sh script"

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-31 20:15:28 +01:00
Jason Dillaman
9859cae286 tests: exercise all RBD features during unit test 
The librbd unit tests currently only test the old image format. Ensure
the new format and its possible features are also tested.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2015-03-31 14:34:05 -04:00
Noah Watkins
c4c646ca5b make: fix with_rbd guard 
FileJournal needs stuff from blkdev.c in libcommon.

./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::_open_block_device()':
/home/nwatkins/src/ceph/src/os/FileJournal.cc:139: undefined reference to `get_block_device_size(int, long*)'
/home/nwatkins/src/ceph/src/os/FileJournal.cc:161: undefined reference to `block_device_support_discard(char const*)'
./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::do_discard(long, long)':
/home/nwatkins/src/ceph/src/os/FileJournal.cc:1587: undefined reference to `block_device_discard(int, long, long)'

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-03-31 10:46:10 -07:00
Noah Watkins
18edc50e95 make: add with_rbd guard 
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-03-31 10:43:49 -07:00
Gregory Farnum
aedb2ecbae Merge pull request #4231 from ceph/wip-rm-verify-mds 
mds: remove verify-mds-journal.sh script

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-31 10:08:53 -07:00
John Spray
7e49804a56 mds: remove verify-mds-journal.sh script 
This invokes the MDS in a way that it no longer understands,
and is unused.

Signed-off-by: John Spray <john.spray@redhat.com>
 2015-03-31 17:50:11 +01:00
Gregory Farnum
ba12448c80 Merge pull request #4211 from ceph/wip-11120 
osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size

Reviewed-by: John Spray <jspray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-31 09:26:04 -07:00
Kefu Chai
508ee9bb95 Merge pull request #4225 from Fale/patch-1 
doc: fix the architecture diagram in cephfs.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-04-01 00:05:51 +08:00
Fabio Alessandro Locati
d5d6468e88 doc: fix the architecture diagram in cephfs.rst 
Signed-off-by: Fabio Alessandro Locati <fabio@locati.cc>
 2015-03-31 18:00:45 +02:00
John Spray
9b171d23eb Merge pull request #4215 from ceph/wip-11258 
Wip 11258

Reviewed-by: John Spray <john.spray@redhat.com>
 2015-03-31 14:23:19 +01:00
Sage Weil
497737aabf Merge remote-tracking branch 'gh/hammer' 
Conflicts:
	src/gmock
	src/osd/ReplicatedPG.cc
 2015-03-30 15:41:13 -07:00
Sage Weil
c7de236d2f os/KeyValueDB: skip experimental check for test_init 
We don't want to spit out the warning twice, and we don't have cct
anyway.

Also test_init is annoying; we should try to kill it.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-30 15:14:15 -07:00
Sage Weil
2e908f1e87 Merge pull request #3878 from ceph/wip-dirty-pg-keys 
osd: coalesce into single omap_setkeys for normal writes

Tested-by: Andreas Bluemle <andreas.bluemle@itxperts.de>
Reviewed-by: David Zafman <dzafman@redhat.com>
 2015-03-30 11:18:56 -07:00
Loic Dachary
b28a42ce32 Merge pull request #4212 from zhouyuan/isal_2.13 
erasure-code: Update ISA-L to 2.13

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-30 20:17:38 +02:00
Sage Weil
a05871a185 Merge pull request #4160 from ceph/wip-rocksdb 
update rocksdb
 2015-03-30 10:57:07 -07:00
Sage Weil
a4c01f38f1 mark kinetic experimental 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-30 10:00:01 -07:00
Sage Weil
002b7fdadf mark rocksdb experimental 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-30 10:00:01 -07:00
Loic Dachary
6f4936ee96 Merge pull request #4131 from t-miyamae/wip-mshec-documentation-h2 
erasure code: add shec's documentation / change default layout

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-03-30 14:37:08 +02:00
Yan, Zheng
ccdeaf87df mds: fix out-of-order messages 
When MDS is no longer laggy, it should process deferred messages
first, then process newly received messages.

Fix: #11258
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-03-30 17:49:06 +08:00
Kefu Chai
f47a572424 Merge pull request #4183 from stiopaa1/OSDMonTrailingSpaces 
mon/OSDMonitor: remove trailing whitespaces

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-30 16:43:37 +08:00
Yuan Zhou
59aa6700fa erasure-code: Update ISA-L to 2.13 
ISA-L 2.13 brings better performance on Avoton (20%). There's no impact on Xeon
platform. The details are in the release notes.

There's a new API ec_encode_data_update() for incremental encoding
and decoding. The other highlevel API keeps the same as in 2.10

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
 2015-03-30 13:39:31 +08:00
Yan, Zheng
ad15f7d795 osdc/Striper.cc fix stripe_count == 1 && stripe_unit != object_size 
Fixes:11120
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-03-30 11:30:35 +08:00
Gregory Farnum
493eff569e Merge pull request #4209 from ceph/wip-java 
fix rhel linking error

Backport: giant, firefly, dumpling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-28 11:02:52 -07:00
Noah Watkins
aed3434dc7 java: libcephfs_jni.so is in /usr/lib64 on rhel 
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-03-27 19:34:12 -07:00
Noah Watkins
f5a95dc700 java: dump extra info for ftruncate assertion 
Nightly ran and encountered a situation in which fstat following
ftruncate reported a size not equal to the truncated size.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
 2015-03-27 19:09:15 -07:00
Gregory Farnum
71a0c793ab Merge pull request #4203 from Vicente-Cheng/fixed-get-mdsmap-assertion 
mds: fixed the ceph get mdsmap assertion.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-27 11:35:30 -07:00
Gregory Farnum
c50f5b1e26 Merge pull request #4173 from ceph/wip-mds-kill-session 
Wip mds kill session

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
 2015-03-27 11:29:19 -07:00
Gregory Farnum
7721b224c4 Merge pull request #4168 from ceph/wip-11226-dir-fx 
RFC client: Hold on to exclusive caps on directories we "own"

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-27 11:28:31 -07:00
Gregory Farnum
0e4a75b2e3 Merge pull request #4177 from ceph/wip-11226-extra 
Wip 11226 extra

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-27 11:27:58 -07:00
Gregory Farnum
413da564d4 Merge pull request #4189 from ceph/wip-11236 
test_libcephfs: do cleanup in ReleaseMounted test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-27 11:26:21 -07:00
Gregory Farnum
bd1d11f6eb Merge pull request #4192 from ceph/wip-11218 
#11218: Multi-MDS fixes for 'damaged' ranks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2015-03-27 11:24:50 -07:00
Josh Durgin
015c643735 Merge pull request #4199 from ceph/wip-11250 
cls_rbd: fix read past end of bufferlist c_str() in debug log msg

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-03-27 08:51:19 -07:00
Sage Weil
59143d141c Merge pull request #4194 from athanatos/wip-11199 
ReplicatedPG: trim backfill intervals based on peer's last_backfill_star...

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-27 08:15:29 -07:00
Sage Weil
efb66b9120 Merge pull request #4195 from athanatos/wip-11197 
PG: set/clear CREATING in Primary state entry/exit

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-27 08:10:20 -07:00
John Spray
f3f37a3293 Merge pull request #4200 from ceph/wip-mds-remove-inode 
mds: properly remove inode after purging stray

Reviewed-by: John Spray <john.spray@redhat.com>
 2015-03-27 11:33:07 +00:00
Vicente Cheng
f4398d2e6c Fixed the ceph get mdsmap assertion. 
When we want to get mdsmap, we try to get_version()
    and the return value err = 0 means success.

    The assert verified r == 0. r would not change in this flow.
    It always meet assert and lead mon failure.

    I think this verify should be:
        assert(err == 0)
    It will help to check return value of get_version().

If you have any questions, feel free to let me know.
Thanks!

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
 2015-03-27 18:49:28 +08:00
Kefu Chai
d3029fe72a Merge pull request #4193 from larkly/patch-docerror-erasure 
doc: Incomplete example in erasure-coded-pool.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-27 18:31:16 +08:00
Yan, Zheng
d789f44074 mds: properly remove inode after purging stray 
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2015-03-27 15:10:53 +08:00
Sage Weil
ea32960f58 cls_rbd: fix read past end of bufferlist c_str() in debug log msg 
Fixes: #11250
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-26 21:00:00 -07:00
Kefu Chai
3489fbdc92 Merge pull request #4196 from athanatos/wip-move-code 
osd: Wip move code

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-03-27 10:24:22 +08:00
Sage Weil
877d5d8820 Merge pull request #4171 from majianpeng/cleanup 
common: print hexadecimal for ghobject_t.generation.

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-03-26 17:45:20 -07:00
Bosse Klykken
d6acc6a581 Doc: Incomplete example in erasure-coded-pool.rst 
Signed-off-by: Bosse Klykken <larkly@gmail.com>
 2015-03-26 21:31:16 +01:00
Sage Weil
90c38b5b97 rocksdb: fix 32-bit build 
Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-26 11:04:18 -07:00
Sage Weil
ddad2d4465 Makefile-rocksdb.am: update for latest rocks 
Lots of files changed here; rebuilt the list from scratch.

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-03-26 11:01:35 -07:00
Samuel Just
c176ebf791 osd/: Move ReplicatedBackend methods into ReplicatedBackend.cc 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-03-26 10:50:19 -07:00
Samuel Just
e9d6096f25 ReplicatedPG: remove unused C_OnPushCommit 
Signed-off-by: Samuel Just <sjust@redhat.com>
 2015-03-26 10:44:00 -07:00
Josh Durgin
887354099e Merge pull request #4113 from wonzhq/rbd-fix 
rbd: misc fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-03-26 10:06:37 -07:00