Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(integ): Support last changes in Deadline 10.1.11 #248

Merged
merged 1 commit into from
Nov 25, 2020

Conversation

kozlove-aws
Copy link
Contributor

@kozlove-aws kozlove-aws commented Nov 23, 2020

Problem

The last Deadline 10.1.11 brings some changes that make RFDK integration tests fail.

  1. New AMIs have worker autostart is off that lead to unable to configure pools and groups
  2. Restarting DeadlineLauncher right after start leads to worker continue without last changes in deadline.ini
  3. New region validation does not allow to set reqion that wasn't previosly added in network configuration.

Solution

  1. If worker was not found was added default worker to the list.
  2. After stop deadline launcher was added command to kill deadline worker process.
  3. Were changed tests to expect unrecognized region instead of testregion

Testing

For testing were ran integration tests and make sure that all tests passed.


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

@ryyakobe ryyakobe self-requested a review November 24, 2020 16:39
@@ -111,6 +111,7 @@ export abstract class RenderQueueConnection {
'if [ -f "/etc/profile.d/deadlineclient.sh" ]; then',
' source "/etc/profile.d/deadlineclient.sh"',
'fi',
'"\${DEADLINE_PATH}/deadlinecommand" -SetIniFileSetting LaunchSlaveAtStartup True',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not want to set this here. This class is a generic class used to set up any deadline isntance being able to connect to a render queue not specifically workers as such your changes make it so any Workstation, Pulse or other component automatically starts up workers.

This setting is also already being set in the ConfigureWorker.sh which is where I would expect all of this code to exist.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After offline discussion we have found a way not to start worker before configuration Pools and Groups.

@@ -122,6 +123,7 @@ export abstract class RenderQueueConnection {
host.userData.addCommands(
'$ErrorActionPreference = "Stop"',
'$DEADLINE_PATH = (get-item env:"DEADLINE_PATH").Value',
'& "$DEADLINE_PATH/deadlinecommand.exe" -SetIniFileSetting LaunchSlaveAtStartup True | Out-Default',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as Above this class should have no Worker specific code in it.

@kozlove-aws kozlove-aws force-pushed the fix_integ_workers branch 2 times, most recently from abe3e49 to 0ecde17 Compare November 25, 2020 16:55
ryyakobe
ryyakobe previously approved these changes Nov 25, 2020
Copy link
Contributor

@ryyakobe ryyakobe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks Eugene!

grbartel
grbartel previously approved these changes Nov 25, 2020
@ddneilson ddneilson merged commit dfdbda5 into mainline Nov 25, 2020
@ddneilson ddneilson deleted the fix_integ_workers branch November 25, 2020 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants