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

Jump to bottom

Fixes #19396: Move use of cache outside of semaphore in NodeInfoService #3663

Merged
merged 1 commit into from Jun 4, 2021
Merged

Fixes #19396: Move use of cache outside of semaphore in NodeInfoService #3663

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 45 additions & 36 deletions ...dder/rudder-core/src/main/scala/com/normation/rudder/services/nodes/NodeInfoService.scala
View file
Open in desktop
Expand Up @@ -402,42 +402,51 @@ trait NodeInfoServiceCached extends NodeInfoService with NamedZioLogger with Cac
}
}

//actual logic that check what to do (invalidate cache or not). We want it to be fully synchronized.
semaphore.withPermit(
for {
t0 <- currentTimeMillis
notInit <- IOResult.effect(nodeCache.isEmpty)
clean <- isUpToDate()
info <- if(notInit || !clean) {
for {
lastUpdate <- IOResult.effect(nodeCache.map(_.lastModTime).getOrElse(new DateTime(0)))
updated <- getDataFromBackend(lastUpdate).foldM(
err =>
IOResult.effect({nodeCache = None; ()}) *> Chained("Could not get node information from database", err).fail
, newCache =>
logPure.debug(s"NodeInfo cache is not up to date, last modification time: '${newCache.lastModTime}', last cache update:"+
s" '${lastUpdate}' => reseting cache with ${newCache.nodeInfos.size} entries") *>
logPure.trace(s"NodeInfo cache updated entries: [${newCache.nodeInfos.keySet.map{ _.value }.mkString(", ")}]") *>
IOResult.effect({nodeCache = Some(newCache); () }) *>
newCache.nodeInfos.succeed
)
} yield {
updated
}
} else {
logPure.debug(s"NodeInfo cache is up to date, ${nodeCache.map(c => s"last modification time: '${c.lastModTime}' for: '${c.lastModEntryCSN.mkString("','")}'").getOrElse("")}") *>
(nodeCache match {
case Some(cache) => cache.nodeInfos.succeed
case None => Inconsistency("When trying to access Node information from cache was empty, but it should not, this is a developper issue, please open an issue on https://issues.rudder.io").fail
})
}
res <- useCache(info)
t1 <- currentTimeMillis
_ <- IOResult.effect(TimingDebugLogger.debug(s"Get node info (${label}): ${t1-t0}ms"))
} yield {
res
}
)
for {
// only checking the cache validity should be in a semaphore - logic to read it does not need to
// we cannot get (cache, t0), because it fails with Cannot prove that NoSuchElementException <:< com.normation.errors.RudderError
result <- semaphore.withPermit(
for {
t0 <- currentTimeMillis
notInit <- IOResult.effect(nodeCache.isEmpty)
clean <- isUpToDate()
updatedCache <- if(notInit || !clean) {
for {
lastUpdate <- IOResult.effect(nodeCache.map(_.lastModTime).getOrElse(new DateTime(0)))
updated <- getDataFromBackend(lastUpdate).foldM(
err =>
IOResult.effect({nodeCache = None; ()}) *> Chained("Could not get node information from database", err).fail
, newCache =>
logPure.debug(s"NodeInfo cache is not up to date, last modification time: '${newCache.lastModTime}', last cache update:"+
s" '${lastUpdate}' => reseting cache with ${newCache.nodeInfos.size} entries") *>
logPure.trace(s"NodeInfo cache updated entries: [${newCache.nodeInfos.keySet.map{ _.value }.mkString(", ")}]") *>
IOResult.effect({nodeCache = Some(newCache); () }) *>
newCache.nodeInfos.succeed
)
} yield {
updated
}
} else {
logPure.debug(s"NodeInfo cache is up to date, ${nodeCache.map(c => s"last modification time: '${c.lastModTime}' for: '${c.lastModEntryCSN.mkString("','")}'").getOrElse("")}") *>
(nodeCache match {
case Some(cache) => cache.nodeInfos.succeed
case None => Inconsistency("When trying to access Node information from cache was empty, but it should not, this is a developper issue, please open an issue on https://issues.rudder.io").fail
})
}
t1 <- currentTimeMillis
_ <- IOResult.effect(TimingDebugLogger.debug(s"Get cache for node info (${label}): ${t1-t0}ms"))
} yield {
(t0, updatedCache)
}
)
(t0, updatedCache) = result
t1 <- currentTimeMillis
res <- useCache(updatedCache) // this does not need to be in a semaphore
t2 <- currentTimeMillis
_ <- IOResult.effect(TimingDebugLogger.debug(s"Get node info (${label}): ${t2-t0}ms - exploring the cache took ${t2-t1}ms "))
} yield {
res
}
}

/**
Expand Down