From d7e21ad16473dbc2b12f20c6ef34a09f73863912 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Sat, 07 Jan 2017 20:55:10 +0000 Subject: [PATCH] Copying all tapes to all remotes. Copy is possible to configured directory. Must fix runs --- trisurf/tsmgr.py | 65 ++++++++++++++++++++++---------- 1 files changed, 44 insertions(+), 21 deletions(-) diff --git a/trisurf/tsmgr.py b/trisurf/tsmgr.py index ffe9278..419c26b 100644 --- a/trisurf/tsmgr.py +++ b/trisurf/tsmgr.py @@ -50,7 +50,7 @@ action_group.add_argument('--jump-to-ipython', help='loads the variables and jumps to IPython shell', action="store_true") action_group.add_argument('-p','--preview',help='preview last VTU shape',action='store_true') parser.add_argument('--force', help='if dangerous operation (killing all the processes) is requested, this flag is required to execute the operation. Otherwise, the request will be ignored.', action="store_true") - parser.add_argument('-H', '--host', nargs=1, help='specifies which host is itended for the operation. Defauts to localhost for all operations except --status and --version, where all configured hosts are assumed.') + parser.add_argument('-H', '--host', nargs='+', help='specifies which host is itended for the operation. Defauts to localhost for all operations except --status and --version, where all configured hosts are assumed.') parser.add_argument('--html', help='Generate HTML output', action="store_true") 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") @@ -74,6 +74,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.snapshotFilename) + 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 +96,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 @@ -187,7 +201,7 @@ exit(0) -def analyze(args,host,a_dict, analysis): +def analyze(args,host,a_dict, analysis,hosts): if len(a_dict)==0: print ('Error: no analyses are specified in the tsmgr.start()!') exit(1) @@ -201,8 +215,15 @@ print("Analysis '"+anal+"' is not known. Available analyses: "+", ".join(a_dict.keys())+".") exit(0) for anal in analysis: - a_dict[anal](host['runs'][i-1],host=host) + retval=a_dict[anal](host['runs'][i-1],host=host, args=args, hosts=hosts) + #try: + if(retval): + exit(0) + #except: + # pass + + def perform_action(args,host,**kwargs): #find which flags have been used and act upon them. -r -s -k -v -c --delete-comment are mutually exclusive, so only one of them is active @@ -225,7 +246,7 @@ embed() exit(0) elif args['analysis']!= None: - analyze(args,host,kwargs.get('analyses', {}), args['analysis']) + analyze(args,host,kwargs.get('analyses', {}), args['analysis'],kwargs.get('hosts',None)) exit(0) else: #version requested print(getTrisurfVersion()) @@ -252,7 +273,6 @@ def start(hosts,argv=sys.argv[1:], analyses={}): args=vars(ParseCLIArguments(argv)) - #print(vars(args)) #Backward compatibility... If running just on localmode, the host specification is unnecessary. Check if only Runs are specified try: test_host=hosts[0]['name'] @@ -262,6 +282,7 @@ #find the host at which the action is attended if args['host']==None: + #Only status and version commands are automatically executed on all the hosts. stopping or starting or other actions is not! if(args['status']==False and args['version']==False): hosts=getListOfHostConfigurationByHostname(hosts,socket.gethostname()) else: @@ -269,20 +290,22 @@ if len(hosts)==0: print ('Hostname "{}" does not exist in configuration file. Please check the spelling'.format(args['host'][0])) exit(1) - if not args['local_only']: hosts=copyConfigAndConnect(hosts) - #do local stuff: for host in hosts: if host['name'] == socket.gethostname(): if(args['html']): - print("Host <font color='orange'>"+host['name']+"</font> reports the following:") + print("Host <font color='orange'>"+host['name']+"</font> reports:") else: - print("Host "+bcolors.WARNING+host['name']+bcolors.ENDC+" reports the following:") - perform_action(args,host, analyses=analyses) + 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('python3 ./'+remote_dir+'/'+main.__file__+' -x '+" ".join(argv)) for line in output: print(line.replace('\n','')) -- Gitblit v1.9.3