bugfix on get ip & port in host or user defined network mode

mesos/handler.go

@@ -146,15 +146,17 @@ func (s *Scheduler) updateHandler(event *mesosproto.Event) {
 				task.ContainerName = cname
 			}
 
-			if settings := cinfos[0].NetworkSettings; settings != nil {
-				if net := settings.Networks; net != nil && len(net) > 0 {
-					for _, cfg := range net {
-						if cfg.IPAMConfig != nil {
-							task.IP = cfg.IPAMConfig.IPv4Address
-						} else {
-							task.IP = cfg.IPAddress
+			if task.IP == "" {
+				if settings := cinfos[0].NetworkSettings; settings != nil {
+					if net := settings.Networks; net != nil && len(net) > 0 {
+						for _, cfg := range net {
+							if cfg.IPAMConfig != nil {
+								task.IP = cfg.IPAMConfig.IPv4Address
+							} else {
+								task.IP = cfg.IPAddress
+							}
+							break
 						}
-						break
 					}
 				}
 			}

mesos/scheduler.go

@@ -802,13 +802,16 @@ func (s *Scheduler) launch(offers []*Offer, tasks []*Task) error {
 
 	var idx int
 	for _, task := range tasks {
-		num := len(task.cfg.PortMappings)
-		if idx+num > len(ports) {
-			return errors.New("no enough ports avaliable")
-		}
+		// port allocated only on bridge network.
+		if task.cfg.Network == "bridge" {
+			num := len(task.cfg.PortMappings)
+			if idx+num > len(ports) {
+				return errors.New("no enough ports avaliable")
+			}
 
-		task.cfg.Ports = ports[idx : idx+num]
-		idx += num
+			task.cfg.Ports = ports[idx : idx+num]
+			idx += num
+		}
 
 		task.AgentId = &mesosproto.AgentID{
 			Value: proto.String(offers[0].GetAgentId()),
@@ -834,6 +837,10 @@ func (s *Scheduler) launch(offers []*Offer, tasks []*Task) error {
 
 		dbtask.AgentId = t.AgentId.GetValue()
 		dbtask.IP = t.cfg.IP
+		if t.cfg.Network == "host" || t.cfg.Network == "bridge" {
+			dbtask.IP = offers[0].GetHostname()
+		}
+
 		dbtask.Ports = t.cfg.Ports
 
 		if err := s.db.UpdateTask(appId, dbtask); err != nil {

types/task.go

@@ -121,6 +121,13 @@ func NewTaskConfig(spec *Version, idx int) *TaskConfig {
 		cfg.IP = spec.IPs[idx]
 	}
 
+	// port is specified on host & user network mode.
+	if cfg.Network != "bridge" { // none ?
+		for _, pm := range cfg.PortMappings {
+			cfg.Ports = append(cfg.Ports, uint64(pm.ContainerPort))
+		}
+	}
+
 	return cfg
 }