Merge pull request #224 from gianlucam76/fix

Fix store result
projectsveltos · Oct 11, 2023 · 369b74f · 369b74f
2 parents 63c52ba + 33de363
commit 369b74f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/lib/deployer/worker.go b/lib/deployer/worker.go
@@ -167,15 +167,15 @@ func processRequests(ctx context.Context, d *deployer, i int, logger logr.Logger
 			applicant, featureID, _ := getApplicatantAndFeatureFromKey(params.key)
 			cleanup, err := getIsCleanupFromKey(params.key)
 			if err != nil {
-				storeResult(d, params.key, err, params.handler, params.metric, logger)
+				storeResult(d, params.key, err, params.handlerOptions, params.handler, params.metric, logger)
 			} else {
 				l.Info(fmt.Sprintf("worker: %d processing request. cleanup: %t", id, cleanup))
 				start := time.Now()
 				l.V(logs.LogDebug).Info("invoking handler")
 				err = params.handler(ctx, controlClusterClient,
 					ns, name, applicant, featureID, clusterType, params.handlerOptions,
 					l)
-				storeResult(d, params.key, err, params.handler, params.metric, logger)
+				storeResult(d, params.key, err, params.handlerOptions, params.handler, params.metric, logger)
 				elapsed := time.Since(start)
 				if params.metric != nil {
 					params.metric(elapsed, ns, name, featureID, clusterType, l)
@@ -217,8 +217,8 @@ func processRequests(ctx context.Context, d *deployer, i int, logger logr.Logger
 // - set results for further in time lookup
 // - remove key from inProgress
 // - if key is in dirty, remove it from there and add it to the back of the jobQueue
-func storeResult(d *deployer, key string, err error, handler RequestHandler, metricHandler MetricHandler,
-	logger logr.Logger) {
+func storeResult(d *deployer, key string, err error, handlerOptions Options,
+	handler RequestHandler, metricHandler MetricHandler, logger logr.Logger) {
 
 	d.mu.Lock()
 
@@ -247,7 +247,13 @@ func storeResult(d *deployer, key string, err error, handler RequestHandler, met
 			continue
 		}
 		l.V(logs.LogVerbose).Info("add to jobQueue")
-		d.jobQueue = append(d.jobQueue, requestParams{key: d.dirty[i], handler: handler, metric: metricHandler})
+		d.jobQueue = append(d.jobQueue,
+			requestParams{
+				key:            d.dirty[i],
+				handler:        handler,
+				metric:         metricHandler,
+				handlerOptions: handlerOptions,
+			})
 		l.V(logs.LogVerbose).Info("remove from dirty")
 		d.dirty = removeFromSlice(d.dirty, i)
 		l.V(logs.LogVerbose).Info("remove result")

diff --git a/lib/deployer/worker_test.go b/lib/deployer/worker_test.go
@@ -129,7 +129,7 @@ var _ = Describe("Worker", func() {
 		d.SetInProgress([]string{key})
 		Expect(len(d.GetInProgress())).To(Equal(1))
 
-		deployer.StoreResult(d, key, nil, doNothingHandler, metricHandler, klogr.New())
+		deployer.StoreResult(d, key, nil, deployer.Options{}, doNothingHandler, metricHandler, klogr.New())
 		Expect(len(d.GetInProgress())).To(Equal(0))
 	})
 
@@ -150,7 +150,7 @@ var _ = Describe("Worker", func() {
 		d.SetDirty([]string{key})
 		Expect(len(d.GetDirty())).To(Equal(1))
 
-		deployer.StoreResult(d, key, nil, doNothingHandler, metricHandler, klogr.New())
+		deployer.StoreResult(d, key, nil, deployer.Options{}, doNothingHandler, metricHandler, klogr.New())
 		Expect(len(d.GetInProgress())).To(Equal(0))
 		Expect(len(d.GetDirty())).To(Equal(0))
 		Expect(len(d.GetJobQueue())).To(Equal(1))