Merge branch 'master' into test

nm/msg_resp.go

@@ -83,13 +83,13 @@ func HeartbeatResp(params ...interface{}) *nodemanagerV1.WorkerMessage {
 func SubmitResourceMapRes(params ...interface{}) *nodemanagerV1.WorkerMessage {
 	log.Info("Submit resource map response received params: ", params)
 
-	existTaskIdIndexes := params[0].([]uint64)
+	existModelIdIndexes := params[0].([]uint64)
 	existMap := bitmap.New(1000000000)
-	for i := 0; i < len(existTaskIdIndexes); i++ {
-		taskIdIndex := existTaskIdIndexes[i]
-		err := existMap.Set(taskIdIndex)
+	for i := 0; i < len(existModelIdIndexes); i++ {
+		modelIdIndex := existModelIdIndexes[i]
+		err := existMap.Set(modelIdIndex)
 		if err != nil {
-			log.WithField("taskId index", taskIdIndex).WithField("error", err).Error("Error setting task id index")
+			log.WithField("model id index", modelIdIndex).WithField("error", err).Error("Error setting task id index")
 			return nil
 		}
 	}
@@ -102,10 +102,10 @@ func SubmitResourceMapRes(params ...interface{}) *nodemanagerV1.WorkerMessage {
 	bootUpModelIdIndexes := params[1].([]uint64)
 	bootUpMap := bitmap.New(1000000000)
 	for i := 0; i < len(bootUpModelIdIndexes); i++ {
-		taskIdIndex := bootUpModelIdIndexes[i]
-		err := bootUpMap.Set(taskIdIndex)
+		modelIdIndex := bootUpModelIdIndexes[i]
+		err := bootUpMap.Set(modelIdIndex)
 		if err != nil {
-			log.WithField("taskId index", taskIdIndex).WithField("error", err).Error("Error setting task id index")
+			log.WithField("modelId index", modelIdIndex).WithField("error", err).Error("Error setting task id index")
 			return nil
 		}
 	}