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.

Sign up for GitHub

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

Update agent setups so each executor takes 4 cores #185

Merged
merged 1 commit into from
Aug 10, 2022
Merged

Update agent setups so each executor takes 4 cores #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/compute/agent-node-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ export interface AgentNodeProps {
workerLabelString: string;
remoteUser: string;
maxTotalUses: number;
minimumNumberOfSpareInstances: number;
numExecutors: number;
initScript: string,
remoteFs: string
initScript: string;
remoteFs: string;
}
export interface AgentNodeNetworkProps {
readonly agentNodeSecurityGroup: string;
Expand Down Expand Up @@ -174,7 +175,7 @@ export class AgentNodeConfig {
launchTimeoutStr: '300',
maxTotalUses: config.maxTotalUses,
minimumNumberOfInstances: 0,
minimumNumberOfSpareInstances: 1,
minimumNumberOfSpareInstances: config.minimumNumberOfSpareInstances,
mode: 'EXCLUSIVE',
monitoring: true,
numExecutors: config.numExecutors,
Expand Down Expand Up @@ -220,7 +221,7 @@ export class AgentNodeConfig {
initScript: config.initScript,
maxTotalUses: config.maxTotalUses,
minimumNumberOfInstances: 1,
minimumNumberOfSpareInstances: 0,
minimumNumberOfSpareInstances: config.minimumNumberOfSpareInstances,
mode: 'EXCLUSIVE',
monitoring: true,
numExecutors: config.numExecutors,
Expand Down Expand Up @@ -271,7 +272,7 @@ export class AgentNodeConfig {
launchTimeoutStr: '1000',
maxTotalUses: config.maxTotalUses,
minimumNumberOfInstances: 0,
minimumNumberOfSpareInstances: 1,
minimumNumberOfSpareInstances: config.minimumNumberOfSpareInstances,
mode: 'EXCLUSIVE',
monitoring: true,
numExecutors: config.numExecutors,
Expand Down
15 changes: 13 additions & 2 deletions lib/compute/agent-nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export class AgentNodes {
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-00a07e55fcad01043',
initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum /var/lib/yum/history && sudo yum repolist &&'
Expand All @@ -54,7 +55,8 @@ export class AgentNodes {
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
numExecutors: 8,
minimumNumberOfSpareInstances: 2,
numExecutors: 4,
amiId: 'ami-00a07e55fcad01043',
initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum /var/lib/yum/history && sudo yum repolist &&'
+ ' sudo yum update --skip-broken --exclude=openssh* --exclude=docker* -y && sudo yum install -y ntp &&'
Expand All @@ -67,6 +69,7 @@ export class AgentNodes {
instanceType: 'M52xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 8,
amiId: 'ami-00a07e55fcad01043',
initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum /var/lib/yum/history && sudo yum repolist &&'
Expand All @@ -80,6 +83,7 @@ export class AgentNodes {
instanceType: 'C6g4xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-020c52efb1a60f1ae',
initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum /var/lib/yum/history && sudo yum repolist &&'
Expand All @@ -93,7 +97,8 @@ export class AgentNodes {
instanceType: 'C6g4xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
numExecutors: 8,
minimumNumberOfSpareInstances: 2,
numExecutors: 4,
amiId: 'ami-020c52efb1a60f1ae',
initScript: 'sudo yum clean all && sudo rm -rf /var/cache/yum /var/lib/yum/history && sudo yum repolist &&'
+ ' sudo yum update --skip-broken --exclude=openssh* --exclude=docker* -y && sudo yum install -y ntp &&'
Expand All @@ -106,6 +111,7 @@ export class AgentNodes {
instanceType: 'C524xlarge',
remoteUser: 'ubuntu',
maxTotalUses: 1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-0f6ceb3b3687a3fba',
initScript: 'sudo apt-mark hold docker docker.io openssh-server && docker ps &&'
Expand All @@ -120,6 +126,7 @@ export class AgentNodes {
instanceType: 'M52xlarge',
remoteUser: 'ubuntu',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-0f6ceb3b3687a3fba',
initScript: 'sudo apt-mark hold docker docker.io openssh-server && docker ps &&'
Expand All @@ -134,6 +141,7 @@ export class AgentNodes {
instanceType: 'Mac1Metal',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 6,
amiId: 'ami-022cee9eedb91288a',
initScript: 'echo',
Expand All @@ -145,6 +153,7 @@ export class AgentNodes {
instanceType: 'C54xlarge',
remoteUser: 'Administrator',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: 'ami-07591ca4ef792c2d4',
initScript: 'echo',
Expand All @@ -157,6 +166,7 @@ export class AgentNodes {
instanceType: 'C54xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: MachineImage.latestAmazonLinux({
generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
Expand All @@ -174,6 +184,7 @@ export class AgentNodes {
instanceType: 'C6g4xlarge',
remoteUser: 'ec2-user',
maxTotalUses: -1,
minimumNumberOfSpareInstances: 1,
numExecutors: 1,
amiId: MachineImage.latestAmazonLinux({
generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
Expand Down