fix: reconciler (#1360)

* fix: reconciler * fix: search limit * fix: revert swagger.json
kube-HPC · Aug 9, 2021 · 20bf46e · 20bf46e
1 parent 1a2226a
commit 20bf46e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/core/algorithm-operator/lib/reconcile/algorithm-queue.js b/core/algorithm-operator/lib/reconcile/algorithm-queue.js
@@ -107,9 +107,10 @@ const _addDeployments = async ({ limit, availableQueues, algorithms, versions, r
 };
 
 const isRequired = ({ alg, algorithmsToQueue, waitingCount, algorithmQueues, maxIdleTime }) => {
-    const hasRequirement = !algorithmsToQueue[alg.name] && waitingCount[alg.name] > 0;
+    const isMissing = !algorithmsToQueue[alg.name];
+    const isQueued = waitingCount[alg.name] > 0;
     const isActive = Date.now() - algorithmQueues[alg.name] < maxIdleTime;
-    return hasRequirement || isActive;
+    return isMissing && (isQueued || isActive);
 };
 
 const reconcile = async ({ deployments, algorithms, discovery, versions, registry, clusterOptions, resources, options, devMode } = {}) => {

diff --git a/core/api-server/lib/validation/executions.js b/core/api-server/lib/validation/executions.js
@@ -23,7 +23,7 @@ class ApiValidator {
     }
 
     validateSearch(request) {
-        this._validator.validate(this._validator.definitions.searchJobs, request, false);
+        this._validator.validate(this._validator.definitions.searchJobs, request, true);
     }
 
     validateExecAlgorithmRequest(request) {