compute ips and update add port

Author: FirmlyReality

src/master/taskmgr.py

@@ -47,6 +47,11 @@ def __init__(self, configinfo, vnodeinfo, taskinfo, priority, max_size):
     def __lt__(self, other):
         return self.priority < other.priority
 
+    def gen_ips_from_base(self,base_ip):
+        self.ips = []
+        for  i in range(task.max_size):
+            self.ips.append(int_to_ip(base_ip + self.task_base_ip + i + 2))
+
     def get_one_resources_need(self):
         return self.vnodeinfo.vnode.instance
 
@@ -219,8 +224,7 @@ def task_processor(self, task, vnodes_workers):
         # properties for transactio
 
         self.acquire_task_net(task)
-        #task.ips = []
-        #for i in
+        task.gen_ips_from_base(self.base_ip)
         #need to create hosts
         [success, gwip] = self.setup_tasknet(task,[w[1] for w in vnodes_workers])
         if not success:
@@ -246,7 +250,7 @@ def task_processor(self, task, vnodes_workers):
             #if not username in self.user_containers.keys():
                 #self.user_containers[username] = []
             #self.user_containers[username].append(container_name)
-            ipaddr = int_to_ip(self.base_ip + task.task_base_ip + vid%task.max_size + 2)
+            ipaddr = task.ips[vid%task.max_size]
             brname = "docklet-batch-%s-%s"%(username, taskid)
             networkinfo = Network(ipaddr=ipaddr, gateway=gwip, masterip=self.masterip, brname=brname)
             vnode.network = networkinfo

src/protos/rpc.proto

@@ -76,6 +76,7 @@ message VNode {
 	Instance instance = 2;		// 实例配置
 	repeated Mount mount = 3;	// 挂载配置
   Network network = 4; //网络配置
+	string hostname = 5; //主机名
 }
 
 message Network {

src/utils/nettools.py

@@ -195,7 +195,7 @@ def add_port(bridge, port):
     @staticmethod
     def add_port_internal(bridge, port):
         try:
-            subprocess.run(['ovs-vsctl', 'add-port', str(bridge), str(port), '--', 'set', 'interface', str(port), 'type=internal'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True)
+            subprocess.run(['ovs-vsctl', '--may-exist', 'add-port', str(bridge), str(port), '--', 'set', 'interface', str(port), 'type=internal'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True)
             return [True, str(port)]
         except subprocess.CalledProcessError as suberror:
             return [False, "add port failed : %s" % suberror.stdout.decode('utf-8')]

src/worker/taskworker.py

@@ -20,6 +20,7 @@
 from worker import ossmounter
 from protos import rpc_pb2, rpc_pb2_grpc
 from utils.nettools import netcontrol
+from master.network import getip
 
 _ONE_DAY_IN_SECONDS = 60 * 60 * 24
 MAX_RUNNING_TIME = _ONE_DAY_IN_SECONDS
@@ -53,6 +54,10 @@ def __init__(self):
             logger.info("Get master ip address: %s" % (self.master_ip))
         self.master_port = env.getenv('BATCH_MASTER_PORT')
 
+        # get worker ip
+        self.worker_ip = getip(env.getenv('NETWORK_DEVICE'))
+        logger.info("Worker ip is :%s"%self.worker_ip)
+
         self.imgmgr = imagemgr.ImageMgr()
         self.fspath = env.getenv('FS_PREFIX')
         self.confpath = env.getenv('DOCKLET_CONF')
@@ -197,7 +202,8 @@ def start_vnode(self, request, context):
 
         logger.info('start container %s success' % lxcname)
 
-        netcontrol.setup_gre(brname, masterip)
+        if masterip != self.worker_ip:
+            netcontrol.setup_gre(brname, masterip)
 
         #add GPU
         [success, msg] = self.add_gpu_device(lxcname,gpu_need)