RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,585 Commits 211 Branches 394 Tags 2.1 GiB
386139bb81
Commit Graph

19585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
386139bb81 filestore: more informative fsid mkfs debug output 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:43 -07:00
Sage Weil
c96aa62d84 osd: verify fsid whoami to match on repeat mkfs 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:43 -07:00
Sage Weil
5bf5e91fd1 osd: require cluster fsid for mkfs 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:43 -07:00
Sage Weil
a980d018f0 osd: do not clobber existing key with --mkkey 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:43 -07:00
Sage Weil
c18e4d80a1 filestore: mkfs: do not clobber exisiting journal if it has matching fsid 
If the journal is for *this* fs, do not clobber.  If it appears invalid in
any way, initialize it.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:43 -07:00
Sage Weil
a074d0b5c3 filejournal: add check() method 
Check if a journal appears to be valid, where valid means the header is
intact and has a matching fsid.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:42 -07:00
Sage Weil
c498827f04 filestore: drop useless mkjournal error check 
We don't care!

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:42 -07:00
Sage Weil
b04b73d473 filestore: mkfs: less noise about leveldb creation 
and make it clear that we didn't necessarily create it; it may have already
been there.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:42 -07:00
Sage Weil
598dea1241 filestore: mkfs: only create snap_0 if we created current_op_seq 
We only need to create snap_0 if we just created current_op_seq and this is
a brand-new dir.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:42 -07:00
Sage Weil
ec7bf5640f filestore: fix misplaced #endif 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-23 16:31:42 -07:00
Sage Weil
b01dbcdd93 filestore: leave existing current/ 
If current exists, leave it be, but:

 * make sure it's a dir
 * check if it's a btrfs snapshot, and set btrfs_stable_commits if so

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
b7a85a8f77 filestore: create but do not clobber current/commit_op_seq 
If it exists, preserve its value.  Otherwise, create and set it to 1.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
79d60770e8 filestore: mkfs: only (re)set fsid if not already set 
Only set fsid if it is not set.

Also, error out if it exists and does not match.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
d923e33878 filestore: pass target into read_fsid() 
Don't assume it should be read into this->fsid.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
36503d1b0b filestore: mkfs: rename buf -> fsid_fn 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
143762f506 filestore: always open/verify basedir; clean up error messages 
Verify basedir exists immediately.
Clean up error output.
Clean up label names.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
58d8fafb63 filestore: do not wipe on mkfs 
Do not wipe out old content in the data dir.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
05db988a2f filestore: remove unused 'filestore dev' option 
Eons ago we would call mount/unmount on this, but it's been dead for a
while now.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
17c4624e93 osd: only (re)write_meta files if old content is incorrect 
Do nothing if the file already exists with the correct content.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:10 -07:00
Sage Weil
53b05d5892 osd: only create superblock if not present 
If it exists, leave it be.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 17:24:06 -07:00
Sage Weil
55c21de537 Merge branch 'wip-quorum' 2012-05-22 17:13:28 -07:00
John Wilkins
ff64818f1c doc/config-cluster/chef.rst <-fixed an error in upload command. 
doc/config-cluster/deploying-ceph-conf.rst <-added sudo. required.
doc/config-cluster/deploying-ceph-with-mkcephfs.rst <-cd to /etc/ceph so keyring goes there.
doc/install/chef.rst <-added update and install opscode-keyring, and upgrade.
doc/install/debian.rst <-added ceph-common to the install

Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
 2012-05-22 17:10:43 -07:00
Josh Durgin
0ae59eae3d Merge branch 'stable' 2012-05-22 12:54:09 -07:00
Sage Weil
11030793fa objectcacher: fix infinite loop in flusher_entry 
The addition of accounting for simultaneous writers in
f3043fee3e could lead to an infinite
loop. This could happen because starting a flush doesn't decrease
dirty_waiters, only the number of dirty bytes (they change to tx). If
dirty_waiters is more than target_dirty, the loop would continue
forever while holding the object cacher lock, since the object cacher
lock is required by the write callbacks.

The extra while (!flusher_stop) loop is unnecessary, so remove it.
This means the flusher thread always releases the lock after starting
flushing, so progress can be made.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
 2012-05-22 12:48:19 -07:00
John Wilkins
884aa8a661 Merge branch 'master' of github.com:ceph/ceph 2012-05-22 09:54:06 -07:00
John Wilkins
b0d6895a21 doc/config-cluster/ceph-conf.rst <-Fixed some formatting issues. 
doc/config-cluster/deploying-ceph-conf.rst <-minor edit.
doc/start/get-involved-in-the-ceph-community.rst <-removed $ from command line instruction.
doc/start/quick-start.rst <-added additional steps.



Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
 2012-05-22 09:53:34 -07:00
