这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

fix(janitor): add configs around an expensive call #329

Merged
merged 1 commit into from
Jun 14, 2018
Merged

fix(janitor): add configs around an expensive call #329

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
32 changes: 19 additions & 13 deletions src/main/java/com/netflix/simianarmy/janitor/AbstractJanitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,11 @@ public void prepareToRun() {
*/
@Override
public void markResources() {
if (config.getBoolOrElse("simianarmy.janitor.skipMark", false)) {
LOGGER.info("*****SKIPPING MARKING {}****", resourceType);
return ;
}

markedResources.clear();
unmarkedResources.clear();
checkedResourcesCount = 0;
Expand Down Expand Up @@ -308,24 +313,25 @@ public void cleanupResources() {
LOGGER.info("Checking {} marked resources for cleanup. LeashMode={}", trackedMarkedResources.size(), leashed);
Date now = calendar.now().getTime();
for (Resource markedResource : trackedMarkedResources.values()) {
// find matching crawled resource. This ensures we always have the freshest resource.
List<Resource> matchingCrawledResources = Optional.ofNullable(crawler.resources(markedResource.getId()))
.orElse(Collections.emptyList());

LOGGER.info("Rechecking resource ({}) before deletion {} - matching candidates {}",
markedResource.getResourceType(), markedResource, matchingCrawledResources);
Optional<Resource> crawledResource = matchingCrawledResources.stream()
.filter(r -> r.equals(markedResource))
.findFirst();

if (!crawledResource.isPresent() || ruleEngine.isValid(crawledResource.get())) {
skippedVanishedOrValidResources.add(markedResource);
if (config.getBoolOrElse("simianarmy.janitor.skipVanishedOrValidResources", false)) {
if (config.getBoolOrElse("simianarmy.janitor.skipVanishedOrValidResources", false)) {
// find matching crawled resource. This ensures we always have the freshest resource.
List<Resource> matchingCrawledResources = Optional.ofNullable(crawler.resources(markedResource.getId()))
.orElse(Collections.emptyList());

LOGGER.info("Rechecking resource {} before deletion {} - matching candidates {}",
markedResource, markedResource.getResourceType(), matchingCrawledResources);
Optional<Resource> crawledResource = matchingCrawledResources.stream()
.filter(r -> r.equals(markedResource))
.findFirst();

if (!crawledResource.isPresent() || ruleEngine.isValid(crawledResource.get())) {
skippedVanishedOrValidResources.add(markedResource);
LOGGER.warn("Skipping resource {} that either no longer exists or is now valid", markedResource);
continue;
}
}


if (canClean(markedResource, now)) {
LOGGER.info("Cleaning up resource {} of type {}. LeashMode={}",
markedResource.getId(), markedResource.getResourceType().name(), leashed);
Expand Down