RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,560 Commits 216 Branches 395 Tags 1.4 GiB
23787ba094
Commit Graph

33560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loic Dachary
23787ba094 mailmap: Sahid Orentino Ferdjaoui affiliation 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2014-05-19 14:49:01 +02:00
Loic Dachary
9bdc3f2ab4 Merge pull request #1822 from sahid/master 
Ensure autogen.sh to be executed at the top-level

Reviewed-by: Loic Dachary <loic@dachary.org>
 2014-05-19 14:40:00 +02:00
Sahid Orentino Ferdjaoui
30ae96a737 Ensure autogen.sh to be executed at the top-level 
The commit adds a test to ensure that user executes
'autogen.sh' at the top-level of the directory.

Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
 2014-05-19 14:33:48 +02:00
Yan, Zheng
991f7f15a6 Merge pull request #1821 from ceph/mds-optracker-fixes 
mds: fix Server::submit_mdlog_entry()
 2014-05-18 13:42:51 +08:00
Yan, Zheng
57c89bf814 mds: fix Server::submit_mdlog_entry() 
mdr can be NULL when rolling back slave update

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
 2014-05-18 13:38:32 +08:00
Gregory Farnum
5ace4d1af7 Merge pull request #1809 from ceph/wip-4354-mds-optracker 
MDS OpTracker

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-16 15:17:00 -07:00
Greg Farnum
ee92a39bce MDS: add admin socket cleanup on shutdown 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-16 15:15:55 -07:00
Ilya Dryomov
7a1538187f Merge pull request #1817 from ceph/wip-osdmon-pa-wait 
OSDMonitor: set next commit in mon primary-affinity reply

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-16 20:37:05 +04:00
Ilya Dryomov
a78b14ec17 OSDMonitor: set next commit in mon primary-affinity reply 
Commit 8c5c55c8b4 ("mon: set next commit in mon command replies")
fixed MMonCommand replies to include the right version, but the
primary-affinity handler was authored before that.  Fix it.

Backport: firefly
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
 2014-05-16 20:25:36 +04:00
Gregory Farnum
a877d12f0e Merge pull request #1816 from onlyjob/docs 
sample.ceph.conf: minor update

Reviewed-by: Greg Farnum <greg@inktank.com>
 2014-05-16 07:08:53 -07:00
Dmitry Smirnov
6dfc544e5a sample.ceph.conf: minor update 
* Moved filestore settings above [osd.*] declarations otherwise
   (if uncommented) those settings might be applied only to last
   OSD which is not very obvious.
 * Few options added.
 2014-05-16 20:30:29 +10:00
Greg Farnum
405063b16e workunits: provide some output in the dirfrag.sh test 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-14 14:20:19 -07:00
Gregory Farnum
fe19a1dba6 Merge pull request #1803 from onlyjob/java-gcj 
Java GCJ fixes

Reviewed-by: Greg Farnum <greg@inktank.com>
Acked-by: Noah Watkins <noahwatkins@gmail.com>
 2014-05-14 13:24:20 -07:00
Samuel Just
e6e3cec313 Merge pull request #1806 from ceph/wip-8011 
ReplicatedPG: block scrub on blocked object contexts

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-14 12:12:44 -07:00
John Wilkins
ab907c5abc doc: Clarified Debian uses sysvinit. 
Fixes: #7182

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-14 00:23:22 -07:00
John Wilkins
c71c292123 doc: Added rgw print continue guidance. 
Fixes: #7731

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-14 00:14:30 -07:00
John Wilkins
b082fd68b6 doc: Minor edit. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-14 00:13:41 -07:00
John Wilkins
ca833bd543 doc: Added clarifying text to CRUSH add command. 
Fixes: #8322

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-14 00:02:09 -07:00
John Wilkins
48337e0c7b doc: Omitted glance_api_version=2 to fix creating images from volumes. 
Fixes: #8347
 2014-05-13 23:20:36 -07:00
John Wilkins
17930a1e86 doc: Changed example to use virtio and put key usage into one line. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-13 23:18:50 -07:00
Sage Weil
c7540cb6aa Merge pull request #1802 from ceph/wip-mds-misc 
Wip mds misc

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-13 18:46:12 -07:00
Sage Weil
b4b128b263 Merge pull request #1810 from ceph/wip-fedora 
doc: update instructions for RPM distros
 2014-05-13 18:11:11 -07:00
Wido den Hollander
8dd1190dd5 Improve Bash completion for various tools 2014-05-13 23:48:53 +02:00
Greg Farnum
00225d739c test: fix some templates to match new output code 
Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-13 13:38:22 -07:00
John Spray
20aad8ff93 doc: update instructions for RPM distros 
Fix RPM building instructions: this has been broken since
libs3 was included inline in the ceph repo as a submodule.
"rpmbuild -tb" was concatenating the ceph.spec and
libs3.spec files, resulting in something that didn't work.

Also, the instructions suggested downloading a .tar.gz file
whereas the specfile requires a .tar.bz2 file.

Also, add a convenient yum command line for getting the compile
dependencies on Fedora 20.

Signed-off-by: John Spray <john.spray@inktank.com>
 2014-05-13 19:22:43 +01:00
