mirror of
https://github.com/gnustep/libs-ec.git
synced 2025-02-21 10:51:04 +00:00
improve handling of warnings about low disk space
This commit is contained in:
Richard Frith-Macdonald
parent
7a3ce7697a
commit
704d07f9e6
2 changed files with 93 additions and 18 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2022-02-07 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* EcCommand.m: Use alarms rather than alerts to report lack
|
||||
of disk space or inodes.
|
||||
|
||||
2021-12-22 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* EcControl.m: Add AlamrFilter as a config option to provide a
|
||||
|
|
|
|||
106
EcCommand.m
106
EcCommand.m
|
|
@ -6118,9 +6118,14 @@ NSLog(@"Problem %@", localException);
|
|||
|
||||
- (void) housekeeping: (NSTimer*)t
|
||||
{
|
||||
static EcAlarm *dbgNodes = nil;
|
||||
static EcAlarm *dbgSpace = nil;
|
||||
static EcAlarm *logNodes = nil;
|
||||
static EcAlarm *logSpace = nil;
|
||||
static NSTimeInterval nextLog = 0.0;
|
||||
static BOOL inTimeout = NO;
|
||||
NSDate *now = [t fireDate];
|
||||
EcAlarm *alarm;
|
||||
|
||||
if (t == timer)
|
||||
{
|
||||
|
|
@ -6270,25 +6275,43 @@ NSLog(@"Problem %@", localException);
|
|||
|
||||
if (nil == last || [last timeIntervalSinceNow] < -DLY)
|
||||
{
|
||||
EcAlarmSeverity severity = EcAlarmSeverityMajor;
|
||||
NSString *m;
|
||||
|
||||
m = [self makeSpace];
|
||||
ASSIGN(last, [NSDate date]);
|
||||
if ([m length] == 0)
|
||||
{
|
||||
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
|
||||
@"Debug disk debug space at %02.1f percent"), f * 100.0];
|
||||
m = [NSString stringWithFormat: @"at %02.1f percent",
|
||||
f * 100.0];
|
||||
}
|
||||
else
|
||||
{
|
||||
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
|
||||
@"Debug disk space at %02.1f percent"
|
||||
@" - deleted debug logs from %@ to make space"),
|
||||
m = [NSString stringWithFormat: @"at %02.1f percent"
|
||||
@" - deleted debug logs from %@ to make space",
|
||||
f * 100.0, m];
|
||||
severity = EcAlarmSeverityCritical;
|
||||
}
|
||||
[self information: m from: nil to: nil type: LT_ALERT];
|
||||
alarm = [EcAlarm alarmForManagedObject: nil
|
||||
at: nil
|
||||
withEventType: EcAlarmEventTypeProcessingError
|
||||
probableCause: EcAlarmStorageCapacityProblem
|
||||
specificProblem: @"Debug disk space"
|
||||
perceivedSeverity: severity
|
||||
proposedRepairAction: @"Make space on disk partition"
|
||||
@" and turn off excessive debug"
|
||||
additionalText: m];
|
||||
ASSIGN(dbgSpace, alarm);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
}
|
||||
else if (dbgSpace)
|
||||
{
|
||||
alarm = [dbgSpace clear];
|
||||
DESTROY(dbgSpace);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
|
||||
f = [[d objectForKey: NSFileSystemFreeNodes] floatValue]
|
||||
/ [[d objectForKey: NSFileSystemNodes] floatValue];
|
||||
if (f <= nodesFree)
|
||||
|
|
@ -6297,25 +6320,41 @@ NSLog(@"Problem %@", localException);
|
|||
|
||||
if (nil == last || [last timeIntervalSinceNow] < -DLY)
|
||||
{
|
||||
EcAlarmSeverity severity = EcAlarmSeverityMajor;
|
||||
NSString *m;
|
||||
|
||||
m = [self makeSpace];
|
||||
ASSIGN(last, [NSDate date]);
|
||||
if ([m length] == 0)
|
||||
{
|
||||
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
|
||||
@"Debug disk nodes at %02.1f percent"), f * 100.0];
|
||||
m = [NSString stringWithFormat: @"at %02.1f percent",
|
||||
f * 100.0];
|
||||
}
|
||||
else
|
||||
{
|
||||
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
|
||||
@"Debug disk nodes at %02.1f percent"
|
||||
@" - deleted debug logs from %@ to make space"),
|
||||
m = [NSString stringWithFormat: @"at %02.1f percent"
|
||||
@" - deleted debug logs from %@ to make space",
|
||||
f * 100.0, m];
|
||||
}
|
||||
[self information: m from: nil to: nil type: LT_ALERT];
|
||||
alarm = [EcAlarm alarmForManagedObject: nil
|
||||
at: nil
|
||||
withEventType: EcAlarmEventTypeProcessingError
|
||||
probableCause: EcAlarmStorageCapacityProblem
|
||||
specificProblem: @"Debug disk nodes"
|
||||
perceivedSeverity: severity
|
||||
proposedRepairAction: @"Make space on disk partition"
|
||||
@" and turn off excessive debug"
|
||||
additionalText: m];
|
||||
ASSIGN(dbgNodes, alarm);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
}
|
||||
else if (dbgNodes)
|
||||
{
|
||||
alarm = [dbgNodes clear];
|
||||
DESTROY(dbgNodes);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
|
||||
s = [[self ecUserDirectory] stringByAppendingPathComponent: @"Logs"];
|
||||
d = [mgr fileSystemAttributesAtPath: s];
|
||||
|
|
@ -6330,11 +6369,27 @@ NSLog(@"Problem %@", localException);
|
|||
NSString *m;
|
||||
|
||||
ASSIGN(last, [NSDate date]);
|
||||
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
|
||||
@"Disk space at %02.1f percent"), f * 100.0];
|
||||
[self information: m from: nil to: nil type: LT_ALERT];
|
||||
m = [NSString stringWithFormat:
|
||||
@"Disk space at %02.1f percent", f * 100.0];
|
||||
alarm = [EcAlarm alarmForManagedObject: nil
|
||||
at: nil
|
||||
withEventType: EcAlarmEventTypeProcessingError
|
||||
probableCause: EcAlarmStorageCapacityProblem
|
||||
specificProblem: @"Log disk space"
|
||||
perceivedSeverity: EcAlarmSeverityCritical
|
||||
proposedRepairAction: @"Make space on disk partition."
|
||||
additionalText: m];
|
||||
ASSIGN(logSpace, alarm);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
}
|
||||
else if (logSpace)
|
||||
{
|
||||
alarm = [logSpace clear];
|
||||
DESTROY(logSpace);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
|
||||
f = [[d objectForKey: NSFileSystemFreeNodes] floatValue]
|
||||
/ [[d objectForKey: NSFileSystemNodes] floatValue];
|
||||
if (f <= nodesFree)
|
||||
|
|
@ -6346,11 +6401,26 @@ NSLog(@"Problem %@", localException);
|
|||
NSString *m;
|
||||
|
||||
ASSIGN(last, [NSDate date]);
|
||||
m = [NSString stringWithFormat: cmdLogFormat(LT_ALERT,
|
||||
@"Disk nodes at %02.1f percent"), f * 100.0];
|
||||
[self information: m from: nil to: nil type: LT_ALERT];
|
||||
m = [NSString stringWithFormat:
|
||||
@"Disk nodes at %02.1f percent", f * 100.0];
|
||||
alarm = [EcAlarm alarmForManagedObject: nil
|
||||
at: nil
|
||||
withEventType: EcAlarmEventTypeProcessingError
|
||||
probableCause: EcAlarmStorageCapacityProblem
|
||||
specificProblem: @"Log disk nodes"
|
||||
perceivedSeverity: EcAlarmSeverityCritical
|
||||
proposedRepairAction: @"Make space on disk partition."
|
||||
additionalText: m];
|
||||
ASSIGN(logNodes, alarm);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
}
|
||||
else if (logNodes)
|
||||
{
|
||||
alarm = [logNodes clear];
|
||||
DESTROY(logNodes);
|
||||
[self alarm: alarm];
|
||||
}
|
||||
|
||||
if ([now timeIntervalSinceReferenceDate] > nextLog)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue