Skip to content
Snippets Groups Projects
Commit a206e35e authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

added support for short period attributes (TANGOARCH-885)

parent 3389e6a8
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/main/java/fr/soleil/mambo/api/archiving/ArchivingUtils.java
+ 3
− 3
View file @ a206e35e
......@@ -14,8 +14,8 @@ import fr.soleil.archiving.hdbtdb.api.tools.mode.ModeRoot;
import fr.soleil.archiving.hdbtdb.api.tools.mode.ModeSeuil;
import fr.soleil.archiving.hdbtdb.api.tools.mode.ShortPeriodAttributesManager;
import fr.soleil.lib.project.ObjectUtils;
import fr.soleil.mambo.api.ApiUtils;
import fr.soleil.mambo.api.ApiConstants;
import fr.soleil.mambo.api.ApiUtils;
import fr.soleil.tango.archiving.config.InsertionModes;
/**
......@@ -61,7 +61,7 @@ public class ArchivingUtils implements ApiConstants {
private static final String ATTRIBUTE_ID = "attribute ID";
private static final String PERIODIC_MODE_MISSING = "Periodic mode missing!";
private static final String SHORT_ARCHIVING_PERIOD_ERROR = "Archiving period too low! (%s's period must be greater or equal to %s ms)";
private static final String ARCHIVING_PERIOD_ERROR = "Archiving period to low! (%s<%s ms)";
private static final String ARCHIVING_PERIOD_ERROR = "Archiving period too low! (%s<%s ms)";
private static final int HDB_PERIOD_MIN_VALUE = 10000; // ms
private static final int TDB_PERIOD_MIN_VALUE = 100; // ms
......@@ -284,7 +284,7 @@ public class ArchivingUtils implements ApiConstants {
if ((attributeName != null) && ShortPeriodAttributesManager.isShortPeriodAttribute(attributeName)
&& (historic != null) && historic.booleanValue()) {
final int attributePeriod = ShortPeriodAttributesManager
.getPeriodFromShortAttributeName(attributeName);
.getPeriodFromShortAttributeName(attributeName.trim());
if (mode.getPeriod() / 1000 < attributePeriod) {
throw new ArchivingException(
String.format(SHORT_ARCHIVING_PERIOD_ERROR, attributeName, attributePeriod));
......
src/main/java/fr/soleil/mambo/api/db/DbConnectionParameters.java
+ 115
− 0
View file @ a206e35e
package fr.soleil.mambo.api.db;
import java.util.HashMap;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.esrf.TangoApi.DbDatum;
import fr.soleil.archiving.common.api.exception.ArchivingException;
import fr.soleil.archiving.common.api.utils.DbConnectionInfo;
import fr.soleil.archiving.hdbtdb.api.HdbTdbConnectionParameters;
import fr.soleil.archiving.hdbtdb.api.tools.mode.ShortPeriodAttributesManager;
import fr.soleil.comete.swing.util.CometeConstants;
import fr.soleil.comete.tango.data.service.helper.TangoDeviceHelper;
import fr.soleil.comete.tango.data.service.helper.TangoExceptionHelper;
import fr.soleil.lib.project.ObjectUtils;
import fr.soleil.lib.project.math.ArrayUtils;
import fr.soleil.mambo.api.ApiConstants;
import fr.soleil.mambo.api.ApiUtils;
......@@ -14,6 +27,12 @@ public class DbConnectionParameters implements ApiConstants {
private static boolean ttsAvailable = CometeConstants.TRUE.equalsIgnoreCase(
ApiUtils.getProperty(TTS_AVAILABLE_PROPERTY, TTS_AVAILABLE_ENV, Boolean.FALSE.toString()));
private static String user, password;
private static FastHdbAttributesTarget fastHdbAttributesTarget;
private static final String HDB_ARCHIVER = "HdbArchiver";
private static final String SHORT_PERIOD_ATTRIBUTES = "shortPeriodAttributes";
private static final Timer TIMER = new Timer("HDB fast attributes check");
private static final Object TASK_LOCK = new Object();
private static final Logger LOGGER = LoggerFactory.getLogger(DbConnectionParameters.class);
private DbConnectionParameters() {
// hide constructor
......@@ -49,6 +68,17 @@ public class DbConnectionParameters implements ApiConstants {
} else if (historic.booleanValue()) {
HdbTdbConnectionParameters.performAllHDBInit(null, ObjectUtils.EMPTY_STRING, ObjectUtils.EMPTY_STRING,
ObjectUtils.EMPTY_STRING, user, password, ObjectUtils.EMPTY_STRING);
if (isHdbAvailable()) {
if (fastHdbAttributesTarget == null) {
synchronized (TASK_LOCK) {
if (fastHdbAttributesTarget == null) {
fastHdbAttributesTarget = new FastHdbAttributesTarget();
// TANGOARCH-885: Check for fast HDB attributes every 30s
TIMER.schedule(new FashtAttributesCheckTask(), 200, 30000);
}
}
}
}
} else {
HdbTdbConnectionParameters.performAllTDBInit(null, ObjectUtils.EMPTY_STRING, ObjectUtils.EMPTY_STRING,
ObjectUtils.EMPTY_STRING, user, password, ObjectUtils.EMPTY_STRING);
......@@ -94,4 +124,89 @@ public class DbConnectionParameters implements ApiConstants {
return historic;
}
// ///////////// //
// Inner classes //
// ///////////// //
private static class FastHdbAttributesTarget {
private volatile String[] attributes;
public FastHdbAttributesTarget() {
attributes = null;
}
public void setFastHdbAttributes(String[] value) {
if (!ArrayUtils.equals(value, this.attributes)) {
String[] attributes = value == null ? null : value.clone();
this.attributes = attributes;
Map<String, Integer> shortPeriodAttributes = new HashMap<>();
if (attributes != null && attributes.length > 0) {
attrLoop: for (final String attribute : attributes) {
if (attribute != null && !attribute.trim().isEmpty()) {
String temp = attribute;
int delimiterCount = 0;
while (temp.indexOf(',') > -1) {
// Doing so, we are sure to test all bad cases, even
// the ones not detectable by split
delimiterCount++;
if (delimiterCount > 1) {
temp = null;
shortPeriodAttributes.clear();
break attrLoop;
}
temp = temp.replaceFirst(CometeConstants.COMMA, ObjectUtils.EMPTY_STRING);
}
temp = null;
final String[] attributeParts = attribute.split(CometeConstants.COMMA);
if (attributeParts.length > 2) {
// property is not well formatted (too many separators)
shortPeriodAttributes.clear();
break attrLoop;
} else {
final String attributeName = attributeParts[0].trim().toLowerCase();
if (attributeName.isEmpty()) {
shortPeriodAttributes.clear();
break attrLoop;
} else if (shortPeriodAttributes.containsKey(attributeName)) {
shortPeriodAttributes.clear();
break attrLoop;
} else {
final Integer attributePeriod = Integer.parseInt(attributeParts[1]);
if (attributePeriod > 0 && attributePeriod < 10) {
shortPeriodAttributes.put(attributeName, attributePeriod);
} else {
shortPeriodAttributes.clear();
break attrLoop;
}
}
} // end if (attributeParts.length > 2) ... else
} // end if (attribute != null && !attribute.trim().isEmpty())
} // end attrLoop: for (final String attribute : attributes)
} // end if (attributes != null && attributes.length > 0)
ShortPeriodAttributesManager.setShortPeriodAttributes(shortPeriodAttributes);
} // end if (!ArrayUtils.equals(value, this.attributes))
}
}
private static class FashtAttributesCheckTask extends TimerTask {
public FashtAttributesCheckTask() {
super();
}
@Override
public void run() {
try {
DbDatum prop = TangoDeviceHelper.getDatabase().get_class_property(HDB_ARCHIVER,
SHORT_PERIOD_ATTRIBUTES);
if (prop != null) {
fastHdbAttributesTarget.setFastHdbAttributes(prop.extractStringArray());
}
} catch (Exception e) {
LOGGER.error("Failed to check HDB short period attributes:\n" + TangoExceptionHelper.getErrorMessage(e),
e);
}
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

The place to be for your source code