Skip to content

Commit

Permalink
update master
Browse files Browse the repository at this point in the history
  • Loading branch information
@zachsmith1
zachsmith1 authored Feb 18, 2021
2 parents 6149626 + 462cb4c commit 508f356
Show file tree
Hide file tree
Showing 57 changed files with 3,101 additions and 1,736 deletions.
9 changes: 9 additions & 0 deletions ...-sql/src/main/kotlin/com/netflix/spinnaker/cats/sql/cluster/SqlClusteredAgentScheduler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ class SqlClusteredAgentScheduler(
.filterNot { disabledAgents.contains(it.key) }
.toMutableMap()

log.debug("Agents running: {}, agents disabled: {}. Picking next agents to run from: {}",
activeAgents.keys, disabledAgents, candidateAgentLocks.keys)

withPool(POOL_NAME) {
val existingLocks = jooq.select(field("agent_name"), field("lock_expiry"))
.from(table(lockTable))
Expand Down Expand Up @@ -207,10 +210,16 @@ class SqlClusteredAgentScheduler(
}
}

log.debug("Next agents to run: {}, max: {}", candidateAgentLocks.keys, availableAgents)

val trimmedCandidates = mutableMapOf<String, AgentExecutionAction>()
candidateAgentLocks
.forEach { k, v ->
if (trimmedCandidates.size >= availableAgents) {
log.warn(
"Dropping caching agents! Wanted to run {} agents, but a max of {} was configured and there are " +
"already {} currently running. Consider increasing sql.agent.max-concurrent-agents",
candidateAgentLocks.size, maxConcurrentAgents, skip)
return@forEach
}
trimmedCandidates[k] = v
Expand Down
520 changes: 0 additions & 520 deletions ...aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/AutoScalingWorker.groovy
View file

This file was deleted.

41 changes: 21 additions & 20 deletions ...r-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/InstanceTypeUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,19 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) {
.put("c3.2xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c3.4xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c3.8xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c4.large", defaultBlockDevicesForEbsOnly())
.put("c4.xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.2xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.4xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.8xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.large", defaultBlockDevicesForEbsOnly())
.put("c5.xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.2xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.4xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.9xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.12xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.18xlarge", defaultBlockDevicesForEbsOnly())
.put("c5.24xlarge", defaultBlockDevicesForEbsOnly())
.put("c4.large", sizedBlockDevicesForEbs(40))
.put("c4.xlarge", sizedBlockDevicesForEbs(80))
.put("c4.2xlarge", sizedBlockDevicesForEbs(80))
.put("c4.4xlarge", sizedBlockDevicesForEbs(120))
.put("c4.8xlarge", sizedBlockDevicesForEbs(120))
.put("c5.large", sizedBlockDevicesForEbs(40))
.put("c5.xlarge", sizedBlockDevicesForEbs(80))
.put("c5.2xlarge", sizedBlockDevicesForEbs(80))
.put("c5.4xlarge", sizedBlockDevicesForEbs(120))
.put("c5.9xlarge", sizedBlockDevicesForEbs(120))
.put("c5.12xlarge", sizedBlockDevicesForEbs(120))
.put("c5.18xlarge", sizedBlockDevicesForEbs(120))
.put("c5.24xlarge", sizedBlockDevicesForEbs(120))
.put("c5d.large", enumeratedBlockDevicesWithVirtualName(1))
.put("c5d.xlarge", enumeratedBlockDevicesWithVirtualName(1))
.put("c5d.2xlarge", enumeratedBlockDevicesWithVirtualName(1))
Expand All @@ -131,13 +131,13 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) {
.put("c5d.18xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("c5d.24xlarge", enumeratedBlockDevicesWithVirtualName(4))
.put("c5d.metal", enumeratedBlockDevicesWithVirtualName(4))
.put("c5n.large", defaultBlockDevicesForEbsOnly())
.put("c5n.xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.2xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.4xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.9xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.18xlarge", defaultBlockDevicesForEbsOnly())
.put("c5n.metal", defaultBlockDevicesForEbsOnly())
.put("c5n.large", sizedBlockDevicesForEbs(40))
.put("c5n.xlarge", sizedBlockDevicesForEbs(80))
.put("c5n.2xlarge", sizedBlockDevicesForEbs(80))
.put("c5n.4xlarge", sizedBlockDevicesForEbs(120))
.put("c5n.9xlarge", sizedBlockDevicesForEbs(120))
.put("c5n.18xlarge", sizedBlockDevicesForEbs(120))
.put("c5n.metal", sizedBlockDevicesForEbs(120))
.put("c5a.large", sizedBlockDevicesForEbs(40))
.put("c5a.xlarge", sizedBlockDevicesForEbs(80))
.put("c5a.2xlarge", sizedBlockDevicesForEbs(80))
Expand Down Expand Up @@ -221,6 +221,7 @@ public BlockDeviceConfig(DeployDefaults deployDefaults) {
.put("h1.8xlarge", enumeratedBlockDevicesWithVirtualName(4))
.put("h1.16xlarge", enumeratedBlockDevicesWithVirtualName(8))
.put("hs1.8xlarge", enumeratedBlockDevicesWithVirtualName(24))
.put("i2.large", enumeratedBlockDevicesWithVirtualName(1))
.put("i2.xlarge", enumeratedBlockDevicesWithVirtualName(1))
.put("i2.2xlarge", enumeratedBlockDevicesWithVirtualName(2))
.put("i2.4xlarge", enumeratedBlockDevicesWithVirtualName(4))
Expand Down
72 changes: 0 additions & 72 deletions ...ain/groovy/com/netflix/spinnaker/clouddriver/aws/deploy/LaunchConfigurationBuilder.groovy
View file

This file was deleted.

7 changes: 4 additions & 3 deletions .../deploy/AWSServerGroupNameResolver.groovy → ...loy/asg/AWSServerGroupNameResolver.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
/*
* Copyright 2015 Netflix, Inc.
* Copyright 2021 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/

package com.netflix.spinnaker.clouddriver.aws.deploy
package com.netflix.spinnaker.clouddriver.aws.deploy.asg

import com.netflix.frigga.NameConstants
import com.netflix.frigga.NameValidation
Expand Down
2 changes: 1 addition & 1 deletion ...ouddriver/aws/deploy/AsgConfigHelper.java → ...river/aws/deploy/asg/AsgConfigHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package com.netflix.spinnaker.clouddriver.aws.deploy;
package com.netflix.spinnaker.clouddriver.aws.deploy.asg;

import com.netflix.spinnaker.clouddriver.aws.services.SecurityGroupService;
import com.netflix.spinnaker.clouddriver.helpers.OperationPoller;
Expand Down
2 changes: 1 addition & 1 deletion .../aws/deploy/AsgLifecycleHookWorker.groovy → .../deploy/asg/AsgLifecycleHookWorker.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.netflix.spinnaker.clouddriver.aws.deploy
package com.netflix.spinnaker.clouddriver.aws.deploy.asg

import com.amazonaws.services.autoscaling.AmazonAutoScaling
import com.amazonaws.services.autoscaling.model.PutLifecycleHookRequest
Expand Down
2 changes: 1 addition & 1 deletion ...iver/aws/deploy/AsgReferenceCopier.groovy → .../aws/deploy/asg/AsgReferenceCopier.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.netflix.spinnaker.clouddriver.aws.deploy
package com.netflix.spinnaker.clouddriver.aws.deploy.asg

import com.amazonaws.services.autoscaling.AmazonAutoScaling
import com.amazonaws.services.autoscaling.model.AlreadyExistsException
Expand Down
Loading

0 comments on commit 508f356

Please sign in to comment.