RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: ceph-disk.sh can be confused if there are two OSDs

Browse Source 
Replace the fragile extaction of the whoami file with an explicit uuid
set for a given OSD. It can conveniently be translated back into an osd
id with ceph osd create uuid if needed.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Loic Dachary 2015-03-07 16:10:15 +01:00
parent 8d52dc185e
commit fbb6df525c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/ceph-disk.sh
View File

@ -202,11 +202,12 @@ function test_activate() {
local to_prepare=$1
local to_activate=$2
local journal=$3
local osd_uuid=$(uuidgen)
$mkdir -p $OSD_DATA
./ceph-disk $CEPH_DISK_ARGS \
prepare $to_prepare $journal || return 1
prepare --osd-uuid $osd_uuid $to_prepare $journal || return 1
$timeout $TIMEOUT ./ceph-disk $CEPH_DISK_ARGS \
activate \
@ -214,7 +215,7 @@ function test_activate() {
$to_activate || return 1
$timeout $TIMEOUT ./ceph osd pool set $TEST_POOL size 1 || return 1
local id=$($cat $OSD_DATA/ceph-?/whoami || $cat $to_activate/whoami)
local id=$(ceph osd create $osd_uuid)
local weight=1
./ceph osd crush add osd.$id $weight root=default host=localhost || return 1
echo FOO > $DIR/BAR