RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 22:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,748 Commits 211 Branches 394 Tags 1.4 GiB
64cb6e5569
Commit Graph

46748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loic Dachary
98e82463a8 Merge pull request #6873 from javacruft/wip/debian-infernalis-patches 
ceph-detect-init: Ubuntu >= 15.04 uses systemd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-14 12:52:28 +01:00
Loic Dachary
d314362cd4 Merge pull request #6787 from oritwas/wip-run-cmake-check 
Wip run cmake check

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-14 12:49:37 +01:00
Jianpeng Ma
df0c1f5d64 journal: add iohint flags for journal replayer. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-12-14 13:32:11 +08:00
Jianpeng Ma
84310c53c7 journal: Add iohint flags for journal write ops. 
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
 2015-12-14 13:32:02 +08:00
Kefu Chai
0063ee24e9 Merge pull request #6790 from kylinstorage/wip-subprocess 
SubProcess: fix multiple definition bug

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-14 12:15:28 +08:00
Kefu Chai
3cbb824db5 Merge pull request #5921 from caibo2014/add-tool-feature 
tools:support printing part cluster map in readable fashion

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-14 12:13:40 +08:00
Loic Dachary
5440334dec doc: dev: introduction to tests 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2015-12-13 22:02:27 +01:00
Loic Dachary
e1b3b903a5 Merge pull request #6906 from HeyoQiang/heyongqiang1212 
client: modify a word in log

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-13 21:57:36 +01:00
Loic Dachary
09d7a60ca8 Merge pull request #6866 from xiaoxichen/umount_before_mount 
init-ceph: do umount when the path exists.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-13 13:47:30 +01:00
Xiaoxi Chen
09e21b495b init-ceph: do umount when the path exists. 
If the specified mount point is in use, umount it instead
of skipping mounting the fs.

In previous code , if we forgot that we already mount something unrelated to
*this ceph osd * to the particular mount point, we will skip the mount and
finally get an error complaining superblock not matching OSD ID.

umount & remount is better because
1. If the wrong FS not in use, we can get the right FS we want and make ceph boot smoothly.
2. If the wrong FS is in use, we will get EBUSY on umount, which seems explain the situation
more clearly than superblock mismatch.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
 2015-12-13 16:17:56 +08:00
Kefu Chai
d7a1790076 Merge pull request #6905 from H3C/wip-bugfix-mount1 
mount.ceph: memory leaks

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-13 12:52:31 +08:00
Loic Dachary
cd4b4cf4f8 Merge pull request #6908 from nilamdyuti/wip-doc-rbdsnapshot 
doc: Modified a note section in rbd-snapshot doc.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-13 02:10:12 +01:00
qiankunzheng
14e9d292ff mount/mtab.cc: memory leaks 
the free() should be called to free resources, in order to avoid memory leaks

Fixes:#14066
Signed-off-by: Qiankun Zheng <zheng.qiankun@h3c.com>
 2015-12-12 20:03:33 -05:00
Yongqiang He
58bad43eb9 client: modify a word in log 
This modification changed the word "comit" in line 7704
/* ldout(cct, 10) << "sync_write_comit -- no more unsafe writes, unmount can proceed" << dendl; */
by the word "commit";

Signed-off-by: YongQiang He<he.yongqiang@h3c.com>
 2015-12-12 15:22:56 -05:00
Nilamdyuti Goswami
c36d73eedb doc: Modified a note section in rbd-snapshot doc. 
Elaborates the note section a bit more as to why stopping I/O before
taking a snapshot is recommended and how to do it.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
 2015-12-13 01:23:30 +05:30
Sage Weil
7f627e04c8 Merge pull request #6901 from yehudasa/wip-mstart 
vstart.sh: add mstart, mstop, mrun wrappers for running multiple vstart-style test clusters out of src tree

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-11 16:46:50 -05:00
Sage Weil
b3ad2b93ea Merge pull request #6698 from mathslinux/auth-crash-fix 
auth: fix crash when bad keyring is passed

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-11 15:42:53 -05:00
Loic Dachary
e5536b272f Merge pull request #6890 from dachary/wip-13986-test-pg-scrub 
tests: fix failure for osd-scrub-snap.sh

Reviewed-by: Xinze Chi <xinze@xsky.com>
Reviewed-by: Ning Yao <zay11022@gmail.com>
 2015-12-11 18:24:56 +01:00
Sage Weil
ad15b8137d vstart.sh: mon osd reporter subtree level = osd 
Since everything is on one host!

Signed-off-by: Sage Weil <sage@redhat.com>
 2015-12-11 11:30:08 -05:00
