[Ocfs2-test-devel] [PATCH 3/6] ocfs2-test: cross-delete - Converted from LAM/MPI to OpenMPI.

[Marcos Matsunaga]

Signed-off-by: Marcos Matsunaga <Marcos.Matsunaga at oracle.com>
---
 programs/cross_delete/cross_delete.py |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/programs/cross_delete/cross_delete.py b/programs/cross_delete/cross_delete.py
index 467e699..ac96ad7 100755
--- a/programs/cross_delete/cross_delete.py
+++ b/programs/cross_delete/cross_delete.py
@@ -276,7 +276,7 @@ if DEBUGON:
 #
 stagedir = dirlist[0]
 #
-o2tf.StartMPI(DEBUGON, ','.join(nodelist), logfile)
+o2tf.OpenMPIInit(DEBUGON, ','.join(nodelist), logfile, 'ssh')
 for y in range(count):
 	o2tf.printlog('cross-delete: RUN# %s of %s' % (y+1, count),
 		logfile,
@@ -289,20 +289,24 @@ for y in range(count):
 		cmdline = os.path.join(config.BINDIR, 'crdel_gen_files.py -D')
 	else:
 		cmdline = os.path.join(config.BINDIR, 'crdel_gen_files.py')
-	o2tf.lamexec( DEBUGON, nproc, config.WAIT, str('%s -s %s -l %s -t %s' % \
+	o2tf.openmpi_run( DEBUGON, nproc, str('%s -s %s -l %s -t %s' % \
 		(cmdline, stagedir,
 		options.logfile,
 		tarfile) ),
 		','.join(nodelist),
-		logfile)
+		'ssh',
+		logfile,
+		'WAIT')
 	if DEBUGON:
 		cmdline = os.path.join(config.BINDIR, 'crdel_del_files.py -D')
 	else:
 		cmdline = os.path.join(config.BINDIR, 'crdel_del_files.py')
-	o2tf.lamexec( DEBUGON, nproc, config.WAIT, str('%s -s %s -l %s ' % \
+	o2tf.openmpi_run( DEBUGON, nproc, str('%s -s %s -l %s ' % \
 		(cmdline, stagedir, options.logfile) ),
 		','.join(nodelist),
-		logfile)
+		'ssh',
+		logfile,
+		'WAIT')
 os.system('rm -f '+stagedir+'/*.dat')
 o2tf.printlog('cross-delete: Job completed successfully',
 	logfile,
-- 
1.5.6.5