diff options
Diffstat (limited to 'lib/policy.js')
| -rw-r--r-- | lib/policy.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/policy.js b/lib/policy.js index 4bc40fe..305500b 100644 --- a/lib/policy.js +++ b/lib/policy.js @@ -99,7 +99,8 @@ function policyUpdate(req, res, next) { "updated_policies": {}, "added_policies": {}, "removed_policy_ids": {}, - "node_instance_ids": [] + "node_instance_ids": [], + "is_deployment_busy": cloudify.exeQueue.isDeploymentBusy(node_instance.deployment_id) }; var have_policies = false; @@ -110,6 +111,7 @@ function policyUpdate(req, res, next) { const latest_policy = policy_update.latest_policies[policy_id]; if (policy_update.removed_policies[policy_id] || (policy_update.catch_up + && (deployed_policy.policy_body || deployment.is_deployment_busy) && !latest_policy && !policy_update.errored_policies[policy_id] && !is_policy_in_errored_scopes(policy_id) @@ -123,10 +125,10 @@ function policyUpdate(req, res, next) { if (!latest_policy || !latest_policy.policy_body || isNaN(latest_policy.policy_body.policyVersion)) {return;} - // || latest_policy.policy_body.policyVersion - // === (deployed_policy.policy_body && deployed_policy.policy_body.policyVersion)) { - // return; - // } + + if (!deployment.is_deployment_busy && latest_policy.policy_body.policyVersion + === (deployed_policy.policy_body && deployed_policy.policy_body.policyVersion)) {return;} + have_policies = true; deployment.updated_policies[policy_id] = latest_policy; policy_update.updated_policy_ids[policy_id] = true; @@ -139,7 +141,7 @@ function policyUpdate(req, res, next) { logger.debug(req.dcaeReqId, "matching latest policies to policy_filters[" + policy_filter_ids.length + "] on node_instance: " + JSON.stringify(node_instance)); try { Object.keys(policy_update.latest_policies).forEach(policy_id => { - // if (deployment.updated_policies[policy_id] || deployed_policies[policy_id]) {return;} + if (!deployment.is_deployment_busy && deployed_policies[policy_id]) {return;} const latest_policy = policy_update.latest_policies[policy_id]; const policy_body = latest_policy && latest_policy.policy_body; |