Sage Weil
6c4a421935 Merge pull request #6709 from xiaoxichen/failure_by_host 
mon: support min_down_reporter by subtree level (default by host)

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-11 11:32:17 -05:00
Yehuda Sadeh
8cc6301f9f mstop.sh, mrgw.sh: more scripts to control daemons in dev env 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-12-11 08:20:46 -08:00
Yehuda Sadeh
df92e26718 mrun: a tool to run commands against specific mstart cluster 
E.g.,

$ ./mstart.sh foo -n
$ ./mrun foo ceph -s

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-12-11 08:20:33 -08:00
Yehuda Sadeh
dfa403c733 mstart.sh: run multiple clusters in a single source tree 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2015-12-11 08:20:24 -08:00
Kefu Chai
61392c1c2c Merge pull request #6823 from oritwas/wip-cmake-fix-authtool 
cmake: add TracepointProvider.cc to libcommon

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-11 23:32:40 +08:00
Kefu Chai
dc27e43bf8 Merge pull request #6827 from trociny/wip-scrub-debug 
Little improvements for troubleshooting scrub issues

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-11 23:28:11 +08:00
Sage Weil
df56dc9e02 Merge pull request #6732 from aalba6675/patch-custom-cluster-name 
sysvinit: allow custom cluster names

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-11 10:24:45 -05:00
Sage Weil
8b3409e52f Merge pull request #6730 from kylinstorage/fix-refcounter-in-replica_scrub 
osd: fix MOSDRepScrub reference counter in replica_scrub

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-11 10:22:32 -05:00
Sage Weil
97dbb7c741 Merge pull request #6713 from zhanghuan/fix-wbthrottle 
osd: fix incorrect throttle in WBThrottle

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-11 10:21:53 -05:00
Sage Weil
b664054047 Merge pull request #6731 from kylinstorage/clean_up_objecter 
librados: clean up Objecter.h

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2015-12-11 10:20:58 -05:00
Sage Weil
a2c223682e Merge pull request #6863 from jdurgin/wip-buffer-header 
buffer: make usable outside of ceph source again

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-11 08:35:57 -05:00
Orit Wasserman
61aa107fb1 cmake: add run_cmake-check.sh 
currently only check to cmake build process

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
 2015-12-11 14:01:18 +01:00
Loic Dachary
85f77419bb Merge pull request #6750 from theanalyst/doc/mailmap/jewel 
mailmap: Jewel updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2015-12-11 10:47:01 +01:00
Loic Dachary
f516f5ae57 Merge pull request #6872 from dachary/wip-osd-typo 
doc: osd: s/schedued/scheduled/

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 09:46:41 +01:00
Abhishek Lekshmanan
9f34737920 mailmap: YankunLi affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:12:01 +05:30
Abhishek Lekshmanan
b3c28b94f6 mailmap: Nishtha Rai affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:12:01 +05:30
Abhishek Lekshmanan
0828cb438a mailmap: John Coyle affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Conflicts:
	.organizationmap
Trivial merge conflict as upstream had an additional entry
 2015-12-11 13:11:28 +05:30
Abhishek Lekshmanan
0d3605f4ed mailmap: Jashan Kamboj affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:42 +05:30
Abhishek Lekshmanan
e108b22d83 mailmap: Adam Kupczyk affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
c65bab189d mailmap: Jacek J. Lakis affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
41a18ffd6d mailmap: runsisi affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
458c59a632 mailmap: Zeqiang Zhuang affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
e2cd81d771 mailmap: You Ji affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
5991644312 mailmap: Wenjun Huang affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
5ed7d09f21 mailmap: Wei Luo affiliation 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
ea8ad14e2b mailmap: Sangdi Xu name normalization 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:41 +05:30
Abhishek Lekshmanan
e9aa13289e mailmap: Robin H. Johnson name normalization 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:40 +05:30
Abhishek Lekshmanan
fee41ad2e3 mailmap: Guang Yang name normalization 
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
 2015-12-11 13:10:40 +05:30
Sage Weil
1c24b207bf Merge pull request #6783 from yuyuyu101/wip-13961 
osd: KeyValueStore: don't queue NULL context

Reviewed-by: Sage Weil <sage@redhat.com>
 2015-12-10 21:29:18 -05:00
Josh Durgin
b2ec53c873 Merge pull request #6892 from kylinstorage/wip-fix-rbd-tracepoint 
librbd: fix tracepoint parameter in diff_iterate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-10 17:24:02 -08:00
Josh Durgin
6955d2940d Merge pull request #6878 from manens/pybind_rados_ioctx_snap_rollback 
pybind: Implementation of rados_ioctx_snapshot_rollback

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2015-12-10 11:58:16 -08:00