From a94d217487a222526e303c443aaa3370321447ae Mon Sep 17 00:00:00 2001
From: gongweibao <weibao.gong@gmail.com>
Date: Thu, 6 Jul 2017 07:09:55 +0000
Subject: [PATCH] add TaskID

---
 go/master/client.go  |  4 ++--
 go/master/service.go | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/go/master/client.go b/go/master/client.go
index b6ca8cad15a..bf2612d91b6 100644
--- a/go/master/client.go
+++ b/go/master/client.go
@@ -113,8 +113,8 @@ func (c *Client) taskFinished(taskID int) error {
 }
 
 // TaskFailed tell the master server as task is failed.
-func (c *Client) taskFailed(taskID int, epoch int) error {
-	return c.conn.Call("Service.TaskFinished", taskID, epoch)
+func (c *Client) taskFailed(taskID TaskID) error {
+	return c.conn.Call("Service.TaskFinished", taskID, nil)
 }
 
 // NextRecord returns next record in the dataset.
diff --git a/go/master/service.go b/go/master/service.go
index 29ff63bcc90..b1334a2d8e6 100644
--- a/go/master/service.go
+++ b/go/master/service.go
@@ -396,8 +396,14 @@ func (s *Service) TaskFinished(taskID int, dummy *int) error {
 	return err
 }
 
-// TaskFailed tell the service that a task is failed.
-func (s *Service) TaskFailed(taskID int, epoch int) error {
+// TaskID is a struct which client uses for reports failure.
+type TaskID struct {
+	ID    int
+	Epoch int
+}
+
+// TaskFailed tells the service that a task is failed.
+func (s *Service) TaskFailed(taskID TaskID, dummy *int) error {
 	select {
 	case <-s.ready:
 	}
@@ -405,13 +411,13 @@ func (s *Service) TaskFailed(taskID int, epoch int) error {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	t, ok := s.taskQueues.Pending[taskID]
+	t, ok := s.taskQueues.Pending[taskID.ID]
 	if !ok {
 		err := errors.New("pending task not found")
 		log.WithFields(s.logFields()).Warningln("TaskFailed:Pending task #%d not found.", taskID)
 		return err
 	}
 
-	s.procFailedTask(t, epoch)
+	s.procFailedTask(t, taskID.Epoch)
 	return nil
 }
-- 
GitLab