Samo Penic
2018-12-23 1bc9bba5a3bb201345fcf6b690b1c884f8ab8a7d
tsclient.py
@@ -54,7 +54,7 @@
      status=client_data['status']
      return (rid,tape,vtu,status)
   else:
      print(response.text)
      #print(response.text)
      if(response.status_code==400):
         raise ValueError
      else:
@@ -178,15 +178,19 @@
            print("[{}] Could not get CID.".format(self.id))
            self.sleep(10)
            continue
         #print("Got CID. getting RID.")
         client_ping_time_elapsed=0
         concurrent_runs=client_ping(self.conn_address,cid)
         print("[{}] Connected and got client ID {}.".format(self.id, cid))
         try:
            concurrent_runs=client_ping(self.conn_address,cid)
            client_ping_time_elapsed=0
         except:
            self.sleep(10)
            continue
         self.subrunsStartStop(concurrent_runs)
         while(not self.isStopped()): #successfully registered, now start pinging and searching for job
            try:
               (rid,tape,vtu,status)=get_run(self.conn_address,cid)
            except NameError:
               print("[{}] Could not get RID.".format(self.id))
               #print("[{}] Could not get RID.".format(self.id))
               self.sleep(10)
               client_ping_time_elapsed+=10
               if(client_ping_time_elapsed>=self.max_client_ping_time_elapsed):
@@ -252,7 +256,7 @@
                     try:
                        ping_run(self.conn_address, cid, rid)
                     except:
                        print("[{}] Could not ping.".format(self.id))
                        print("[{}] Could not prolong a lease on the run.".format(self.id))
                        self.p.terminate()
                        self.p=None
                        removeDir(self.workingdir.fullpath())
@@ -275,7 +279,15 @@
                  self.sleep(self.update_seconds-1)
                  client_ping_time_elapsed+=self.update_seconds
                  if(client_ping_time_elapsed>self.max_client_ping_time_elapsed-self.update_seconds/2):
                     concurrent_runs=client_ping(self.conn_address,cid)
                     try:
                        concurrent_runs=client_ping(self.conn_address,cid)
                     except:
                        print("[{}] Could not client ping.".format(self.sid))
                        self.p.terminate()
                        self.p=None
                        removeDir(self.workingdir.fullpath())
                        self.workingdir=None
                        break
                     self.subrunsStartStop(concurrent_runs)
                     client_ping_time_elapsed=0