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 #18534: Skip non-standard moint FS for free-space check #3351

Merged
merged 1 commit into from
Nov 9, 2020
Merged

Fixes #18534: Skip non-standard moint FS for free-space check #3351

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
35 changes: 18 additions & 17 deletions ...er-core/src/main/scala/com/normation/rudder/services/healthcheck/HealthcheckService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ object HealthcheckUtils {

class HealthcheckService(checks: List[Check]) {

def runAll: ZIO[Any, Nothing, List[HealthcheckResult]] = ZIO.foreach(checks) { c =>
for {
res <- c.run.catchAll { err =>
HealthcheckResult.Critical(
CheckName("All checks run")
, s"A fatal error was encountered when running check '${c.name.value}': ${err.fullMsg}"
).succeed
}
_ <- logHealthcheck(c.name, res)
} yield res
def runAll: ZIO[Any, Nothing, List[HealthcheckResult]] = ZIO.foreach(checks) { c =>
for {
res <- c.run.catchAll { err =>
HealthcheckResult.Critical(
CheckName("All checks run")
, s"A fatal error was encountered when running check '${c.name.value}': ${err.fullMsg}"
).succeed
}
_ <- logHealthcheck(c.name, res)
} yield res
}

private[this] def logHealthcheck(name: CheckName, check: HealthcheckResult): UIO[Unit] = {
Expand Down Expand Up @@ -96,7 +96,9 @@ final object CheckFreeSpace extends Check {

def run: IOResult[HealthcheckResult] = {
val file = root / "proc" / "mounts"
val mountsContent = file.lines.map(x => x.split(" ")(1)).toList

// Here we want to keep lines for standard mounting point, see: https://issues.rudder.io/issues/18534
val mountsContent = file.lines.filter(_.head == '/').map(x => x.split(" ")(1)).toList

// We want to check `/var/*` if none exist take `/`
val partitionToCheck = {
Expand All @@ -106,11 +108,11 @@ final object CheckFreeSpace extends Check {

for {
paritionSpaceInfos <- IOResult.effect {
partitionToCheck.map { x =>
val file = new io.File(x)
SpaceInfo(x, file.getUsableSpace, file.getTotalSpace)
}
}
partitionToCheck.map { x =>
val file = new io.File(x)
SpaceInfo(x, file.getUsableSpace, file.getTotalSpace)
}
}
} yield {
val pcSpaceLeft = paritionSpaceInfos.map(x => (x.path, x.percent)).sortBy(_._2)
pcSpaceLeft match {
Expand Down Expand Up @@ -143,7 +145,6 @@ final class CheckFileDescriptorLimit(val nodeInfoService: NodeInfoService) exten
for {
fdLimitCmd <- RunNuCommand.run(cmd)
res <- fdLimitCmd.await

_ <- ZIO.when(res.code != 0) {
Inconsistency(
s"An error occurred while getting file descriptor soft limit with command '${cmd.display}':\n code: ${res.code}\n stderr: ${res.stderr}\n stdout: ${res.stdout}"
Expand Down