Sage Weil
683f745c14
crush: change find_roots(); add find_takes()
...
The find_roots() was looking for nodes referenced by 'take', but those
aren't necessarily roots, which is what the callers actually want.
Rename to find_takes() and add a real find_roots(). Not very efficient,
but we don't care.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 15:15:37 -07:00
Sage Weil
751b4bf89f
mon: add optional ancestor arg to 'ceph osd crush rm <item> [ancestor]'
...
Remove only instances of the item underneath a particular ancestor.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 15:15:37 -07:00
Sage Weil
ee6b9937aa
crush: add remove_item_under()
...
Remove only instances of item nested beneath a particular ancestor.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 15:15:37 -07:00
Sage Weil
6cba563f5f
mon: 'ceph osd crush link ...' to add a link to an existing bucket
...
Allow a second reference to an existing bucket to be added. This lets
you create a DAG instead of a tree using the CLI.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 15:15:37 -07:00
Sage Weil
fe4e86c6ac
crush: prevent formation of a loop
...
If we are adding an item, ensure it cannot form a loop in the tree/map/
DAG.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 15:15:37 -07:00
Sage Weil
a54a41173d
crush: add link_bucket()
...
Allow an existing bucket to get linked from a new position in the tree.
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 15:15:37 -07:00
Sage Weil
05dac04ba0
mon: 'ceph osd crush add ...' to add a second link to an item
...
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-22 15:15:36 -07:00
Samuel Just
16063db20e
Merge remote-tracking branch 'upstream/wip_4435'
...
Fixes : #4435
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 : #4534
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 #130 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 #117 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 #4079 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 : #4079
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 #137 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 : #1857
Fixes : #4267
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
Samuel Just
505bebbb3c
OSD: check for is_stopping after locking osd_lock or heartbeat_lock
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:34 -07:00
Samuel Just
9d076a0edb
OSD: lookup_lock_raw_pg is dead
...
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:34 -07:00
Samuel Just
e41554da14
OSD: rename timer to tick_timer
...
Only used for scheduling ticks - we should keep it
that way.
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-03-21 18:37:34 -07:00