[Ocfs2-test-devel] [PATCH 4/6] ocfs2-test: recovery_load - Converted from LAM/MPI to OpenMPI.

[Marcos Matsunaga]

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

diff --git a/programs/recovery_load/recovery_load.py b/programs/recovery_load/recovery_load.py
index 2276428..bdb2516 100644
--- a/programs/recovery_load/recovery_load.py
+++ b/programs/recovery_load/recovery_load.py
@@ -188,29 +188,33 @@ if NodeIndex == nodelen-1:
 #
 # first. Start MPI
 if not Client:
-	o2tf.StartMPI(DEBUGON, ','.join(nodelist), logfile)
+	o2tf.OpenMPIInit(DEBUGON, ','.join(nodelist), logfile, 'ssh')
 
 	if DEBUGON:
 		cmdline = os.path.join(config.BINDIR, 'recovery_load.py -D')
 	else:
 		cmdline = os.path.join(config.BINDIR, 'recovery_load.py')
 # Extract the tar file
-	o2tf.lamexec( DEBUGON, nproc, config.WAIT, 
+	o2tf.openmpi_run( DEBUGON, nproc, 
 		str('%s -e -d %s -l %s -n %s -t %s' % \
 		(cmdline, options.directory,
 		options.logfile,
 		options.nodes, tarfile) ),
 		','.join(nodelist),
-		logfile)
+		'ssh',
+		logfile,
+		'WAIT')
 # run the find command
 	raw_input('Extraction completed. Press ENTER to continue.')
-	o2tf.lamexec( DEBUGON, nproc, config.WAIT, 
+	o2tf.openmpi_run( DEBUGON, nproc, 
 		str('%s -f -d %s -l %s -n %s' % \
 		(cmdline, options.directory,
 		options.logfile,
 		options.nodes) ),
 		','.join(nodelist),
-		logfile)
+		'ssh',
+		logfile,
+		'WAIT')
 else:
 	if options.extract:
 		Populate()
-- 
1.5.6.5