RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 16:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,572 Commits 219 Branches 396 Tags 1.3 GiB
a09547bbfc
Commit Graph

33572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
a09547bbfc mds: use real timestamp for readdir leases 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-20 15:05:28 -07:00
Sage Weil
9c86a110f8 mds: use client-provided time stamp for user-visible file metadata 
Use the op_stamp from the MDRequest, populated by the MClientRequest when
possible, for setting timestamps on user-visible metadata (like ctime,
mtime).

Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-20 15:05:28 -07:00
Sage Weil
4a6596ec61 mds: do the balancer and propagation timers based on mds_stmap 
Use the (more) stable time stamp for doing the balancer's temperature
tracking and associated decay.

Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-20 15:05:27 -07:00
Sage Weil
fd1f9bdada mds: do rstat timestamps (rctime, fragstat mtime) in terms of op stamp 
Use the op (client) timestamp for the recursive stats, for santity's sake.
Note that since this is monotonically increasing, the danger here is
that we lose track of nested changes due to skewed client clocks.

Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-20 14:55:05 -07:00
Sage Weil
29c684442e mds: make sure mds_stamp is set when we journal 
This is a catch-all that we are carrying over from before.  It may not
be strictly necessary, but I'm not inclined to check the code for
Mutation users who didn't call acquire_locks().

Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-20 14:52:59 -07:00
Sage Weil
3569e809a4 mds: set mds_stamp on lock acquisition 
Normally acquire_locks() will set this for us.

Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-20 14:51:35 -07:00
Sage Weil
e4c9c34136 mds: add {mds,op}_stamp to Mutation 
With getters, setters.

Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-20 14:50:46 -07:00
Sage Weil
ad2e20f2d4 client: set timestamp in MDS requests 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-19 16:23:18 -07:00
Sage Weil
a91e072b09 mds: include timestamp in MClientRequest 
Signed-off-by: Sage Weil <sage@inktank.com>
 2014-05-19 16:23:17 -07:00
Sage Weil
9e80c29c2c Merge remote-tracking branch 'gh/next' 2014-05-19 09:49:28 -07:00
Loic Dachary
d3488202a2 Merge pull request #1823 from dachary/wip-mailmap 
mailmap: Sahid Orentino Ferdjaoui affiliation

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
 2014-05-19 14:58:49 +02:00
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
290ac81869 OSD: fix an osdmap_subscribe interface misuse 
When calling osdmap_subscribe, you have to pass an epoch newer than the
current map's. _maybe_boot() was not doing this correctly -- we would
fail a check for being *in* the monitor's existing map range, and then
pass along the map prior to the monitor's range. But if we were exactly
one behind, that value would be our current epoch, and the request would
get dropped. So instead, make sure we are not *in contact* with the monitor's
existing map range.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
 2014-05-15 16:54:39 -07: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