Sage Weil
d7a8084b4c monmap: calc_ranks() on rename() 
This is simpler than ensuring we track all the right invariants.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-22 07:05:36 -07:00
Sage Weil
4fd524913f Merge branch 'wip-defensive-alloc' 2012-05-21 20:01:03 -07:00
Sage Weil
cfe261bf9d crush: check reweight return value 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 20:00:51 -07:00
Ross Turk
5959ea7b78 doc: fix broken link in FAQ 
Signed-off-by: Ross Turk <ross@inktank.com>
 2012-05-21 19:36:59 -07:00
Ross Turk
cf5848676e doc: added links from the chef install doc to the chef config doc and back 
Signed-off-by: Ross Turk <ross@inktank.com>
 2012-05-21 18:22:35 -07:00
Ross Turk
6149fb700f doc: Added a FAQ page. 
Added a FAQ page, which we will need to put more content in.

Signed-off-by: Ross Turk <ross@inktank.com>
 2012-05-21 18:21:39 -07:00
John Wilkins
e3b3108bfd Added the Swift API as is. Still needs a lot of work. 
Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
 2012-05-21 17:49:35 -07:00
Sage Weil
d93410c799 doc: document range of methods for cluster creation, expansion 
This isn't quite complete, and should be integrated with the info in the
ops section on mon cluster expansion, but the raw content is here at least.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 16:57:26 -07:00
John Wilkins
812989bf35 doc: misc updates 
doc/architecture.rst - removed broken reference.
doc/config-cluster - cleanup and added chef
doc/install - Made generic to add Chef, OpenStack and libvert installs
doc/init - Created light start | stop and health section
doc/source - Removed $ from code examples. Trimmed paras to 80 char
doc/images - Added preliminary diagram for Chef.
doc/rec - Added reference to hardware. Added filesystem info.

Signed-off-by: John Wilkins <john.wilkins@dreamhost.com>
 2012-05-21 16:39:15 -07:00
Sage Weil
133cd69a11 mon: fix 'no initial monitors' warning 
It is valid to start with no initial monitors even when the initial set is
not defined; it just means that we are only able to join a cluster, and
never able to form a new one.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 15:07:42 -07:00
Yehuda Sadeh
3a2dc969ff libs3: remove make install target 2012-05-21 14:32:22 -07:00
Sage Weil
f5a9404445 v0.47.1 2012-05-21 14:28:45 -07:00
Yehuda Sadeh
4e3807bc58 Makefile.am: only append libs3 to SUBDIRS when needed 
We appended libs3 to SUBDIRS unconditionally, we only need that
when we actually want to compile it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
 2012-05-21 14:27:04 -07:00
Sage Weil
13b350a57f filestore: test xattrs on temporary file 
There isn't one we can rely on existing yet.  Broken by
1314a00798 while fixing #2452.

Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 14:21:30 -07:00
Sage Weil
6c0a12209d ceph-object-corpus: add some old v2 monmaps 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 14:20:38 -07:00
Sage Weil
c06fb20a8a monmap: fix decoding of old monmaps 
The old monmaps had a u16 for the version.  Fix our decode.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 13:58:55 -07:00
Sage Weil
a4d034d0b0 qa: fix mon single_host_multi.sh test 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 13:15:23 -07:00
Sage Weil
731effba69 mon: rename ourselves if our name does not match committed monmap 
If we are part of the quorum but our name does not match, fix it.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 13:15:11 -07:00
Sage Weil
cd9d862268 mon: only rename peers in seed monmap 
Once we have a committed monmap, stop renaming peers.  This only gets us
confused because our monmap does not match the paxos committed one.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 13:14:50 -07:00
Sage Weil
e1564aff2c mon: move election msg check into elector 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 13:07:16 -07:00
Sage Weil
ee138678d0 mon: allow mons to rename themselves with the join message 
This allows mons that got stuck in the initial quorum's monmap as noname-*
to fix their name before joining in.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 13:01:49 -07:00
Sage Weil
b4d2b1e4da monmap: fix rename 
Update addr_name map appropriately.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 13:00:59 -07:00
Sage Weil
29a158a68e mon: drop useless rank racalc in init 
bootstrap() handles this, no need to worry about it here.

Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 11:46:06 -07:00
Sage Weil
dae2f5324b mon: fix leak of MonMap 
Signed-off-by: Sage Weil <sage@inktank.com>
 2012-05-21 11:38:07 -07:00