[Ocfs2-test-devel] [PATCH 04/11] recovery_load
Marcos Matsunaga
Marcos.Matsunaga at oracle.com
Mon Jun 14 08:36:13 PDT 2010
ocfs2-test: changed to accept an alternate NIC to be used by the test.
- Added additional information to the logfile.
Signed-off-by: Marcos Matsunaga <Marcos.Matsunaga at oracle.com>
Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
programs/dirop_fileop_racer/Makefile | 1 +
programs/recovery_load/recovery_load.py | 36 ++++++++++++++++++++++++++++--
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/programs/dirop_fileop_racer/Makefile b/programs/dirop_fileop_racer/Makefile
index 027944f..ecff73c 100644
--- a/programs/dirop_fileop_racer/Makefile
+++ b/programs/dirop_fileop_racer/Makefile
@@ -3,5 +3,6 @@ TOPDIR = ../..
include $(TOPDIR)/Preamble.make
DIST_FILES = dir_create.sh file_concat.sh file_create.sh file_link.sh file_list.sh file_rename.sh file_rm.sh file_symlink.sh racer.sh
+BIN_EXTRA = dir_create.sh file_concat.sh file_create.sh file_link.sh file_list.sh file_rename.sh file_rm.sh file_symlink.sh racer.sh
include $(TOPDIR)/Postamble.make
diff --git a/programs/recovery_load/recovery_load.py b/programs/recovery_load/recovery_load.py
index 7b42717..6ee2b42 100644
--- a/programs/recovery_load/recovery_load.py
+++ b/programs/recovery_load/recovery_load.py
@@ -55,18 +55,38 @@ def Populate():
if access(localdir, F_OK) == 1:
os.system('rm -fr '+localdir)
o2tf.CreateDir(DEBUGON, localdir, logfile)
- o2tf.untar(DEBUGON, localdir, tarfile, logfile)
+ o2tf.untar(DEBUGON, localdir, tarfile, logfile,'1')
#
def Find():
+ o2tf.printlog('recovery_load: Find Started',
+ logfile, 0, '')
finddir=os.path.join(options.directory, str('%s_recovery' % nodelist[NodeIndex]))
if DEBUGON:
o2tf.printlog('recovery_load: finddir [%s]' % finddir,
logfile, 0, '')
- os.system(str('find %s -type f -exec touch {} \;' % finddir))
+
+ ret = os.system(str('find %s -type f -exec touch {} \;' % finddir))
+ if not ret:
+ o2tf.printlog('recovery_load: find on %s successful.' % finddir,
+ logfile, 0, '')
+ else:
+ o2tf.printlog('recovery_load: find on %s failed.' % finddir,
+ logfile, 0, '')
+
if DEBUGON:
o2tf.printlog('recovery_load: directory [%s]' % \
options.directory, logfile, 0, '')
- os.system(str('find %s -type f -exec touch {} \;' % options.directory))
+
+ ret = os.system(str('find %s -type f -exec touch {} \;' % options.directory))
+ if not ret:
+ o2tf.printlog('recovery_load: find on %s successful.' % options.directory,
+ logfile, 0, '')
+ else:
+ o2tf.printlog('recovery_load: find on %s failed.' % options.directory,
+ logfile, 0, '')
+
+ o2tf.printlog('recovery_load: Find Completed',
+ logfile, 0, '')
#
def Cleanup(ret):
sys.exit(ret)
@@ -77,6 +97,7 @@ Usage = 'usage: %prog [-D|--Debug] \
[-d|--directory] \
[-e|--extract] \
[-f|--find] \
+[-i|--if <Network Interface>] \
[-l|-logfile logfilename] \
[-n|nodes nodelist] \
[-t|--tarfile fullpath tar filename] \
@@ -112,6 +133,12 @@ if __name__=='__main__':
default=False,
help='In client mode, will run find. Default=False.')
#
+ parser.add_option('-i',
+ '--if',
+ dest='interface',
+ type='string',
+ help='Network interface to be used by the test.')
+#
parser.add_option('-l',
'--logfile',
dest='logfile',
@@ -152,6 +179,7 @@ if __name__=='__main__':
nodelist = options.nodes.split(',')
nodelen = len(nodelist)
logfile = options.logfile
+ interface = options.interface
if nodelen < 2:
o2tf.printlog('recovery_load: nodelist must have at least 2 '+
'nodes' % options.directory, logfile, 0, '')
@@ -206,6 +234,7 @@ if not Client:
options.nodes, tarfile) ),
','.join(nodelist),
'ssh',
+ options.interface,
logfile,
'WAIT')
if not ret:
@@ -224,6 +253,7 @@ if not Client:
options.nodes) ),
','.join(nodelist),
'ssh',
+ options.interface,
logfile,
'WAIT')
if not ret:
--
1.5.6.5
More information about the Ocfs2-test-devel
mailing list