[core] Use short UID for task ID and executor ID

AliceO2Group · Oct 2, 2020 · 18359fa · 18359fa
1 parent 17928aa
commit 18359fa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/core/scheduler.go b/core/scheduler.go
@@ -39,9 +39,9 @@ import (
 
 	"github.com/AliceO2Group/Control/common/controlmode"
 	"github.com/AliceO2Group/Control/common/utils"
+	"github.com/AliceO2Group/Control/common/utils/uid"
 	"github.com/AliceO2Group/Control/core/task/channel"
 	"github.com/AliceO2Group/Control/core/workflow"
-	"github.com/rs/xid"
 	"github.com/spf13/viper"
 
 	"github.com/AliceO2Group/Control/common/event"
@@ -557,8 +557,10 @@ func resourceOffers(state *internalState, fidStore store.Singleton) events.Handl
 					targetExecutorId                 = mesos.ExecutorID{}
 				)
 
+				// If there are no executors provided by the offer,
+				// we start a new one by generating a new ID
 				if len(offer.ExecutorIDs) == 0 {
-					targetExecutorId.Value = xid.New().String()
+					targetExecutorId.Value = uid.New().String()
 				} else {
 					targetExecutorId.Value = offer.ExecutorIDs[0].Value
 				}

diff --git a/core/task/manager.go b/core/task/manager.go
@@ -33,10 +33,8 @@ import (
 	"sync"
 
 	"github.com/AliceO2Group/Control/common/gera"
-	"github.com/AliceO2Group/Control/common/utils/uid"
-	"github.com/rs/xid"
-
 	"github.com/AliceO2Group/Control/common/utils"
+	"github.com/AliceO2Group/Control/common/utils/uid"
 	"github.com/AliceO2Group/Control/core/repos"
 	"github.com/AliceO2Group/Control/core/the"
 	"gopkg.in/yaml.v3"
@@ -96,7 +94,7 @@ func (m *Manager) NewTaskForMesosOffer(
 	descriptor *Descriptor,
 	localBindMap channel.BindMap,
 	executorId mesos.ExecutorID) (t *Task) {
-	newId := xid.New().String()
+	newId := uid.New().String()
 	t = &Task{
 		name:         fmt.Sprintf("%s#%s", descriptor.TaskClassName, newId),
 		parent:       descriptor.TaskRole,

diff --git a/core/task/task.go b/core/task/task.go
@@ -408,7 +408,7 @@ func (t *Task) BuildPropertyMap(bindMap channel.BindMap) (propMap controlcommand
 			// Post-processing for the ToPtree mechanism.
 			// The ToPtree function has no access to the keys of propMap, so we need
 			// to do a second pass here.
-			// For each run of ToPtree, a temporary __ptree__:<syntax>:<xid> key is created
+			// For each run of ToPtree, a temporary __ptree__:<syntax>:<uid> key is created
 			// and the value of the key that pointed to ToPtree is set to this key.
 			// We need to clear both of these keys, and create a new one like
 			// __ptree__:<syntax>:<key> with the plain payload.

diff --git a/core/workflow/template/stack.go b/core/workflow/template/stack.go
@@ -33,8 +33,8 @@ import (
 	texttemplate "text/template"
 
 	"github.com/AliceO2Group/Control/common/utils"
+	"github.com/AliceO2Group/Control/common/utils/uid"
 	"github.com/AliceO2Group/Control/core/the"
-	"github.com/rs/xid"
 	"github.com/sirupsen/logrus"
 )
 
@@ -74,7 +74,7 @@ func MakeToPtreeFunc(varStack map[string]string, propMap map[string]string) ToPt
 			syntaxLC = "json"
 		}
 
-		ptreeId := fmt.Sprintf("__ptree__:%s:%s", syntaxLC, xid.New().String())
+		ptreeId := fmt.Sprintf("__ptree__:%s:%s", syntaxLC, uid.New().String())
 		propMap[ptreeId] = localPayload
 		return ptreeId
 	}