[core] Fix NumberOfHosts and implement NumberOfTasks

AliceO2Group · Jul 11, 2023 · 3d8446c · 3d8446c
1 parent 9f4448b
commit 3d8446c
Show file tree

Hide file tree

Showing 7 changed files with 1,220 additions and 1,189 deletions.
diff --git a/coconut/protos/o2control.pb.go b/coconut/protos/o2control.pb.go
diff --git a/coconut/protos/o2control_grpc.pb.go b/coconut/protos/o2control_grpc.pb.go
diff --git a/core/environment/environment.go b/core/environment/environment.go
@@ -29,6 +29,7 @@ package environment
 import (
 	"errors"
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -883,10 +884,18 @@ func (env *Environment) GetAllHosts() []string {
 	}
 
 	tasks := env.workflow.GetTasks()
-	out := make([]string, len(tasks))
-	for i, t := range tasks {
-		out[i] = t.GetHostname()
+	hostSet := make(map[string]struct{})
+	for _, t := range tasks {
+		hostSet[t.GetHostname()] = struct{}{}
+	}
+
+	out := make([]string, len(hostSet))
+	i := 0
+	for hostname, _ := range hostSet {
+		out[i] = hostname
+		i++
 	}
+	sort.Strings(out)
 	return out
 }
 

diff --git a/core/protos/o2control.pb.go b/core/protos/o2control.pb.go
diff --git a/core/protos/o2control.proto b/core/protos/o2control.proto
@@ -189,6 +189,7 @@ message EnvironmentInfo {
     string description = 12;
     int32 numberOfHosts = 13;
     map<string, string> integratedServicesData = 14;
+    int32 numberOfTasks = 15;
 }
 
 message NewEnvironmentRequest {

diff --git a/core/protos/o2control_grpc.pb.go b/core/protos/o2control_grpc.pb.go
diff --git a/core/server.go b/core/server.go
@@ -246,6 +246,7 @@ func (m *RpcServer) GetEnvironments(cxt context.Context, request *pb.GetEnvironm
 			UserVars:               userVars,
 			NumberOfFlps:           int32(len(env.GetFLPs())),
 			NumberOfHosts:          int32(len(env.GetAllHosts())),
+			NumberOfTasks:          int32(len(tasks)),
 			IntegratedServicesData: isEnvData,
 		}
 		if request.GetShowTaskInfos() {