Greg Farnum
04c280e7c1 Merge remote-tracking branch 'origin/master' into wip-4354-mds-optracker 
Conflicts:
	src/mds/Locker.cc
	src/osd/OpRequest.cc
	src/osd/OpRequest.h

Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-13 10:54:12 -07:00
Yan, Zheng
26151ec62f mds: lower IO priority of storing backtrace 
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
 2014-05-13 13:52:31 +08:00
Gregory Farnum
bfce3d4fac Merge pull request #1771 from ceph/wip-5021 
Wip 5021

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
 2014-05-12 21:39:53 -07:00
Yan, Zheng
20814de9e9 Merge pull request #1807 from ceph/wip-mds-flock 
mds: reduce verbosity of handle_client_file_{readlock,setlock}
 2014-05-13 09:31:00 +08:00
Yan, Zheng
019483fdaa mds: reduce verbosity of handle_client_file_{readlock,setlock} 
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
 2014-05-13 09:29:47 +08:00
Greg Farnum
ca313c20be mds: add a Server::submit_mdlog_entry() to provide event marking 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 18:27:42 -07:00
Samuel Just
7411477153 ReplicatedPG: block scrub on blocked object contexts 
Fixes: #8011
Backport: firefly
Signed-off-by: Samuel Just <sam.just@inktank.com>
 2014-05-12 15:31:11 -07:00
Samuel Just
c32c56b739 Merge pull request #1779 from ceph/wip-7553 
Wip 7553

Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-12 15:29:39 -07:00
Greg Farnum
ca91743003 Locker: mark_event in acquire_locks() when blocking or succeeding 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:44:14 -07:00
Greg Farnum
2df68b6b73 Server: mark events when journaling and replying 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:44:14 -07:00
Greg Farnum
a6aa8121f2 MDCache: mark ops at various finish points 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:44:14 -07:00
Greg Farnum
87f6cd4929 MDS: add an OpTracker and use it 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:44:04 -07:00
Greg Farnum
b27780291c Mutation: add an MDRequestParams struct and use that when building MDRequests 
We now have a single constructor and one path to build MDRequests with.

Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:41:20 -07:00
Greg Farnum
ae80a1f308 MDS: add stubs for an AdminSocketHook 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:39:57 -07:00
Greg Farnum
0d89e5ca45 MDCache: pass the causative message to request_start_slave() 
We were passing the causative MDS (as an int), but pushing down the
actual Message will help us as we set up an OpTracker.

Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:39:57 -07:00
Greg Farnum
06d6d32ba3 mds: remove a couple leftover declarations of MDRequest 
Signed-off-by: Greg Farnum <greg@inktank.com>
 2014-05-12 14:39:57 -07:00
Sage Weil
428319e827 doc/release-notes: v0.80.1 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-12 14:25:53 -07:00
Sage Weil
b99244e575 Merge pull request #1799 from ceph/wip-8305 
osd: fix op ordering with pool overlay set/removed

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
 2014-05-12 13:33:27 -07:00
John Wilkins
19f8849a94 doc: Improvements to qemu installation. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-12 13:20:14 -07:00
John Wilkins
6e4455d6af doc: Added note on Default requiretty for CentOS and others. 
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
 2014-05-12 11:33:57 -07:00
Sage Weil
59e2381f67 Merge pull request #1801 from ceph/wip-update-gitignore 
Update gitignore entries for master

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-12 06:10:22 -07:00
Sage Weil
b4ffd661af Merge pull request #1800 from ceph/wip-da-SCA-20140510 
fixes from SCA

Reviewed-by: Sage Weil <sage@inktank.com>
 2014-05-12 05:51:45 -07:00
Dmitry Smirnov
8b682d167e prioritise use of javac executable (gcj provides it through alternatives). 
On Debian this fixes FTBFS when gcj-jdk and openjdk-7-jdk are installed at
 the same time because build system will use default `javac` executable
 provided by current JDK through `update-alternatives` instead of blindly
 calling GCJ when it is present.

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2014-05-12 14:08:44 +10:00
Dmitry Smirnov
89fe035358 pass '-classpath' option (gcj/javah ignores CLASSPATH environment variable). 
This should not affect OpenJDK which understands '-classpath' as well.

 With gcj-jdk we still get FTBFS later:

 ~~~~
    java/native/libcephfs_jni.cc:2878:55: error: invalid conversion from 'const jbyte* {aka const signed char*}' to 'jbyte* {aka signed char*}' [-fpermissive]
                 reinterpret_cast<const jbyte*>(rawAddress));
                                                           ^
    In file included from java/native/libcephfs_jni.cc:27:0:
    /usr/lib/gcc/x86_64-linux-gnu/4.8/include/jni.h:1471:8: error:   initializing argument 4 of 'void _Jv_JNIEnv::SetByteArrayRegion(jbyteArray, jsize, jsize, jbyte*)' [-fpermissive]
       void SetByteArrayRegion (jbyteArray val0, jsize val1, jsize val2, jbyte * val3)
            ^
    make[5] *** [java/native/libcephfs_jni_la-libcephfs_jni.lo] Error 1
 ~~~~

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2014-05-12 14:06:54 +10:00
Dmitry Smirnov
0f4120c011 look for "jni.h" in gcj-jdk path, needed to find "jni.h" with gcj-jdk_4.9.0 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2014-05-12 13:57:20 +10:00