1
0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Commit Graph

24967 Commits

Author SHA1 Message Date
Danny Al-Gaaf
8a999ded08 ceph-disk: rename some constants to upper case variable names
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 16:18:17 +01:00
Danny Al-Gaaf
86e55f5448 ceph-disk: add some more docstrings
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 16:15:29 +01:00
Danny Al-Gaaf
543327b1f2 ceph-disk: print subprocess.CalledProcessError on error
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 14:36:41 +01:00
Danny Al-Gaaf
2d26bcc071 ceph-disk: fix indention
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-25 13:55:56 +01:00
Sage Weil
8befbca77a Merge branch 'next' 2013-03-23 17:31:29 -07:00
Sam Lang
ece4348807 client: don't set other if lookup fails in rename
On rename, only set the other inode if the
lookup for the destination succeeds, otherwise we hit
a segv in set_other_inode().

Fixes .
Signed-off-by: Sam Lang <sam.lang@inktank.com>
Tested-by: Noah Watkins <jayhawk@cs.ucsc.edu>
2013-03-23 17:30:53 -07:00
Sage Weil
84738791fe Merge branch 'next' 2013-03-23 11:03:58 -07:00
Sam Lang
836b97f386 test/libcephfs: Test rename error cases
Make sure that rename fails with the ENOENT
if the source path doesn't exist.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-03-23 11:03:55 -07:00
Sam Lang
8e6a970c45 client: Fix rename returning ENOENT for dest
Introduced by fc80c1dc6e,
the client should _not_ fail if the lookup for the
destination path on rename returns ENOENT.

The previous code also did not check that the lookup
returned ENOENT or success.  We add the check and fail
if we get any other errors.

Fixes .
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-03-23 11:01:50 -07:00
Sage Weil
838f1cde94 preserve /var/lib/ceph on deb/rpm purge
We should clobber configuration and log data, but *not* user data.  Leave
/var/lib/ceph alone.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-22 15:24:51 -07:00
Samuel Just
16063db20e Merge remote-tracking branch 'upstream/wip_4435'
Fixes: 
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-03-22 14:15:33 -07:00
Samuel Just
4fe4deafbe PG::GetMissing: need to check need_up_thru in MLogRec handler
Backport: bobtail
Fixes: 
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-22 14:07:04 -07:00
Samuel Just
d611eba9ca PG,osd_types: improve check_new_interval debugging
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-22 14:06:45 -07:00
Sage Weil
c524e2e01d common/MemoryModel: remove logging to /tmp/memlog
This was a hack for dev purposes ages ago; remove it.  The predictable
filename is a security issue.

CVE-2013-1882

Reported-by: Michael Scherer <misc@zarb.org>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-03-22 13:25:49 -07:00
Sage Weil
6a7ad2eac1 init-ceph: clean up temp ceph.conf filename on exit
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-03-22 13:25:43 -07:00
Sage Weil
051734522f init-ceph: push temp conf file to a unique location on remote host
The predictable file name is a security problem.

CVE-2013-1882

Reported-by: Michael Scherer <misc@zarb.org>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-03-22 13:25:33 -07:00
Sage Weil
f463ef78d7 mkcephfs: make remote temp directory name unique
The predictable file name is a security problem.

CVE-2013-1882

Reported-by: Michael Scherer <misc@zarb.org>
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-03-22 13:25:23 -07:00
Sage Weil
0d3f065c23 Merge pull request from ceph/wip-fs-rename
test: add ceph_rename test

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-22 13:07:41 -07:00
John Wilkins
853dd35969 doc: Added {id} argument to OSD lost.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-03-22 11:52:12 -07:00
Sage Weil
6d63752c8f ceph-disk: re-add python 2.7 dependency comment
FIXME!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 10:09:55 -07:00
Sage Weil
c9157a1946 Merge pull request from ceph/wip-ceph-disk
ceph-disk-* refactor
2013-03-22 10:06:13 -07:00
Sage Weil
0981e4666b Merge branch 'next' 2013-03-22 09:15:52 -07:00
Sage Weil
38a5acbb82 osd: reenable 'journal aio = true'
Now that  is resolved.  Reverts 1cfc3ae0.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 09:15:23 -07:00
Sage Weil
e5940da9a5 os/FileJournal: fix aio self-throttling deadlock
This block of code tries to limit the number of aios in flight by waiting
for the amount of data to be written to grow relative to a function of the
number of aios.  Strictly speaking, the condition we are waiting for is a
function of both aio_num and the write queue, but we are only woken by
changes in aio_num, and were (in rare cases) waiting when aio_num == 0 and
there was no possibility of being woken.

