RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-14 07:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,218 Commits 211 Branches 394 Tags 1.9 GiB
a614c3b9c1
Commit Graph

47218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ali Maredia
a614c3b9c1 cmake: Updated allocator checking 
Added a FindJeMalloc.cmake file, changed
allocator checking logic (tcmalloc is default),
replaced TCMALLOC_LIBS to ALLOC_LIBS, added
HAVE_LIB(ALLOCATOR) to config-h.in.cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
 2016-01-05 15:42:06 -05:00
Ali Maredia
b94f910cd1 cmake: kv dir and bluestore unittests 
Added CMakeLists.txt in src/kv, replaced
os_mon_objs with kv_objs, linked libkv to os,
added HAVE_LIBROCKSDB to config-h.in.cmake,
tweaked rocksdb unittest, added bluestore
unittests, made rocksdb build with
add_custom_target instead of custom_command.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
 2016-01-05 15:42:06 -05:00
Josh Durgin
0bdc26ea89 Merge remote-tracking branch 'origin/jewel' 2016-01-05 11:42:09 -08:00
Josh Durgin
d0f4d2d634 Merge pull request #7114 from dillaman/wip-14234-jewel 
librbd: reduce verbosity of common error condition logging

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-05 11:41:00 -08:00
Josh Durgin
eb680a3a6b Merge branch 'wip-14237-jewel' of git://github.com/dillaman/ceph into jewel 
qa/workunits/rbd: import_export should use clean temp space

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-05 11:39:12 -08:00
Josh Durgin
370718a616 Merge pull request #7113 from dillaman/wip-14168-jewel 
journal: disconnect watch after watch error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-05 10:30:26 -08:00
Jason Dillaman
089673a59c qa/workunits/rbd: import_export should use clean temp space 
Fixes: #14237
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-01-05 12:50:23 -05:00
Jason Dillaman
5b065aae75 librbd: reduce verbosity of common error condition logging 
Fixes: #14234
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-01-05 12:29:13 -05:00
Jason Dillaman
eb5e852046 Merge pull request #7046 from clever215/merge_diff_1224 
rbd: correct an output string for merge-diff

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-01-05 11:29:14 -05:00
Orit Wasserman
e53f837b66 Merge pull request #6975 from yehudasa/wip-rgw-content-length 
Wip rgw content length
 2016-01-05 11:13:38 +01:00
Jason Dillaman
a3ac03e5ae journal: disconnect watch after watch error 
Fixes: #14168
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-01-04 23:13:16 -05:00
Kongming
40a9c67f4e rbd: correct an output string for merge-diff 
This modification correct an output string for rbd merge-diff, in which mistakenly output variables of first diff header rather than second diff header.

Signed-off-by: Kongming Wu <wu.kongming@h3c.com>
 2016-01-05 10:12:50 +08:00
Josh Durgin
089e1a2baf Merge remote-tracking branch 'origin/jewel' 2016-01-04 17:59:52 -08:00
Kefu Chai
4d91de8d50 Merge pull request #6669 from dzafman/omap-small-bugs 
Omap small bugs adapted

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-01-05 09:40:46 +08:00
Yehuda Sadeh
7bcb744d6b Revert "rgw: use smart pointer for C_Reinitwatch" 
This commit introduced regressions, issues #14173, #14180.

The problem is that the context deletes itself after execution,
so using a shared_ptr to hold it is problematic, as we'll eventually
have a double free. Also, it doesn't solve the underlying leak issue.

This reverts commit e9daed221e.
 2016-01-04 12:54:33 -08:00
Josh Durgin
91f286dd0f Merge pull request #7101 from dillaman/wip-14221-jewel 
qa/workunits/rbd: rbd-nbd test should use sudo for map/unmap ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-01-04 15:46:47 -05:00
Sage Weil
d11b04b87c Merge pull request #7100 from dachary/wip-14220-make-check 
tests: configure with rocksdb by default

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-04 15:41:42 -05:00
David Zafman
5c999b1528 osd: Allow get_hash_info to use attrs map if available 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2016-01-04 11:19:50 -08:00
David Zafman
ca81563d8d osd: Add stat_error for regular scrub handling 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2016-01-04 11:16:48 -08:00
David Zafman
5924c3e7ff osd: Fix ScrubMap::object::decode version 
Signed-off-by: David Zafman <dzafman@redhat.com>
 2016-01-04 11:16:48 -08:00
