John Wilkins
ead619505a
Merge pull request #2256 from ceph/wip-9005
...
doc: add calamari to the api/index section.
Reviewed-by: John Wilkins <jowilkin@redhat.com>
2014-09-09 12:36:55 -07:00
Sage Weil
18176b7ad1
Merge pull request #2436 from athanatos/wip-9293
...
PG::init: clear rollback info for backfill as well
2014-09-09 12:11:48 -07:00
Sage Weil
8d9da05a4c
Merge pull request #2435 from athanatos/wip-9179
...
PG: wait until we've build the missing set to discover_all_missing
Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-09 12:10:12 -07:00
Sage Weil
f00ff5f352
Merge pull request #2430 from yuyuyu101/kvstore-scrub-inconsistence
...
Kvstore scrub inconsistence
Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-09 11:19:39 -07:00
Sage Weil
245a62c85d
Merge pull request #2429 from yuyuyu101/kvstore-fix-superblock
...
KeyValueStore: Fix upgrade from non-exist superblock OSD version error
Reviewed-by: Sage Weil <sage@redhat.com>
2014-09-09 11:17:56 -07:00
Sage Weil
0cd989a7f1
Merge pull request #2428 from ceph/wip-yasm
...
fix yasm checks for x32
Reviewed-by: Daniel Schepler <dschepler@gmail.com>
2014-09-09 10:23:49 -07:00
Loic Dachary
df666549c5
Merge pull request #2305 from majianpeng/fix5
...
Make ceph_erasure_code_benchmark more robust.
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-09-09 13:54:49 +02:00
Ma Jianpeng
c5bafae6fd
erasure-code: Avoid k/m that we set are not equal in erasure-plugin.
...
Because erasure-plugin has default k/m and can autotune if k or m
invalid. Check k/m they are the same as we want.
Signed-off-by: Ma Jianpeng <jianpeng.ma@intel.com>
2014-09-09 18:15:53 +08:00
Haomai Wang
9606232bb9
KeyValueStore: Fix scrub causing inconsistence state
...
Fix #8589
Backport #Firefly
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-09-09 17:54:14 +08:00
Haomai Wang
ae05edda7c
ObjectStore Test: Add test for simulating scrub behavior
...
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-09-09 17:48:32 +08:00
Haomai Wang
c664179197
KeyValueStore: Fix upgrade from non-exist superblock OSD version error
...
If user upgrade OSD from Firefly or lower than 0.84, it won't get valid
keyvaluestore backend.
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2014-09-09 16:27:51 +08:00
Loic Dachary
cb41c54931
Merge pull request #2378 from swamireddy/wip-orgnaizationmap
...
mailmap updates
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-09-09 08:58:48 +02:00
Swami Reddy
6681008b7d
mailmap: M Ranga Swami Reddy affiliation
...
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2014-09-09 12:05:21 +05:30
Swami Reddy
448342ec75
mailmap: John Spray name normalization
...
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
Reviewed-by: John Spray <jspray@redhat.com>
2014-09-09 11:42:39 +05:30
Swami Reddy
2f2c37ffa8
mailmap: Marco Garcês affiliation
...
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
Reviewed-by: Marco Garcês <marco@garces.cc>
2014-09-09 11:42:38 +05:30
Swami Reddy
02049987c6
mailmap: Erik Logtenberg affiliation
...
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
Reviewed-by: Erik Logtenberg <erik@logtenberg.eu>
2014-09-09 11:42:28 +05:30
Swami Reddy
284fb49d1a
mailmap: François Lafont affiliation
...
Signed-off-by: M Ranga Swami Reddy <swamireddy@gmail.com>
2014-09-09 11:30:43 +05:30
Josh Durgin
8d3f13540b
Merge pull request #2422 from ceph/wip-6494
...
Enforce cache size on read requests
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-09-08 17:48:45 -07:00
Sage Weil
63075361fd
configure: do not try yasm on x32
...
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-08 15:51:58 -07:00
John Wilkins
d5777c4215
doc: Fixed broken links and clarified terms for new authentication docs.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-09-08 14:04:33 -07:00
John Wilkins
e2de11a844
doc: Minor cleanup.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-09-08 13:24:52 -07:00
Sage Weil
06e69be0c1
Merge pull request #2424 from ceph/wip-9366
...
lttng: Fix 'make tag' when configured --without-lttng
2014-09-08 13:13:36 -07:00
Thorsten Glaser
9ab46dc5b4
debian: only B-R yasm on amd64
...
Make yasm dependency amd64 only, it isn?t used elsewhere
but breaks x32 (which is mis-detected as amd64)
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-08 12:49:58 -07:00
Josh Durgin
aa041f885c
Merge pull request #2390 from ceph/wip-9311
...
Parallelize RBD import/export
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-09-08 12:47:42 -07:00
Josh Durgin
0e8237203e
Merge pull request #2426 from ceph/wip-doc-qemu
...
doc: Added more robust usage example for uid and conf for QEMU.
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-09-08 12:22:29 -07:00
Sage Weil
c050afdbe0
Merge remote-tracking branch 'gh/next'
2014-09-08 12:19:45 -07:00
Sage Weil
836a6701d6
doc/release-notes: v0.85
...
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-08 12:19:34 -07:00
John Wilkins
591a179540
doc: Added more robust usage example for uid and conf for QEMU.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-09-08 11:58:09 -07:00
John Wilkins
b178e974e0
doc: Clean up syntax to suppress warnings.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-09-08 11:26:37 -07:00
John Wilkins
4ad1106eda
doc: Clean up syntax.
...
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-09-08 11:24:28 -07:00
Sage Weil
312d7401ea
Merge pull request #2421 from ceph/wip-paxos-dout
...
mon/Paxos: don't spam log with is_readable at dout level 1
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-09-08 10:06:09 -07:00
Adam Crume
7531b280e1
lttng: Fix 'make tag' when configured --without-lttng
...
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-09-08 09:16:51 -07:00
Sage Weil
1c346017e9
mon/Paxos: make is_readable debug output show result
...
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-08 08:39:50 -07:00
Sage Weil
62ca27d0b1
mon/Paxos: don't spam log with is_readable at dout level 1
...
Backport: firefly, dumpling
Reported-by: Aanchal Agrawal <Aanchal.Agrawal@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-08 08:34:36 -07:00
Jenkins
a0c22842db
0.85
2014-09-08 06:31:31 -07:00
John Spray
27340b1d20
Merge pull request #2395 from ceph/wip-9282
...
mds: warn clients which aren't revoking caps
2014-09-08 12:43:12 +01:00
John Spray
d27ac4411c
Merge pull request #2391 from ceph/wip-mds-lock
...
Wip mds lock
Reviewed-by: John Spray <john.spray@redhat.com>
2014-09-08 12:18:34 +01:00
John Spray
5561d7ebea
Merge pull request #2404 from ceph/wip-9358
...
osdc/Journaler: fix try_read_entry()/wait_for_readable() locking
Reviewed-by: John Spray <john.spray@redhat.com>
2014-09-08 12:17:30 +01:00
Loic Dachary
1250c31e49
Merge pull request #2365 from infernix/centos5
...
Include types.h after stdint.h to accommodate for older distributions.
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-09-07 22:54:59 +02:00
Gerben Meijer
f0e0c31510
Include types.h after stdint.h to accomodate for older distributions. This fixes compilation on CentOS 5.
...
Signed-off-by: Gerben Meijer <infernix@gmail.com>
2014-09-07 22:50:39 +02:00
Loic Dachary
21e84d6728
Merge pull request #2415 from johnkeepmoving/fix-off-error-in-rbd.cc
...
correct error of repeatedly adding io_size to off in do_bench_write
Reviewed-by: Loic Dachary <loic-201408@dachary.org>
2014-09-07 09:22:08 +02:00
jiangheng
0fb3e52e16
correct error of repeatedly adding io_size to off in do_bench_write
...
Signed-off-by: jiangheng <jiangheng0511@gmail.com>
2014-09-07 14:48:03 +08:00
Jason Dillaman
4fc9fffc49
Enforce cache size on read requests
...
In-flight cache reads were not previously counted against
new cache read requests, which could result in very large
cache usage. This effect is most noticeable when writing
small chunks to a cloned image since each write requires
a full object read from the parent.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2014-09-06 23:04:50 -04:00
Loic Dachary
7d8fe2d994
Merge pull request #2396 from ceph/wip-SCA-20140902
...
SCA and Coverity fixes
Reviewed-by: Loic Dachary <loic@dachary.org>
2014-09-06 22:51:13 +02:00
Loic Dachary
fd8d1fcb11
Merge pull request #2398 from xiaoxichen/refactor_lrc_crush
...
Refactor ErasureCodeLrc::create_ruleset
Reviewed-by: Loic Dachary <loic@dachary.org>
2014-09-06 12:40:35 +02:00
Loic Dachary
98b18ed3f1
Merge pull request #2410 from dachary/wip-9368
...
erasure-code: init function is extern "C"
2014-09-06 03:01:48 +02:00
Loic Dachary
03aa113bcc
erasure-code: init function is extern "C"
...
Otherwise it is not found and the real cause obscured by the test
setup. The thread returns immediately and the timeout test sometime
fails.
http://tracker.ceph.com/issues/9368 Fixes : #9368
Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-09-06 02:55:15 +02:00
John Wilkins
484fb85765
doc: Update logging path to reflect log rotate script default path.
...
Fixes : #9351
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2014-09-05 14:17:47 -07:00
Josh Durgin
5a8826730e
Merge pull request #2407 from ceph/wip-formatter-va
...
formatter: clean up dump_format()
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2014-09-05 14:09:51 -07:00
Loic Dachary
fcf8059721
Merge pull request #2408 from theanalyst/doc/contributing
...
doc: Add a contributing file at the root of repo
Reviewed-by: Loic Dachary <loic@dachary.org>
2014-09-05 20:59:39 +02:00