Machine endDate is correctly check when sessionDuration is finished. #341
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…endate, or with the last endate. So we search the machine to know the current endate.
dynamiccast
reviewed
Oct 10, 2016
| @@ -508,20 +508,21 @@ function updateMachinesPool() { | |||
| function _shouldTerminateMachine(machine) { | |||
| Promise.props({ | |||
| isActive: machine.isSessionActive(), | |||
| config: ConfigService.get('neverTerminateMachine') | |||
| config: ConfigService.get('neverTerminateMachine'), | |||
| machineToTerminate: Machine.findOne({id: machine.id}) | |||
There was a problem hiding this comment.
machine and Machine.findOne(machine) are strictly the same. How is this fixing something ?
There was a problem hiding this comment.
No, machine is the not updated machine, if you reopen/reclose the vdi, the machine you received is not updated with the right endDate. Search the machine with findOne, permit to have the right endDate.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When closing a vdi, we set the endDate of the machine, a timeout is starting, and _shouldTerminateMachine is called, but this function is called with the current machine, not with the machine where the end date is updated and we received the machine without the endate.
So we search the machine to know the current endate.