Jianpeng Ma
771c869651 osd/ReplicatedPG: for copy_get get omap, firstly check ob whether has omap. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-01-04 11:16:48 -08:00
Jianpeng Ma
4a7f0075fe osd/PGBackend: Don't change error type from DEEP_ERROR to SHALLOW_ERROR. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-01-04 11:16:48 -08:00
Jianpeng Ma
2c2d5c707e osd/ReplicatedBackend: Don't forget reset_tp_timeout for first read. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-01-04 11:16:48 -08:00
Jianpeng Ma
5e114a479f osd/ReplicatedPG: For omapclear/omaprmkeys, no need call touch. 
The code already check object whether exist. So it don't need call
touch.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-01-04 11:16:48 -08:00
Jianpeng Ma
1f93b55d98 osd/ReplicatedPG: for omapclear/omaprmkeys no neet set FLAG_OMAP. 
When set omapheader/omapvals, it alreade set FLAG_OMAP. So for remove
don't set again.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-01-04 11:16:48 -08:00
Jianpeng Ma
ef263b3f41 osd/ReplicatedPG: It should call clear_omap_digest. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2016-01-04 11:16:48 -08:00
Orit Wasserman
72c0ed7930 Merge pull request #7063 from mathslinux/rgw-dont-abort-for-bad-argumentment 
rgw: do not abort radowgw server when using admin op API with bad parameters
 2016-01-04 19:43:13 +01:00
Orit Wasserman
531e87541b Merge pull request #7099 from jcsp/wip-cmake-bluestore 
Fix cmake build with bluestore
 2016-01-04 18:40:54 +01:00
Jason Dillaman
70a1392920 qa/workunits/rbd: rbd-nbd test should use sudo for map/unmap ops 
Fixes: #14221
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-01-04 12:03:45 -05:00
Loic Dachary
b24378ddf6 tests: configure with rocksdb by default 
Otherwise bluestore won't compile and run-make-check.sh will fail.

http://tracker.ceph.com/issues/14220 Fixes: #14220

Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 17:51:12 +01:00
John Spray
0fdf745920 cmake: build and link rocksdb etc for bluestore 
Signed-off-by: John Spray <john.spray@redhat.com>
 2016-01-04 16:30:39 +00:00
John Spray
63bfa0c929 cmake: add rocksdb include path for bluestore 
Signed-off-by: John Spray <john.spray@redhat.com>
 2016-01-04 16:30:39 +00:00
Joao Eduardo Luis
24c1abc496 Merge pull request #6854 from jecluis/wip-monmapmon 
mon: MonmapMonitor: don't expose uncommitted state to client

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-01-04 16:02:03 +00:00
Joao Eduardo Luis
43dfe855f5 mon: MonmapMonitor: don't expose uncommitted state to client 
During prepare_command(), we were returning to the user based on
pending_map's state. Even though this weren't causing any issues we are
aware of, we really shouldn't do that.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
 2016-01-04 15:19:35 +00:00
Loic Dachary
8e7730fabf Merge pull request #6760 from ddiss/bug13943_ceph_disk_validate_part_uuid 
ceph-disk: warn for prepare partitions with bad GUIDs

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-01-04 15:56:13 +01:00
Loic Dachary
eb94a58365 Merge pull request #6992 from dachary/wip-mailmap 
mailmap updates

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2016-01-04 15:35:14 +01:00
Loic Dachary
e9fcb6b75d mailmap: Chengyuan Li affiliation 
Reviewed-by: Chengyuan Li <chengyli@ebay.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:31:13 +01:00
Loic Dachary
024ac69f4c mailmap: Hervé Rousseau name normalization 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
c02811b4a7 mailmap: Chris Holcombe name normalization 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
25a3b081d6 mailmap: Jianhui Yuan affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
2797c66a34 mailmap: Joe Julian affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
c5f3d0341f mailmap: David Coles affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
96910532af mailmap: Vasu Kulkarni affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
ca42be2e6b mailmap: Tobias Suckow affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
b9e73bff7c mailmap: Rahul Aggarwal affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
b2f7fc61c4 mailmap: Brian Felton affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-01-04 15:29:55 +01:00
Loic Dachary
99c7d9a156 Merge pull request #7030 from ceph/wip-detect-bz2-lz4 
configure: detect bz2 and lz4

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-01-04 14:39:40 +01:00
Sage Weil
2533f876b1 Merge pull request #7016 from xiexingguo/xxg-wip-14151 
osd: fix sparse-read result code checking logic

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-01-03 13:20:01 -05:00
Sage Weil
ddfa31bc3c Merge pull request #7031 from wonzhq/log-monitor-2 
mon: fix the can't change subscribe level bug in monitoring log

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-01-03 13:19:30 -05:00
Sage Weil
62c584fba2 Merge pull request #7009 from majianpeng/osd-scrub-sleep-cause-thread-suicide 
osd: avoid osd_op_thread suicide because osd_scrub_sleep

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-01-03 13:19:10 -05:00