Skip to content

Commit

Permalink
Merge pull request #302 from jshaughn/hwkalerts-234
Browse files Browse the repository at this point in the history 
HWKALERTS-234 Apply current trigger mode to MissingState eval
  • Loading branch information
@lucasponce
lucasponce committed Mar 8, 2017
2 parents 5583dd9 + 55c877b commit 4443d5c
Show file tree
Hide file tree
Showing 4 changed files with 261 additions and 129 deletions.
84 changes: 49 additions & 35 deletions hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/impl/AlertsEngineImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,14 @@ private void reloadTrigger(Trigger trigger) {
}
}
if (c instanceof MissingCondition) {
// MissingState keeps a reference to the Trigger fact to check active trigger mode
MissingState missingState = new MissingState(trigger, (MissingCondition) c);
// MissingStates are modified inside the rules engine
missingStates.add(missingState);
rules.addFact(missingState);
synchronized (missingStates) {
missingStates.remove(missingState);
missingStates.add(missingState);
rules.addFact(missingState);
}
}
}

Expand Down Expand Up @@ -455,44 +459,47 @@ public void removeTrigger(String tenantId, String triggerId) {
}

private void removeTrigger(Trigger trigger) {
final String tenantId = trigger.getTenantId();
final String triggerId = trigger.getId();

// If necessary, clean up working memory
if (null != rules.getFact(trigger)) {
// First remove the related Trigger facts from the engine
// Remove the Trigger fact
rules.removeFact(trigger);

// Remove dataId associated from cache
if (distributed) {
alertsEngineCache.remove(trigger.getTenantId(), trigger.getId());
}

// then remove everything else.
// We may want to do this with rules, because as is, we need to loop through every Fact in
// the rules engine doing a relatively slow check.
final String tenantId = trigger.getTenantId();
final String triggerId = trigger.getId();
rules.removeFacts(t -> {
if (t instanceof Dampening) {
return ((Dampening) t).getTenantId().equals(tenantId)
&& ((Dampening) t).getTriggerId().equals(triggerId);
} else if (t instanceof Condition) {
return ((Condition) t).getTenantId().equals(tenantId) &&
((Condition) t).getTriggerId().equals(triggerId);
// Remove related facts
rules.removeFacts(f -> {
if (f instanceof Dampening) {
return ((Dampening) f).getTenantId().equals(tenantId)
&& ((Dampening) f).getTriggerId().equals(triggerId);
} else if (f instanceof Condition) {
return ((Condition) f).getTenantId().equals(tenantId) &&
((Condition) f).getTriggerId().equals(triggerId);
} else if (f instanceof MissingState) {
return ((MissingState) f).getTenantId().equals(tenantId) &&
((MissingState) f).getTriggerId().equals(triggerId);
}
return false;
});
synchronized (missingStates) {
Iterator<MissingState> it = missingStates.iterator();
while (it.hasNext()) {
MissingState missingState = it.next();
if (missingState.getTenantId().equals(trigger.getTenantId()) &&
missingState.getTriggerId().equals(triggerId)) {
rules.removeFact(missingState);
it.remove();
}
}
}
} else {
if (log.isDebugEnabled()) {
log.debug("Trigger not found. Not removed from rulebase " + trigger.toString());
log.debug("Trigger Fact not found. Nothing removed from rulebase " + trigger.toString());
}
}

// Remove dataId associated from cache
if (distributed) {
alertsEngineCache.remove(trigger.getTenantId(), trigger.getId());
}
// Remove any MissingState being managed for the trigger
synchronized (missingStates) {
Iterator<MissingState> it = missingStates.iterator();
while (it.hasNext()) {
MissingState missingState = it.next();
if (missingState.getTenantId().equals(trigger.getTenantId()) &&
missingState.getTriggerId().equals(triggerId)) {
it.remove();
}
}
}
}
Expand Down Expand Up @@ -768,10 +775,16 @@ private void handleAutoResolvedTriggers() {
}

private int checkMissingStates() {
if (missingStates.isEmpty()) {
return 0;
}

int numMatchingEvals = 0;
Iterator<MissingState> itMissingStates = missingStates.iterator();
while (itMissingStates.hasNext()) {
MissingState missingState = itMissingStates.next();
for (MissingState missingState : missingStates) {
if (missingState.getTriggerMode() != missingState.getTrigger().getMode()) {
continue;
}

long now = System.currentTimeMillis();
rules.removeFact(missingState);
missingState.setTime(now);
Expand All @@ -785,6 +798,7 @@ private int checkMissingStates() {
}
rules.addFact(missingState);
}

return numMatchingEvals;
}

Expand Down
127 changes: 42 additions & 85 deletions hawkular-alerts-engine/src/main/java/org/hawkular/alerts/engine/util/MissingState.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
* Copyright 2015-2017 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -21,84 +21,66 @@
import org.hawkular.alerts.api.model.trigger.Trigger;

/**
* MissingConditions detects when there is a missing data or event within a defined time interval.
* This class stores a last evaluation time of a missing data.
* MissingConditions detect missing data or events within a defined time interval. Each MissingCondition
* has an associated MissingState object to track last-seen/evaluation times for the relevant data or event.
*
* @author Jay Shaughnessy
* @author Lucas Ponce
*/
public class MissingState {

// Fields accessed in the rulebase
private String tenantId;

private String triggerId;

private Mode triggerMode;

private Mode triggerMode; // This is the MissingCondition trigger mode
private String source;

private String dataId;

private long previousTime;

private long time;

private String conditionId;
// Need to ensure the current trigger mode matches the condition's trigger mode
private Trigger trigger;

// Given the 1:1 relationship we use the [immutable] conditionId as the unique id for this as well.
private String conditionId;
private MissingCondition condition;

public MissingState(Trigger trigger, MissingCondition condition) {
this.trigger = trigger;
this.tenantId = trigger.getTenantId();
this.triggerId = trigger.getId();
this.triggerMode = condition.getTriggerMode();
this.source = trigger.getSource();
this.dataId = condition.getDataId();
this.previousTime = System.currentTimeMillis();
this.time = System.currentTimeMillis();
this.conditionId = condition.getConditionId();

this.condition = condition;
this.conditionId = condition.getConditionId();
this.triggerMode = condition.getTriggerMode();
this.dataId = condition.getDataId();

long now = System.currentTimeMillis();
this.previousTime = now;
this.time = now;
}

public String getTenantId() {
return tenantId;
}

public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}

public String getTriggerId() {
return triggerId;
}

public void setTriggerId(String triggerId) {
this.triggerId = triggerId;
}

public Mode getTriggerMode() {
return triggerMode;
}

public void setTriggerMode(Mode triggerMode) {
this.triggerMode = triggerMode;
}

public String getSource() {
return source;
}

public void setSource(String source) {
this.source = source;
}

public String getDataId() {
return dataId;
}

public void setDataId(String dataId) {
this.dataId = dataId;
}

public long getPreviousTime() {
return previousTime;
}
Expand All @@ -115,68 +97,43 @@ public void setTime(long time) {
this.time = time;
}

public String getConditionId() {
return conditionId;
}

public void setConditionId(String conditionId) {
this.conditionId = conditionId;
public Trigger getTrigger() {
return trigger;
}

public MissingCondition getCondition() {
return condition;
}

public void setCondition(MissingCondition condition) {
this.condition = condition;
}

/*
Due performance reasons, conditionId will be used for equals()/hashCode() instead of condition
*/
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

MissingState that = (MissingState) o;

if (previousTime != that.previousTime) return false;
if (time != that.time) return false;
if (tenantId != null ? !tenantId.equals(that.tenantId) : that.tenantId != null) return false;
if (triggerId != null ? !triggerId.equals(that.triggerId) : that.triggerId != null) return false;
if (triggerMode != that.triggerMode) return false;
if (source != null ? !source.equals(that.source) : that.source != null) return false;
if (dataId != null ? !dataId.equals(that.dataId) : that.dataId != null) return false;
return conditionId != null ? conditionId.equals(that.conditionId) : that.conditionId == null;

public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((conditionId == null) ? 0 : conditionId.hashCode());
return result;
}

@Override
public int hashCode() {
int result = tenantId != null ? tenantId.hashCode() : 0;
result = 31 * result + (triggerId != null ? triggerId.hashCode() : 0);
result = 31 * result + (triggerMode != null ? triggerMode.hashCode() : 0);
result = 31 * result + (source != null ? source.hashCode() : 0);
result = 31 * result + (dataId != null ? dataId.hashCode() : 0);
result = 31 * result + (int) (previousTime ^ (previousTime >>> 32));
result = 31 * result + (int) (time ^ (time >>> 32));
result = 31 * result + (conditionId != null ? conditionId.hashCode() : 0);
return result;
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
MissingState other = (MissingState) obj;
if (conditionId == null) {
if (other.conditionId != null)
return false;
} else if (!conditionId.equals(other.conditionId))
return false;
return true;
}

@Override
public String toString() {
return "MissingState{" +
"tenantId='" + tenantId + '\'' +
", triggerId='" + triggerId + '\'' +
", triggerMode=" + triggerMode +
", source='" + source + '\'' +
", dataId='" + dataId + '\'' +
", previousTime=" + previousTime +
", time=" + time +
", conditionId='" + conditionId + '\'' +
", condition=" + condition +
'}';
return "MissingState [previousTime=" + previousTime + ", time=" + time + ", condition=" + condition + "]";
}


}

0 comments on commit 4443d5c

Please sign in to comment.