From 46b612efa4153d0e45a93df52eb524f79d74f8f5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 11 Feb 2012 14:20:18 -0800 Subject: [PATCH] misc: make get_scratch_devices look for (almost) any disk that's not mounted --- teuthology/misc.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index 2b144c73b5c92..71d8fbdca4797 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -249,15 +249,42 @@ def get_scratch_devices(remote): file_data = get_file(remote, "/scratch_devs") devs = file_data.split() except: - devs = ['/dev/sdb'] + devs = [ + '/dev/sda', + '/dev/sdb', + '/dev/sdc', + '/dev/sdd', + '/dev/sde', + '/dev/sdf', + '/dev/sdg', + '/dev/sdh', + '/dev/sdi', + '/dev/sdj', + '/dev/sdk', + '/dev/sdl', + '/dev/sdm', + '/dev/sdn', + '/dev/sdo', + '/dev/sdp', + ] retval = [] for dev in devs: try: remote.run( args=[ + # node exists 'stat', - dev + dev, + run.Raw('&&'), + # readable + 'sudo', 'dd', 'if=%s' % dev, 'of=/dev/null', 'count=1', + run.Raw('&&'), + # not mounted + run.Raw('!'), + 'mount', + run.Raw('|'), + 'grep', '-q', dev, ] ) retval.append(dev) -- 2.39.5