From 0d561cb2531d293ff8f4cee2f73a242e56547139 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 20 Jan 2017 21:03:21 +0000
Subject: [PATCH] Now commiting correctly. Really. I promise
---
trisurf/tsmgr.py | 61 ++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/trisurf/tsmgr.py b/trisurf/tsmgr.py
index ca590c4..101c84c 100644
--- a/trisurf/tsmgr.py
+++ b/trisurf/tsmgr.py
@@ -15,7 +15,7 @@
else:
from urlparse import urlparse
from vtk import *
- from . import VTKRendering
+
#import io
from IPython import embed
@@ -55,6 +55,7 @@
parser.add_argument('-n', nargs='+', metavar='PROC_NO', type=int, help='OBSOLETE. Specifies process numbers.')
parser.add_argument('-R','--raw',help='print status and the rest of the information in raw format', action="store_true")
parser.add_argument('-x','--local-only',help='do not attempt to contact remote hosts. Run all operations only on local machine',action='store_true')
+ parser.add_argument('--originating-host',nargs=1,help='specify which host started the remote connections. Useful mainly fo internal functionaly of tsmgr and analyses.')
args = parser.parse_args(arguments)
return args
@@ -74,6 +75,15 @@
def copyConfigAndConnect(hosts):
print("Connecting to remote hosts and copying config files, tapes and snapshots")
+ #create a list of files to be copied across all the remote hosts
+ file_list=[]
+ for h in hosts:
+ for r in h['runs']:
+ if(r.isFromSnapshot):
+ file_list.append(r.snapshotFile)
+ else:
+ file_list.append(r.tapeFilename)
+ file_list.append(main.__file__)
for host in hosts:
if(host['name'] !=socket.gethostname()): #if I am not the computer named in host name
try:
@@ -87,16 +97,21 @@
rm=Remote.Connection(hostname=host['address'],username=username, port=port)
rm.connect()
# print ("Sendind file:"+main.__file__)
- rm.send_file(main.__file__,'remote_control.py')
- for run in host['runs']:
- try:
- rm.send_file(run.tapeFile,run.tapeFile)
- except:
- pass
- try:
- rm.send_file(run.snapshotFile,run.snapshotFile)
- except:
- pass
+ if('remotebasepath' in host):
+ remote_dir=host['remotebasepath']
+ else:
+ remote_dir='trisurf_simulations'
+ rm.send_multiple_files_in_directory(file_list,remote_dir)
+# rm.send_file(main.__file__,'remote_control.py')
+# for run in host['runs']:
+# try:
+# rm.send_file(run.tapeFile,run.tapeFile)
+# except:
+# pass
+# try:
+# rm.send_file(run.snapshotFile,run.snapshotFile)
+# except:
+# pass
host['_conn']= rm
# we are connected to all hosts...
return hosts
@@ -241,12 +256,16 @@
def preview_vtu(args,host):
- #only for localhost at the moment
- if sys.version_info>=(3,0):
- print("Preview works only with python 2.7")
- exit(1)
+ from . import VTKRendering
+ target_runs=getTargetRunIdxList(args)
+ if target_runs==None:
+ target_runs=list(range(1,len(host['runs'])+1))
if host['name'] == socket.gethostname():
- VTKRendering.Renderer(args,host)
+ for i in target_runs:
+ VTKRendering.Renderer(args,host,host['runs'][i-1])
+ else:
+ print("VTK rendering currently works on localhost only!")
+
def getListOfHostConfigurationByHostname(hosts,host):
rhost=[]
@@ -287,7 +306,15 @@
print("Host "+bcolors.WARNING+host['name']+bcolors.ENDC+" reports:")
perform_action(args,host, analyses=analyses, hosts=hosts)
elif not args['local_only']:
- output=host['_conn'].execute('python3 ./remote_control.py -x '+" ".join(argv))
+ if('remotebasepath' in host):
+ remote_dir=host['remotebasepath']
+ else:
+ remote_dir='trisurf_simulations'
+ #output=host['_conn'].execute('cd '+remote_dir)
+ #print(remote_dir)
+ #print(main.__file__)
+ #print('python3 '+main.__file__+' -x '+" ".join(argv))
+ output=host['_conn'].execute('cd '+remote_dir+ '; python3 '+main.__file__+' -x --originating-host ' +socket.gethostname()+" "+" ".join(argv))
for line in output:
print(line.replace('\n',''))
--
Gitblit v1.9.3