Skip to content

Commit

Permalink
Merge pull request #400 from flaviocirillo/development
Browse files Browse the repository at this point in the history
Improved robustness for stale information into Designer
  • Loading branch information
smartfog authored Jul 3, 2024
2 parents 88db58d + 829968a commit 8320e8e
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 3 deletions.
8 changes: 5 additions & 3 deletions master/taskMgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,9 +314,11 @@ func (flow *FogFlow) expandExecutionPlan(entityID string, inputSubscription *Inp
if newOptimalWorkerID != task.WorkerID {
INFO.Println("[Task migration]:", task.TaskID, " migrated from ", task.WorkerID, " to ", newOptimalWorkerID)

removeTaskAction := flow.removeExistingTask(task)
deploymentActions = append(deploymentActions, removeTaskAction)

if (task.WorkerID != ""){
removeTaskAction := flow.removeExistingTask(task)
deploymentActions = append(deploymentActions, removeTaskAction)
}

task.WorkerID = newOptimalWorkerID

addTaskAction := flow.addNewTask(task)
Expand Down
53 changes: 53 additions & 0 deletions release/latest/cloud/config-template.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"my_hostip": "172.17.0.1",
"physical_location":{
"longitude": 139,
"latitude": 35
},
"site_id": "001",
"logging":{
"info":"stdout",
"error":"stdout",
"protocol": "stdout",
"debug": "stdout"
},
"discovery": {
"http_port": 8090,
"storeOnDisk": true,
"delayStoreOnFile" : 3
},
"broker": {
"http_port": 8070,
"heartbeat_interval": 30
},
"master": {
"ngsi_agent_port": 1060,
"rest_api_port": 8010,
"infinite_reconnection_tries": true
},
"worker": {
"container_autoremove": false,
"start_actual_task": true,
"capacity": 8,
"heartbeat_interval": 30,
"detection_duration": 10,
"infinite_reconnection_tries": true
},
"designer": {
"webSrvPort": 8080,
"agentPort": 1030,
"ldAgentPort":1090,
"doNotInitApplications":true
},
"rabbitmq": {
"port": 5672,
"username": "admin",
"password":"mypass"
},
"https": {
"enabled" : false
},
"persistent_storage": {
"port": 9082
}
}

0 comments on commit 8320e8e

Please sign in to comment.