Report currentActiveInstances on SingularityDeployProgress#1377
Conversation
matush-v
force-pushed
the
bird-deploy
branch
from
5a60114 to
cca3d4f
Compare
matush-v
force-pushed
the
bird-deploy
branch
from
cca3d4f to
006ea40
Compare
matush-v
changed the title
| "Pending deploy already in progress for %s - cancel it or wait for it to complete (%s)", requestId, deployManager.getPendingDeploy(requestId).orNull()); | ||
| boolean deployExists = deployManager.createPendingDeploy(pendingDeployObj) == SingularityCreateResult.EXISTED; | ||
| if (deployExists && forceDeploy.or(false)) { | ||
| cancelDeploy(requestId, deployManager.getInUseDeployId(requestId).orNull()); |
There was a problem hiding this comment.
Unsure if there is a restart method or if I need to do something after hitting the cancel
There was a problem hiding this comment.
Can we implement force deploy in a separate PR?
There was a problem hiding this comment.
Yeah agreed on leaving force deploy for a separate PR, we'd need to cancel + make sure the deploy checker successfully cancelled before starting a new one for things to work properly.
|
|
||
| public SingularityDeployProgress withCompletedStep() { | ||
| return new SingularityDeployProgress(targetActiveInstances, deployInstanceCountPerStep, deployStepWaitTimeMs, true, autoAdvanceDeploySteps, failedDeployTasks, System.currentTimeMillis()); | ||
| return new SingularityDeployProgress(targetActiveInstances, currentActiveInstances + 1, deployInstanceCountPerStep, deployStepWaitTimeMs, true, autoAdvanceDeploySteps, failedDeployTasks, System.currentTimeMillis()); |
There was a problem hiding this comment.
is currentActiveInstances + 1 correct here? wouldn't it be currentActiveInstances + deployInstanceCountPerStep?
There was a problem hiding this comment.
This was originally intended to just be the current deploy progress with stepCompleted flipped to true. If we want to update the active instance count I'd suggest getting it from the deployActiveTasks variable that gets passed around instead. If we pass that to the calls of markStepFinished, we can construct the new deploy progress with the actual count of active tasks after each step. withCompletedStep should do just what I mentioned above and flip the value of that bool, keeping the rest the same
| "Pending deploy already in progress for %s - cancel it or wait for it to complete (%s)", requestId, deployManager.getPendingDeploy(requestId).orNull()); | ||
| boolean deployExists = deployManager.createPendingDeploy(pendingDeployObj) == SingularityCreateResult.EXISTED; | ||
| if (deployExists && forceDeploy.or(false)) { | ||
| cancelDeploy(requestId, deployManager.getInUseDeployId(requestId).orNull()); |
There was a problem hiding this comment.
Can we implement force deploy in a separate PR?
matush-v
force-pushed
the
bird-deploy
branch
from
67ec24b to
006ea40
Compare
matush-v
force-pushed
the
bird-deploy
branch
from
4ec1ed6 to
b4282bf
Compare
|
@tpetr any changes necessary on this one? |
|
Looks good but could you add unit tests for this? Or if there are already tests flexing this functionality, update them to ensure that |
|
Just added a test following the logic of existing tests, but I can't say I'm super confident that it's the best way to test the counter. e.g. I couldn't figure out how to deploy with a target of 4 instances, and check the Thoughts? |
|
@darcatron apologies for letting this one sit so long. I think having that current active instances value will still be valuable. In terms of the test, I would check out the example of
You could likely extend that test to do three instances instead of just two and add a few more assert statements in there to adequately test the new counter |
ssalinas
changed the title
|
@ssalinas gave the test another look based on your suggestions and it seems that was the original test I followed. Instead of adding a check for these changes by extending an existing test, this one is separate. I think that's probably better anyway so unless you want to combine them, I'm going to keep it as is. Cool if I get this into staging? |
|
I think that's fair, we can try this out in staging |
3 participants
This reports that a canary deploy has completed the first step