From 6c5f546e8626447a8a44cc66e7d6e2e20caf974b Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Thu, 24 Mar 2016 14:12:09 -0700 Subject: [PATCH] Fixing check registration in perform sync --- client/client.go | 2 +- client/consul/sync.go | 28 ++++++++++++++++------------ client/driver/docker.go | 2 +- client/driver/exec.go | 2 +- client/driver/java.go | 2 +- client/driver/qemu.go | 2 +- client/driver/raw_exec.go | 2 +- client/driver/rkt.go | 2 +- 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/client/client.go b/client/client.go index 3192318ad..cf1dbbf76 100644 --- a/client/client.go +++ b/client/client.go @@ -1205,7 +1205,7 @@ func (c *Client) syncConsul() { } } if err := c.consulService.KeepServices(runningTasks); err != nil { - c.logger.Printf("[DEBUG] error removing services from non-running tasks: %v", err) + c.logger.Printf("[DEBUG] client: error removing services from non-running tasks: %v", err) } case <-c.shutdownCh: c.logger.Printf("[INFO] client: shutting down consul sync") diff --git a/client/consul/sync.go b/client/consul/sync.go index dc1410886..8c02a0fda 100644 --- a/client/consul/sync.go +++ b/client/consul/sync.go @@ -25,7 +25,7 @@ type ConsulService struct { allocID string trackedServices map[string]*consul.AgentService - trackedChecks map[string]*structs.ServiceCheck + trackedChecks map[string]*consul.AgentCheckRegistration logger *log.Logger @@ -92,7 +92,7 @@ func NewConsulService(config *ConsulConfig, logger *log.Logger, allocID string) allocID: allocID, logger: logger, trackedServices: make(map[string]*consul.AgentService), - trackedChecks: make(map[string]*structs.ServiceCheck), + trackedChecks: make(map[string]*consul.AgentCheckRegistration), shutdownCh: make(chan struct{}), } @@ -104,7 +104,7 @@ func (c *ConsulService) SyncTask(task *structs.Task) error { var mErr multierror.Error c.task = task taskServices := make(map[string]*consul.AgentService) - taskChecks := make(map[string]*structs.ServiceCheck) + taskChecks := make(map[string]*consul.AgentCheckRegistration) // Register Services and Checks that we don't know about or has changed for _, service := range task.Services { @@ -123,14 +123,14 @@ func (c *ConsulService) SyncTask(task *structs.Task) error { taskServices[srv.ID] = srv for _, chk := range service.Checks { - checkID := chk.Hash(srv.ID) - if _, ok := c.trackedChecks[checkID]; !ok { - if err := c.registerCheck(chk, srv); err != nil { + chkReg := c.createCheck(chk, srv) + if _, ok := c.trackedChecks[chkReg.ID]; !ok { + if err := c.registerCheck(chkReg); err != nil { mErr.Errors = append(mErr.Errors, err) } } - c.trackedChecks[checkID] = chk - taskChecks[checkID] = chk + c.trackedChecks[chkReg.ID] = chkReg + taskChecks[chkReg.ID] = chkReg } } @@ -206,7 +206,11 @@ func (c *ConsulService) KeepServices(tasks []*structs.Task) error { } // registerCheck registers a check definition with Consul -func (c *ConsulService) registerCheck(check *structs.ServiceCheck, service *consul.AgentService) error { +func (c *ConsulService) registerCheck(chkReg *consul.AgentCheckRegistration) error { + return c.client.Agent().CheckRegister(chkReg) +} + +func (c *ConsulService) createCheck(check *structs.ServiceCheck, service *consul.AgentService) *consul.AgentCheckRegistration { chkReg := consul.AgentCheckRegistration{ ID: check.Hash(service.ID), Name: check.Name, @@ -230,7 +234,7 @@ func (c *ConsulService) registerCheck(check *structs.ServiceCheck, service *cons case structs.ServiceCheckScript: chkReg.TTL = check.Interval.String() } - return c.client.Agent().CheckRegister(&chkReg) + return &chkReg } // createService creates a Consul AgentService from a Nomad Service @@ -315,8 +319,8 @@ func (c *ConsulService) performSync() error { } } for checkID, check := range c.trackedChecks { - if chk, ok := cChecks[checkID]; !ok { - if err := c.registerCheck(check, c.trackedServices[chk.ServiceID]); err != nil { + if _, ok := cChecks[checkID]; !ok { + if err := c.registerCheck(check); err != nil { mErr.Errors = append(mErr.Errors, err) } } diff --git a/client/driver/docker.go b/client/driver/docker.go index cf518a6a7..074fbe5e7 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -645,7 +645,7 @@ func (d *DockerDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle waitCh: make(chan *cstructs.WaitResult, 1), } if err := exec.RegisterServices(); err != nil { - d.logger.Printf("[ERR] driver.docker: error registering services with consul for task: %v", task) + d.logger.Printf("[ERR] driver.docker: error registering services with consul for task: %v, err: %v", task.Name, err) } go h.run() return h, nil diff --git a/client/driver/exec.go b/client/driver/exec.go index c6bb8b0e2..bf81fcbe2 100644 --- a/client/driver/exec.go +++ b/client/driver/exec.go @@ -142,7 +142,7 @@ func (d *ExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, waitCh: make(chan *cstructs.WaitResult, 1), } if err := exec.RegisterServices(); err != nil { - d.logger.Printf("[ERR] driver.exec: error registering services with consul for task: %v", task) + d.logger.Printf("[ERR] driver.exec: error registering services with consul for task: %v, err: %v", task.Name, err) } go h.run() return h, nil diff --git a/client/driver/java.go b/client/driver/java.go index d980253a8..fab28e934 100644 --- a/client/driver/java.go +++ b/client/driver/java.go @@ -201,7 +201,7 @@ func (d *JavaDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, waitCh: make(chan *cstructs.WaitResult, 1), } if err := h.executor.RegisterServices(); err != nil { - d.logger.Printf("[ERR] driver.java: error registering services with consul for task: %v", task) + d.logger.Printf("[ERR] driver.java: error registering services with consul for task: %v, err: %v", task.Name, err) } go h.run() return h, nil diff --git a/client/driver/qemu.go b/client/driver/qemu.go index 1d1ac80ff..af5f1ac3f 100644 --- a/client/driver/qemu.go +++ b/client/driver/qemu.go @@ -224,7 +224,7 @@ func (d *QemuDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, } if err := h.executor.RegisterServices(); err != nil { - h.logger.Printf("[ERR] driver.qemu: error registering services: %v", err) + h.logger.Printf("[ERR] driver.qemu: error registering services for task: %v, err: %v", task.Name, err) } go h.run() return h, nil diff --git a/client/driver/raw_exec.go b/client/driver/raw_exec.go index 41767cea5..97ea29257 100644 --- a/client/driver/raw_exec.go +++ b/client/driver/raw_exec.go @@ -134,7 +134,7 @@ func (d *RawExecDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandl waitCh: make(chan *cstructs.WaitResult, 1), } if err := h.executor.RegisterServices(); err != nil { - h.logger.Printf("[ERR] driver.raw_exec: error registering services with consul: %v", err) + h.logger.Printf("[ERR] driver.raw_exec: error registering services with consul for task: %v, err: %v", task.Name, err) } go h.run() return h, nil diff --git a/client/driver/rkt.go b/client/driver/rkt.go index 09870a2e5..7927df378 100644 --- a/client/driver/rkt.go +++ b/client/driver/rkt.go @@ -269,7 +269,7 @@ func (d *RktDriver) Start(ctx *ExecContext, task *structs.Task) (DriverHandle, e waitCh: make(chan *cstructs.WaitResult, 1), } if h.executor.RegisterServices(); err != nil { - h.logger.Printf("[ERR] driver.rkt: error registering services: %v", err) + h.logger.Printf("[ERR] driver.rkt: error registering services for task: %v, err: %v", task.Name, err) } go h.run() return h, nil