Fix this by verifying that aio_num > 0, and restructuring the loop to
recheck that condition on each wakeup.

Fixes: 
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-03-22 09:15:20 -07:00
Sage Weil
a35b865093 Merge pull request from dalgaaf/wip-da-cleanup-includes
Cleanup some twice included header

Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-22 08:46:31 -07:00
Danny Al-Gaaf
6c79604cef test/test_snap_mapper.cc: remove twice included <tr1/memory>
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-22 16:03:22 +01:00
Danny Al-Gaaf
00cf8178b6 mon/MDSMonitor.cc: remove twice included MonitorDBStore.h
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-22 16:02:55 +01:00
Danny Al-Gaaf
a583029e81 mon/LogMonitor.cc: remove twice included <sstream>
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-22 16:02:23 +01:00
Danny Al-Gaaf
9dd5b209a2 mon/AuthMonitor.cc: remove twice included <sstream>
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-22 16:01:53 +01:00
Danny Al-Gaaf
1144260957 common/Formatter.h: remove twice included <list>
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-22 16:01:15 +01:00
Samuel Just
000310fd10 ReplicatedPG: add debug flag to skip full check at reservation
This will make it easier to test the check in do_scan.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:40 -07:00
Samuel Just
29a288f993 ReplicatedPG: replica should post BackfillTooFull in do_scan if full
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:40 -07:00
Samuel Just
f9c8190e4f PG: halt backfill on RemoteReservationRejected in Backilling
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:40 -07:00
Samuel Just
022903bf73 PG: add helper for adding a timer event to retry backfill
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:40 -07:00
Samuel Just
3ab4a09de2 PG: add BackfillTooFull event for RepRecovering
Replica will use this to notify Primary to stop backfilling.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:39 -07:00
Samuel Just
cd7353938e PG: add helper for rejecting backfill reservation
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:39 -07:00
Samuel Just
33aaea594d PG: use OSDService::too_full_for_backfill in RepWaitBackfillReserved
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:39 -07:00
Samuel Just
cec3d82ec4 OSDService: add too_full_for_backfill
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:51:39 -07:00
Samuel Just
f00f3bc4e5 Merge remote-tracking branch 'upstream/wip_osd_shutdown_notification'
Fixes: 
Fixes: 
Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-21 18:46:50 -07:00
Samuel Just
fab0be1ffe Makefile: add MOSDMarkMeDown
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:46:14 -07:00
Samuel Just
7bfaaf7a20 OSD: notify mon prior to shutdown
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:46:11 -07:00
Samuel Just
a2dba959d2 Monitor: add MOSDMarkMeDown support
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
edebb341c2 OSDMonitor: factor out check_source helper
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
b8929c4262 messages: add MOSDMarkMeDown
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
bb125221be OSD: clear OpHistory on shutdown
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
51ae509800 OpRequest: use OpRequestRef for OpHistory
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
210ecc5871 FileStore::stat: valgrind: don't read *st on error
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
6119f297dc shared_cache: clear lru in destructor
Otherwise, the live references will attempt to extricate
themselves from a disolving SharedLRU instance as the
member destructors run.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
95e9322c65 ceph_osd: clear client_throttler prior to putting g_ceph_context
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00
Samuel Just
8d43a2ec91 OSD: reorder OSD::shutdown
Reorder teardown:
- pgs
- queues/threadpools
- persist superblock
- filestore
- timers
- messengers

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:35 -07:00